[SCM] GNU gnutls branch, master, updated. gnutls_2_9

gnutls-commit
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-49-gea038ef

From:	Simon Josefsson
Subject:	[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-49-gea038ef
Date:	Thu, 05 Nov 2009 07:30:31 +0000
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=ea038effe891515af6c979ed39765229ce53a915

The branch, master has been updated
       via  ea038effe891515af6c979ed39765229ce53a915 (commit)
       via  f2cfdbba261ace707a18ceb6ae433ecc79595535 (commit)
       via  950990906caa5b2e6fc4c1e7725c9f04c6cf1d11 (commit)
      from  d2c494ec61ef25d704e14b3c8ca62e4869c085be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea038effe891515af6c979ed39765229ce53a915
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:30:24 2009 +0100

    Update gnulib files.

commit f2cfdbba261ace707a18ceb6ae433ecc79595535
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:29:21 2009 +0100

    Add.

commit 950990906caa5b2e6fc4c1e7725c9f04c6cf1d11
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:28:44 2009 +0100

    Sync with TP.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                        |    3 +
 gl/Makefile.am              |    4 +
 gl/m4/stdlib_h.m4           |    6 +-
 gl/stdlib.in.h              |   47 +++
 gl/tests/test-getaddrinfo.c |    2 +
 lib/gl/Makefile.am          |    4 +
 lib/gl/m4/stdlib_h.m4       |    6 +-
 lib/gl/stdlib.in.h          |   47 +++
 lib/po/vi.po.in             |  885 +++++++++++++++++++++++++------------------
 9 files changed, 627 insertions(+), 377 deletions(-)

diff --git a/NEWS b/NEWS
index 61c9fa4..29af4e8 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ Reported by Andreas Metzler <address@hidden> in
 
 ** tests: Fix expired cert in chainverify self-test.
 
+** i18n: Vietnamese translation updated.
+Thanks to Clytie Siddall.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/gl/Makefile.am b/gl/Makefile.am
index a5c7eb5..3a138bc 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -787,7 +787,9 @@ stdlib.h: stdlib.in.h
              -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
              -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+             -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+             -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
              -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
              -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
              -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
@@ -806,6 +808,8 @@ stdlib.h: stdlib.in.h
              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
              -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
              -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+             -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+             -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
              -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index 42d551d..4556ac0 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 20
+# stdlib_h.m4 serial 21
 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,7 +41,9 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
+  GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
@@ -61,6 +63,8 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
   HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
   HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
+  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
+  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index 7a9246a..e2c6bbf 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -224,6 +224,31 @@ extern int mkostemp (char * /*template*/, int /*flags*/);
      mkostemp (t, f))
 #endif
 
+#if @GNULIB_MKOSTEMPS@
+# if address@hidden@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE before a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   The file is then created, with the specified flags, ensuring it didn't exist
+   before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+extern int mkostemps (char * /*template*/, int /*suffixlen*/, int /*flags*/);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkostemps
+# define mkostemps(t,s,f)                          \
+    (GL_LINK_WARNING ("mkostemps is unportable - " \
+                      "use gnulib module mkostemps for portability"), \
+     mkostemps (t, s, f))
+#endif
+
 #if @GNULIB_MKSTEMP@
 # if @REPLACE_MKSTEMP@
 /* Create a unique temporary file from TEMPLATE.
@@ -249,6 +274,28 @@ extern int mkstemp (char * /*template*/);
      mkstemp (t))
 #endif
 
+#if @GNULIB_MKSTEMPS@
+# if address@hidden@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE prior to a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The file is then created, ensuring it didn't exist before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+extern int mkstemps (char * /*template*/, int /*suffixlen*/);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkstemps
+# define mkstemps(t,s)                             \
+    (GL_LINK_WARNING ("mkstemps is unportable - " \
+                      "use gnulib module mkstemps for portability"), \
+     mkstemps (t, s))
+#endif
+
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  undef putenv
diff --git a/gl/tests/test-getaddrinfo.c b/gl/tests/test-getaddrinfo.c
index 384b98b..57c1a4d 100644
--- a/gl/tests/test-getaddrinfo.c
+++ b/gl/tests/test-getaddrinfo.c
@@ -91,10 +91,12 @@ simple (char const *host, char const *service)
         fail the test merely because of this.  */
       if (res == EAI_SERVICE)
        return 0;
+#ifdef EAI_NODATA
       /* AIX reports EAI_NODATA for "https".  Don't fail the test
         merely because of this.  */
       if (res == EAI_NODATA)
        return 0;
+#endif
       /* Provide details if errno was set.  */
       if (res == EAI_SYSTEM)
        dbgprintf ("system error: %s\n", strerror (err));
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index a3045eb..2b84f52 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -506,7 +506,9 @@ stdlib.h: stdlib.in.h
              -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
              -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+             -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+             -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
              -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
              -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
              -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
@@ -525,6 +527,8 @@ stdlib.h: stdlib.in.h
              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
              -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
              -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+             -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+             -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
              -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
diff --git a/lib/gl/m4/stdlib_h.m4 b/lib/gl/m4/stdlib_h.m4
index 42d551d..4556ac0 100644
--- a/lib/gl/m4/stdlib_h.m4
+++ b/lib/gl/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 20
+# stdlib_h.m4 serial 21
 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,7 +41,9 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
+  GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
@@ -61,6 +63,8 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
   HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
   HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
+  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
+  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
diff --git a/lib/gl/stdlib.in.h b/lib/gl/stdlib.in.h
index 837eae8..6ef8504 100644
--- a/lib/gl/stdlib.in.h
+++ b/lib/gl/stdlib.in.h
@@ -224,6 +224,31 @@ extern int mkostemp (char * /*template*/, int /*flags*/);
      mkostemp (t, f))
 #endif
 
+#if @GNULIB_MKOSTEMPS@
+# if address@hidden@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE before a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
+   and O_TEXT, O_BINARY (defined in "binary-io.h").
+   The file is then created, with the specified flags, ensuring it didn't exist
+   before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+extern int mkostemps (char * /*template*/, int /*suffixlen*/, int /*flags*/);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkostemps
+# define mkostemps(t,s,f)                          \
+    (GL_LINK_WARNING ("mkostemps is unportable - " \
+                      "use gnulib module mkostemps for portability"), \
+     mkostemps (t, s, f))
+#endif
+
 #if @GNULIB_MKSTEMP@
 # if @REPLACE_MKSTEMP@
 /* Create a unique temporary file from TEMPLATE.
@@ -249,6 +274,28 @@ extern int mkstemp (char * /*template*/);
      mkstemp (t))
 #endif
 
+#if @GNULIB_MKSTEMPS@
+# if address@hidden@
+/* Create a unique temporary file from TEMPLATE.
+   The last six characters of TEMPLATE prior to a suffix of length
+   SUFFIXLEN must be "XXXXXX";
+   they are replaced with a string that makes the file name unique.
+   The file is then created, ensuring it didn't exist before.
+   The file is created read-write (mask at least 0600 & ~umask), but it may be
+   world-readable and world-writable (mask 0666 & ~umask), depending on the
+   implementation.
+   Returns the open file descriptor if successful, otherwise -1 and errno
+   set.  */
+extern int mkstemps (char * /*template*/, int /*suffixlen*/);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mkstemps
+# define mkstemps(t,s)                             \
+    (GL_LINK_WARNING ("mkstemps is unportable - " \
+                      "use gnulib module mkstemps for portability"), \
+     mkstemps (t, s))
+#endif
+
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  undef putenv
diff --git a/lib/po/vi.po.in b/lib/po/vi.po.in
index 85b7c26..e4e9296 100644
--- a/lib/po/vi.po.in
+++ b/lib/po/vi.po.in
@@ -1,553 +1,557 @@
-# Vietnamese translation for GnuTLS.
-# Copyright Â© 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls package.
-# Clytie Siddall <address@hidden>, 2008.
+# Vietnamese translation for LibGnuTLS.
+# Copyright Â© 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgnutls package.
+# Clytie Siddall <address@hidden>, 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls 2.5.7\n"
+"Project-Id-Version: libgnutls 2.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2008-09-21 22:11+0930\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-09-19 18:31+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "ThÃ nh cÃ´ng."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "KhÃ´ng thá» thá»a thuáºn má»t bá» á»©ng dá»¥ng máºt mÃ£ ÄÆ°á»£c 
há» trá»£."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
-msgstr "KhÃ´ng há» trá»£ kiá»u máºt mÃ£."
+msgstr "Loáº¡i máºt mÃ£ khÃ´ng ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
-msgstr "DÃ£y chá»©ng nháºn vÃ  khoÃ¡ ÄÃ£ cho khÃ´ng tÆ°Æ¡ng á»©ng vá»i 
nhau."
+msgstr "Chá»©ng nháºn vÃ  khoÃ¡ ÄÃ£ cho khÃ´ng tÆ°Æ¡ng á»©ng vá»i nhau."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "KhÃ´ng thá» thá»a thuáºn má»t phÆ°Æ¡ng phÃ¡p nÃ©n ÄÆ°á»£c há» 
trá»£."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
 msgstr "Gáº·p má»t thuáºt toÃ¡n khoÃ¡ cÃ´ng khÃ´ng rÃµ."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "ÄÃ£ thá»a thuáºn má»t thuáºt toÃ¡n chÆ°a ÄÆ°á»£c hiá»u lá»±c."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin má»¥c ghi TLS lá»n."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin má»¥c ghi cÃ³ phiÃªn báº£n cáº¥m."
 
-#: lib/gnutls_errors.c:72
-msgid "The Diffie Hellman prime sent by the server is not acceptable (not long 
enough)."
+#: gnutls_errors.c:70
+msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long 
enough)."
 msgstr "MÃ¡y phá»¥c vá»¥ ÄÃ£ gá»i má»t nguyÃªn tá» Diffie Hellman khÃ´ng 
thÃch há»£p (quÃ¡ ngáº¯n)."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
-msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin TLS lá»n cÃ³ chiá»u dÃ i báº¥t 
thÆ°á»ng."
+msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin TLS cÃ³ chiá»u dÃ i báº¥t thÆ°á»ng."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
-msgstr "PhiÃªn cháº¡y ÄÃ£ ghi rÃµ cÅ©ng bá» táº¯t vÃ¬ lÃ½ do nÃ o."
+msgstr "Buá»i há»£p ÄÃ£ ghi rÃµ cÅ©ng bá» táº¯t vÃ¬ lÃ½ do nÃ o."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "Lá»i ná»i bá» GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "Nháºn ÄÆ°á»£c má»t pháº§n má» rá»ng TLS cáº¥m."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
-msgstr "Nháºn ÄÆ°á»£c má»t cáº£nh giÃ¡c nghiÃªm trá»ng TLS cáº¥m."
+msgstr "Nháºn ÄÆ°á»£c má»t cáº£nh giÃ¡c nghiÃªm trá»ng TLS."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin TLS báº¥t thÆ°á»ng."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
-msgstr "Nháºn ÄÆ°á»£c má»t cáº£nh giÃ¡c bÃ¡o trÆ°á»c TLS cáº¥m."
+msgstr "Nháºn ÄÆ°á»£c má»t cáº£nh giÃ¡c bÃ¡o trÆ°á»c TLS."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Gáº·p lá»i trong phÃ©p tÃnh gÃ³i tin ÄÃ£ káº¿t thÃºc TLS."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "Äá»ng Äáº³ng chÆ°a gá»i chá»©ng nháºn."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
-msgstr "ÄÃ£ cÃ³ má»t thuáºt toÃ¡n mÃ£ hoÃ¡ cÃ³ má»©c Æ°u tiÃªn tháº¥p hÆ¡n."
+msgstr "ÄÃ£ cÃ³ má»t thuáºt toÃ¡n máºt mÃ£ cÃ³ má»©c Æ°u tiÃªn tháº¥p 
hÆ¡n."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y tham sá» RSA táº¡m thá»i."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y tham sá» DH táº¡m thá»i."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Nháºn ÄÆ°á»£c má»t gÃ³i tin thiáº¿t láºp quan há» TLS báº¥t 
thÆ°á»ng."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Lá»i quÃ©t má»t sá» nguyÃªn lá»n."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "KhÃ´ng thá» xuáº¥t má»t sá» nguyÃªn lá»n."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
-msgstr "Lá»i giáº£i mÃ£."
+msgstr "Lá»i giáº£i máºt mÃ£."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
-msgstr "Lá»i mÃ£ hoÃ¡."
+msgstr "Lá»i máºt mÃ£ hoÃ¡."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
-msgstr "Lá»i giáº£i mÃ£ khoÃ¡ cÃ´ng."
+msgstr "Lá»i giáº£i máºt mÃ£ khoÃ¡ cÃ´ng."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
-msgstr "Lá»i mÃ£ hoÃ¡ khoÃ¡ cÃ´ng."
+msgstr "Lá»i máºt mÃ£ hoÃ¡ khoÃ¡ cÃ´ng."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Lá»i kÃ½ khoÃ¡ cÃ´ng."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Lá»i tháº©m tra chá»¯ kÃ½ khoÃ¡ cÃ´ng."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Lá»i giáº£i nÃ©n gÃ³i tin má»¥c ghi TLS."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Lá»i nÃ©n gÃ³i tin má»¥c ghi TLS."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "Gáº·p lá»i ná»i bá» trong khi cáº¥p phÃ¡t bá» nhá»."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "ÄÃ£ yÃªu cáº§u má»t tÃnh nÄng bá» táº¯t hoáº·c chÆ°a ÄÆ°á»£c 
thá»±c hiá»n."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "KhÃ´ng Äá»§ thÃ´ng tin xÃ¡c thá»±c cho yÃªu cáº§u ÄÃ³."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "Gáº·p lá»i trong táºp tin máºt kháº©u."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Sai Äá»m gÃ³i tin PKCS1."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
-msgstr "ÄÃ£ yÃªu cáº§u má»t hiÃªn cháº¡y ÄÃ£ háº¿t háº¡n."
+msgstr "ÄÃ£ yÃªu cáº§u má»t buá»i há»£p ÄÃ£ háº¿t háº¡n."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Lá»i chuyá»n Äá»i chuá»i sang má»t máº«u duy nháº¥t."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "Lá»i giáº£i mÃ£ Base64."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Lá»i pháº§n Äáº§u báº¥t thÆ°á»ng Base64."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "Lá»i mÃ£ hoÃ¡ Base64."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "Lá»i phÃ¢n tÃch ngá»¯ phÃ¡p trong táºp tin máºt kháº©u."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "ÄÃ£ yÃªu cáº§u dá»¯ liá»u khÃ´ng sáºµn sÃ ng."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "Gáº·p lá»i trong hÃ m pull."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "Gáº·p lá»i trong hÃ m push."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. 
Wow!"
-msgstr "Má»i tá»i giá»i háº¡n trÃªn cá»§a sá» thá»© tá»± gÃ³i tin má»¥c 
ghi."
+msgstr "Má»i tá»i giá»i háº¡n trÃªn cá»§a sá» thá»© tá»± gÃ³i tin má»¥c 
ghi !"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "Gáº·p lá»i trong chá»©ng nháºn."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
-msgstr "Gáº·p tÃªn NgÆ°á»i dÃ¢n Xen káº½ khÃ´ng rÃµ trong chá»©ng nháºn 
X.509."
+msgstr "KhÃ´ng rÃµ tÃªn NgÆ°á»i dÃ¢n Xen káº½ trong chá»©ng nháºn X.509."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Gáº·p pháº§n má» rá»ng nghiÃªm trá»ng khÃ´ng ÄÆ°á»£c há» trá»£ 
trong chá»©ng nháºn X.509."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "ÄÃ£ phÃ¡t hiá»n sá»± vi pháº¡m cÃ¡ch sá» dá»¥ng khoÃ¡ trong chá»©ng 
nháºn."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "TÃ i nguyÃªn táº¡m thá»i khÃ´ng sáºµn sÃ ng, hÃ£y thá» láº¡i."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "HÃ m ÄÃ£ bá» giÃ¡n Äoáº¡n."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "Äá»ng Äáº³ng ÄÃ£ yÃªu cáº§u thiáº¿t láºp láº¡i quan há»."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Nháºn ÄÆ°á»£c dá»¯ liá»u á»¨ng dá»¥ng TLS, cÃ²n Äá»£i dá»¯ liá»u 
thiáº¿t láºp quan há»."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "Gáº·p lá»i trong háºu phÆ°Æ¡ng cÆ¡ sá» dá»¯ liá»u."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
-msgstr "Kiá»u chá»©ng nháºn khÃ´ng ÄÆ°á»£c há» trá»£."
+msgstr "Loáº¡i chá»©ng nháºn khÃ´ng ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "ÄÃ£ ÄÆ°a ra má»t vÃ¹ng Äá»m bá» nhá» quÃ¡ ngáº¯n Äá» chá»©a 
cÃ¡c tham sá»."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "YÃªu cáº§u khÃ´ng há»£p lá»."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "Nháºn ÄÆ°á»£c má»t tham sá» cáº¥m."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "Gáº·p lá»i khi Äá»c táºp tin."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "Bá» phÃ¢n tÃch ASN1: khÃ´ng tÃ¬m tháº¥y pháº§n tá»."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "Bá» phÃ¢n tÃch ASN1: khÃ´ng tÃ¬m tháº¥y Äá» nháºn diá»n."
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
-msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i trong sá»± phÃ¢n tÃch ngá»¯ cáº£nh 
DER."
+msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i khi phÃ¢n tÃch ngá»¯ cáº£nh DER."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "Bá» phÃ¢n tÃch ASN1: khÃ´ng tÃ¬m tháº¥y giÃ¡ trá»."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "Bá» phÃ¢n tÃch ASN1: lá»i phÃ¢n tÃch ngá»¯ cáº£nh chung."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "Bá» phÃ¢n tÃch ASN1: giÃ¡ trá» khÃ´ng há»£p lá»."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i trong TAG (tháº»)."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i trong tháº» dá»©t khoÃ¡t."
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
-msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i trong kiá»u Â« ANY Â» (báº¥t 
ká»³)."
+msgstr "Bá» phÃ¢n tÃch ASN1: gáº·p lá»i trong loáº¡i Â« ANY Â» (báº¥t 
ká»³)."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "Bá» phÃ¢n tÃch ASN1: lá»i cÃº phÃ¡p."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "Bá» phÃ¢n tÃch ASN1: trÃ n sá»± phÃ¢n tÃch ngá»¯ cáº£nh DER."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
-msgstr "Nháºn ÄÆ°á»£c quÃ¡ nhiá»u gÃ³i tin má»¥c ghi rá»ng."
+msgstr "Nháºn ÄÆ°á»£c quÃ¡ nhiá»u gÃ³i tin má»¥c ghi trá»ng."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Lá»i sÆ¡ khá»i GnuTLS-extra."
 
-#: lib/gnutls_errors.c:203
+#: gnutls_errors.c:202
 msgid "The GnuTLS library version does not match the GnuTLS-extra library 
version."
 msgstr "PhiÃªn báº£n thÆ° viá»n GnuTLS khÃ´ng tÆ°Æ¡ng á»©ng vá»i phiÃªn 
báº£n thÆ° viá»n GnuTLS-extra."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
-msgstr "PhiÃªn báº£n thÆ° viá»n gcrypt lÃ  quÃ¡ cÅ©."
+msgstr "PhiÃªn báº£n thÆ° viá»n gcrypt quÃ¡ cÅ©."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
-msgstr "PhiÃªn báº£n thÆ° viá»n tasn1 lÃ  quÃ¡ cÅ©."
+msgstr "PhiÃªn báº£n thÆ° viá»n tasn1 quÃ¡ cÅ©."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "MÃ£ sá» ngÆ°á»i dÃ¹ng OpenPGP bá» thu há»i."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "Gáº·p lá»i khi náº¡p vÃ²ng khoÃ¡."
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Lá»i sÆ¡ khá»i LZO."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y thuáºt toÃ¡n nÃ©n ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y bá» á»©ng dá»¥ng máºt mÃ£ ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "KhÃ´ng thá» láº¥y khoÃ¡ OpenPGP."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "KhÃ´ng tÃ¬m tháº¥y khoÃ¡ phá»¥ OpenPGP."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "ÄÃ£ cung cáº¥p má»t tÃªn ngÆ°á»i dÃ¹ng SRP cáº¥m."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "Dáº¥u tay OpenPGP khÃ´ng pháº£i ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Chá»©ng nháºn cÃ³ thuá»c tÃnh khÃ´ng ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "IOD khÃ´ng ÄÆ°á»£c há» trá»£."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
-msgstr "KhÃ´ng rÃµ thuáºt toÃ¡n chuyá»n Äá»i chuá»i sang máº«u duy 
nháº¥t."
+msgstr "KhÃ´ng rÃµ thuáºt toÃ¡n chuyá»n Äá»i chuá»i sang máº«u duy nháº¥t 
(hash)."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
-msgstr "KhÃ´ng rÃµ kiá»u ná»i dung cá»§a cáº¥u trÃºc PKCS."
+msgstr "KhÃ´ng rÃµ loáº¡i ná»i dung cá»§a cáº¥u trÃºc PKCS."
 
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
-msgstr "KhÃ´ng rÃµ kiá»u bao cá»§a cáº¥u trÃºc PKC"
+msgstr "KhÃ´ng rÃµ loáº¡i bao cá»§a cáº¥u trÃºc PKCS."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "ÄÃ£ ÄÆ°a ra má»t máºt kháº©u chá»©a kÃ½ tá»± khÃ´ng há»£p lá»."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "Lá»i tháº©m tra MÃ£ XÃ¡c Thá»±c ThÃ´ng Äiá»p."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "ÄÃ£ tá»i má»t sá» giá»i háº¡n rÃ ng buá»c."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Lá»i láº¥y dá»¯ liá»u ngáº«u nhiÃªn. "
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
-msgstr "Nháºn ÄÆ°á»£c má»t thÃ´ng Äiá»p Giáº£i Äoáº¡n Trung gian ÄÃ£ 
Káº¿t thÃºc TLS/IA."
+msgstr "Nháºn ÄÆ°á»£c má»t thÃ´ng Äiá»p Giáº£i Äoáº¡n TLS/IA Trung gian 
ÄÃ£ Káº¿t thÃºc."
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
-msgstr "Nháºn ÄÆ°á»£c má»t thÃ´ng Äiá»p Giáº£i Äoáº¡n Cuá»i cÃ¹ng ÄÃ£ 
Káº¿t thÃºc TLS/IA."
+msgstr "Nháºn ÄÆ°á»£c má»t thÃ´ng Äiá»p Giáº£i Äoáº¡n TLS/IA Cuá»i 
cÃ¹ng ÄÃ£ Káº¿t thÃºc."
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Lá»i tháº©m tra tá»ng kiá»m cá»§a giáº£i Äoáº¡n TLS/IA."
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "KhÃ´ng rÃµ thuáºt toÃ¡n hoáº·c giao thá»©c ÄÃ£ ghi rÃµ."
 
-#: lib/gnutls_errors.c:259
+#: gnutls_errors.c:258
 msgid "The handshake data size is too large (DoS?), check 
gnutls_handshake_set_max_packet_length()."
 msgstr "Dá»¯ liá»u thiáº¿t láºp quan há» cÃ³ kÃch cá»¡ quÃ¡ lá»n (DoS?), 
hÃ£y kiá»m tra láº¡i gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(khÃ´ng rÃµ mÃ£ lá»i)"
 
-#: lib/gnutls_alert.c:42
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "ÄÃ³ng thÃ´ng bÃ¡o"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "ThÃ´ng Äiá»p báº¥t thÆ°á»ng"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "MAC má»¥c ghi sai"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
-msgstr "Giáº£i máºt mÃ£ khÃ´ng thÃ nh cÃ´ng"
+msgstr "Lá»i giáº£i máºt mÃ£"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "TrÃ n má»¥c ghi"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
-msgstr "Giáº£i nÃ©n khÃ´ng thÃ nh cÃ´ng"
+msgstr "Lá»i giáº£i nÃ©n"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
-msgstr "Thiáº¿t láºp quan há» khÃ´ng thÃ nh cÃ´ng"
+msgstr "Lá»i thiáº¿t láºp quan há»"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "Chá»©ng nháºn sai"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Chá»©ng nháºn khÃ´ng ÄÆ°á»£c há» trá»£"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Chá»©ng nháºn bá» thu há»i"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Chá»©ng nháºn ÄÃ£ háº¿t háº¡n"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "KhÃ´ng nháºn ra chá»©ng nháºn"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Tham sá» khÃ´ng ÄÆ°á»£c phÃ©p"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "KhÃ´ng nháºn ra nhÃ  cáº§m quyá»n cáº¥p chá»©ng nháºn (CA)"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Truy cáºp bá» tá»« chá»i"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "Lá»i giáº£i mÃ£"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "Lá»i giáº£i máºt mÃ£"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
-msgstr "Giá»i háº¡n xuáº¥t"
+msgstr "Giá»i háº¡n xuáº¥t kháº©u"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "Lá»i trong phiÃªn báº£n giao thá»©c"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "KhÃ´ng Äá»§ báº£o máºt"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "NgÆ°á»i dÃ¹ng ÄÃ£ thÃ´i"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "Lá»i ná»i bá»"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "KhÃ´ng cho phÃ©p thá»a thuáºn láº¡i"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "KhÃ´ng thá» láº¥y chá»©ng nháºn ÄÃ£ xÃ¡c Äá»nh"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "ÄÃ£ gá»i má»t pháº§n má» rá»ng khÃ´ng ÄÆ°á»£c há» trá»£"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "ÄÃ£ gá»i má»t tÃªn mÃ¡y phá»¥c vá»¥ khÃ´ng ÄÆ°á»£c nháºn ra"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
-msgstr "TÃªn ngÆ°á»i dÃ¹ng SRP/PSK bá» thiáº¿u hay khÃ´ng rÃµ"
+msgstr "TÃªn ngÆ°á»i dÃ¹ng SRP/PSK bá» thiáº¿u hay khÃ´ng ÄÆ°á»£c nháºn ra"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
-msgstr "Lá»i thá»a thuáºn bÃªn trong á»©ng dá»¥ng"
+msgstr "Lá»i thá»a thuáºn á»©ng dá»¥ng bÃªn trong"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
-msgstr "KhÃ´ng tháº©m tra ÄÆ°á»£c bÃªn trong á»©ng dá»¥ng"
+msgstr "KhÃ´ng tháº©m tra ÄÆ°á»£c á»©ng dá»¥ng bÃªn trong"
 
-#: lib/x509/output.c:113 lib/x509/output.c:389
+#: x509/output.c:156
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
-msgstr "\t\t\tRÃ ng buá»c chiá»u dÃ i ÄÆ°á»ng dáº«n: %d\n"
+msgstr "\t\t\tRÃ ng buá»c Chiá»u dÃ i ÄÆ°á»ng dáº«n: %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
-msgstr "\t\t\tNgÃ´n ngá»¯ chÃnh sÃ¡ch: %s"
+msgstr "\t\t\tNgÃ´n ngá»¯ ChÃnh sÃ¡ch: %s"
 
-#: lib/x509/output.c:123
+#: x509/output.c:166
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -555,7 +559,7 @@ msgstr ""
 "\t\t\tChÃnh sÃ¡ch:\n"
 "\t\t\t\tASCII: "
 
-#: lib/x509/output.c:125
+#: x509/output.c:168
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -563,252 +567,282 @@ msgstr ""
 "\n"
 "\t\t\t\tÄá» tháºp lá»¥c: "
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tChá»¯ kÃ½ dáº¡ng sá».\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tChá»¯ kÃ½ dáº¡ng sá».\n"
 
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\t\tKhÃ´ng tá»« chá»i.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tKhÃ´ng tá»« chá»i.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tMÃ£ hoÃ¡ khoÃ¡.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tMáºt mÃ£ hoÃ¡ khoÃ¡.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tMÃ£ hoÃ¡ dá»¯ liá»u.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tMáºt mÃ£ hoÃ¡ dá»¯ liá»u.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tCháº¥p thuáºn khoÃ¡.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tCháº¥p thuáºn khoÃ¡.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tKÃ½ chá»©ng nháºn.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tKÃ½ chá»©ng nháºn.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tKÃ½ CRL.\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tKÃ½ CRL.\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tChá» mÃ£ hoÃ¡ khoÃ¡.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tChá» máºt mÃ£ hoÃ¡ khoÃ¡.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tChá» giáº£i mÃ£ khoÃ¡.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tChá» giáº£i máºt mÃ£ khoÃ¡.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tMÃ¡y phá»¥c vá»¥ WWW TLS.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tTrÃ¬nh phá»¥c vá»¥ WWW TLS.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tá»¨ng dá»¥ng khÃ¡ch WWW TLS.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tá»¨ng dá»¥ng khÃ¡ch WWW TLS.\n"
+
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tKÃ½ mÃ£.\n"
 
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tKÃ½ mÃ£.\n"
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tBáº£o vá» thÆ° Äiá»n tá».\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tBáº£o vá» thÆ° Äiá»n tá».\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tGhi thá»i gian.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tGhi thá»i gian.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tKÃ½ OCSP.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tKÃ½ OCSP.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tBáº¥t cá»© má»¥c ÄÃch nÃ o.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tBáº¥t cá»© má»¥c ÄÃch nÃ o.\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tNhÃ  cáº§m quyá»n chá»©ng nháºn (CA): SAI\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tNhÃ  cáº§m quyá»n chá»©ng nháºn (CA): SAI\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tNhÃ  cáº§m quyá»n chá»©ng nháºn (CA): ÄÃNG\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tNhÃ  cáº§m quyá»n chá»©ng nháºn (CA): ÄÃNG\n"
+#: x509/output.c:493
+#, c-format
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tRÃ ng buá»c Chiá»u dÃ i ÄÆ°á»ng dáº«n: %d\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tÄá»a chá» XMPP: %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tÄá»a chá» XMPP: %.*s\n"
 
-#: lib/x509/output.c:494
+#: x509/output.c:630
 #, c-format
-msgid "\t\t\totherName OID: %.*s\n"
-msgstr "\t\t\tOID tÃªn khÃ¡c: %.*s\n"
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\tOID tÃªn khÃ¡c: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\tDER tÃªn khÃ¡c: "
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\tDER tÃªn khÃ¡c: "
 
-#: lib/x509/output.c:497
+#: x509/output.c:634
+#, c-format
 msgid ""
 "\n"
-"\t\t\totherName ASCII: "
+"%s\t\t\totherName ASCII: "
 msgstr ""
 "\n"
-"\t\t\tASCII tÃªn khÃ¡c: "
+"%s\t\t\tASCII tÃªn khÃ¡c: "
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tPháº§n má» rá»ng:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tRÃ ng buá»c CÆ¡ báº£n (%s):\n"
+
+#: x509/output.c:707 x509/output.c:722 x509/output.c:739 x509/output.c:755
+#: x509/output.c:770 x509/output.c:787 x509/output.c:802 x509/output.c:820
+#: x509/output.c:833 x509/output.c:1482 x509/output.c:1505 x509/output.c:1518
+msgid "critical"
+msgstr "tá»i háº¡n"
+
+#: x509/output.c:707 x509/output.c:722 x509/output.c:739 x509/output.c:755
+#: x509/output.c:770 x509/output.c:787 x509/output.c:802 x509/output.c:820
+#: x509/output.c:833 x509/output.c:1482 x509/output.c:1505 x509/output.c:1518
+msgid "not critical"
+msgstr "khÃ´ng tá»i háº¡n"
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\tÄá» nháºn diá»n KhoÃ¡ NgÆ°á»i dÃ¢n (%s):\n"
+
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tÄá» nháºn diá»n KhoÃ¡ NhÃ  cáº§m quyá»n (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tSá» dá»¥ng KhoÃ¡ (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tMá»¥c ÄÃch KhoÃ¡ (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tTÃªn Xen káº½ NgÆ°á»i dÃ¢n (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tÄiá»m phÃ¢n phá»i CRL (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tThÃ´ng tin Chá»©ng nháºn á»¦y nhiá»m (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tPháº§n má» rá»ng khÃ´ng ÄÆ°á»£c nháºn ra %s (%s):\n"
+
+#: x509/output.c:878
+#, c-format
+msgid "%s\t\t\tASCII: "
+msgstr "%s\t\t\tASCII: "
+
+#: x509/output.c:882
+#, c-format
+msgid "%s\t\t\tHexdump: "
+msgstr "%s\t\t\tÄá» tháºp lá»¥c: "
+
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tPhiÃªn báº£n %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tSá» sáº£n xuáº¥t (tháºp lá»¥c): "
 
-#: lib/x509/output.c:554 lib/x509/output.c:1209
+#: x509/output.c:931 x509/output.c:1399
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tNhÃ  cáº¥p: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tHá»£p lá»:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tKhÃ´ng pháº£i trÆ°á»c: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tKhÃ´ng pháº£i sau : %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tNgÆ°á»i dÃ¢n: %s\n"
 
-#: lib/x509/output.c:617 lib/x509/output.c:894 lib/x509/output.c:1305
-#: lib/openpgp/output.c:238
+#: x509/output.c:994 x509/output.c:1081 x509/output.c:1224 x509/output.c:1616
+#: x509/output.c:1726 openpgp/output.c:237
 msgid "unknown"
 msgstr "khÃ´ng rÃµ"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
-msgstr "\tThuáºt toÃ¡n khoÃ¡ cÃ´ng ngÆ°á»i dÃ¢n: %s\n"
+msgstr "\tThuáºt toÃ¡n KhoÃ¡ CÃ´ng NgÆ°á»i dÃ¢n: %s\n"
 
-#: lib/x509/output.c:633 lib/openpgp/output.c:258
+#: x509/output.c:1010 x509/output.c:1741 openpgp/output.c:257
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tGiÃ¡ trá» tuyá»t Äá»i (%d bit):\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tMÅ© :\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tMÅ© (%d bit):\n"
 
-#: lib/x509/output.c:654 lib/openpgp/output.c:285
+#: x509/output.c:1032 x509/output.c:1763 openpgp/output.c:284
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tKhoÃ¡ cÃ´ng (%d bit):\n"
 
-#: lib/x509/output.c:656 lib/openpgp/output.c:287
+#: x509/output.c:1034 x509/output.c:1765 openpgp/output.c:286
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: lib/x509/output.c:658 lib/openpgp/output.c:289
+#: x509/output.c:1036 x509/output.c:1767 openpgp/output.c:288
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: lib/x509/output.c:660 lib/openpgp/output.c:291
+#: x509/output.c:1038 x509/output.c:1769 openpgp/output.c:290
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: lib/x509/output.c:706
-msgid "\tExtensions:\n"
-msgstr "\tPháº§n má» rá»ng:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tRÃ ng buá»c cÆ¡ báº£n (%s):\n"
-
-#: lib/x509/output.c:717 lib/x509/output.c:732 lib/x509/output.c:747
-#: lib/x509/output.c:762 lib/x509/output.c:777 lib/x509/output.c:794
-#: lib/x509/output.c:809 lib/x509/output.c:826 lib/x509/output.c:838
-msgid "critical"
-msgstr "tá»i háº¡n"
-
-#: lib/x509/output.c:717 lib/x509/output.c:732 lib/x509/output.c:747
-#: lib/x509/output.c:762 lib/x509/output.c:777 lib/x509/output.c:794
-#: lib/x509/output.c:809 lib/x509/output.c:826 lib/x509/output.c:838
-msgid "not critical"
-msgstr "khÃ´ng tá»i háº¡n"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\tÄá» nháºn diá»n khoÃ¡ ngÆ°á»i dÃ¢n (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tÄá» nháºn diá»n khoÃ¡ nhÃ  cáº§m quyá»n (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tSá» dá»¥ng khoÃ¡ (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tMá»¥c ÄÃch khoÃ¡ (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tTÃªn xen káº½ ngÆ°á»i dÃ¢n (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tÄiá»m phÃ¢n phá»i CRL (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tThÃ´ng tin chá»©ng nháºn á»§y nhiá»m (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tPháº§n má» rá»ng láº¡ %s (%s):\n"
-
-#: lib/x509/output.c:866
-msgid "\t\t\tASCII: "
-msgstr "\t\t\tASCII: "
-
-#: lib/x509/output.c:870
-msgid "\t\t\tHexdump: "
-msgstr "\t\t\tÄá» tháºp lá»¥c: "
-
-#: lib/x509/output.c:895 lib/x509/output.c:1306
+#: x509/output.c:1082 x509/output.c:1617
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
-msgstr "\tThuáºt toÃ¡n chá»¯ kÃ½: %s\n"
+msgstr "\tThuáºt toÃ¡n Chá»¯ kÃ½: %s\n"
 
-#: lib/x509/output.c:901 lib/x509/output.c:1312
+#: x509/output.c:1086 x509/output.c:1621
 msgid "warning: signed using a broken signature algorithm that can be 
forged.\n"
 msgstr "cáº£nh bÃ¡o : ÄÃ£ kÃ½ dÃ¹ng má»t thuáºt toÃ¡n chá»¯ kÃ½ bá» há»ng 
cÃ³ thá» bá» giáº£ máº¡o.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tChá»¯ kÃ½:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -816,7 +850,7 @@ msgstr ""
 "\tDáº¥u tay MD5:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -824,137 +858,200 @@ msgstr ""
 "\tDáº¥u tay SHA1:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
 msgstr ""
-"\tMÃ£ sá» khoÃ¡ cÃ´ng:\n"
+"\tMÃ£ sá» KhoÃ¡ CÃ´ng:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "ÄÃ£ kÃ½ dÃ¹ng %s (bá» há»ng !), "
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "ÄÃ£ kÃ½ dÃ¹ng %s, "
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
-msgstr "ThÃ´ng tin chá»©ng nháºn X.509:\n"
+msgstr "ThÃ´ng tin Chá»©ng nháºn X.509:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "ThÃ´ng tin khÃ¡c:\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tPhiÃªn báº£n: 1 (máº·c Äá»nh)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tNgÃ y cáºp nháºt:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tCáº¥p: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tLáº§n sau vÃ o : %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tPháº§n má» rá»ng:\n"
+
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tSá» CRL (%s): "
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tÄá» nháºn diá»n KhoÃ¡ NhÃ  cáº§m quyá»n (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tPháº§n má» rá»ng khÃ´ng ÄÆ°á»£c nháºn ra %s (%s):\n"
+
+#: x509/output.c:1546 x509/output.c:1881
+msgid "\t\t\tASCII: "
+msgstr "\t\t\tASCII: "
+
+#: x509/output.c:1550 x509/output.c:1885
+msgid "\t\t\tHexdump: "
+msgstr "\t\t\tÄá» tháºp lá»¥c: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tChá»©ng nháºn bá» thu há»i (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tKhÃ´ng cÃ³ chá»©ng nháºn bá» thu há»i.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSá» sáº£n xuáº¥t (tháºp lá»¥c): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tThu há»i vÃ o : %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Danh sÃ¡ch Thu há»i Chá»©ng nháºn X.509:\n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tMÅ© :\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tThuá»c tÃnh:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr "\t\tMáºt kháº©u yÃªu cáº§u : %s\n"
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tKhÃ´ng nháºn ra thuá»c tÃnh %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "ThÃ´ng tin YÃªu cáº§u Chá»©ng nháºn PKCS #10:\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
-msgstr "\t\tSá» dá»¥ng khoÃ¡:\n"
+msgstr "\t\tSá» dá»¥ng KhoÃ¡:\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "lá»i: get_key_usage: %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tChá»¯ kÃ½ thuáºt sá».\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
-msgstr "\t\t\tMÃ£ hoÃ¡ giao thÃ´ng.\n"
+msgstr "\t\t\tMáºt mÃ£ hoÃ¡ giao thÃ´ng.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
-msgstr "\t\t\tMÃ£ hoÃ¡ dá»¯ liá»u lÆ°u trá»¯.\n"
+msgstr "\t\t\tMáºt mÃ£ hoÃ¡ dá»¯ liá»u lÆ°u trá»¯.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tXÃ¡c thá»±c.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tKÃ½ chá»©ng nháºn.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tMÃ£ sá» (tháºp lá»¥c): "
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tDáº¥u tay (tháºp lá»¥c):"
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tThu há»i: ÄÃºng\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tThu há»i: Sai\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tNhÃ£n thá»i gian.\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tTáº¡o : %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tHáº¿t háº¡n: KhÃ´ng bao giá»\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tHáº¿t háº¡n: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
-msgstr "\tThuáºt toÃ¡n khoÃ¡ cÃ´ng: %s\n"
+msgstr "\tThuáºt toÃ¡n KhoÃ¡ CÃ´ng: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tTÃªn[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
-msgstr "\tThu há»i tÃªn [%d]: %s\n"
+msgstr "\tTÃªn bá» thu há»i [%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -963,6 +1060,44 @@ msgstr ""
 "\n"
 "\tKhoÃ¡ phá»¥[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "tÃªn[%d]: %s, "
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "tÃªn bá» thu há»i[%d]: %s, "
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "dáº¥u tay: "
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "táº¡o : %s, "
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "khÃ´ng bao giá» háº¿t háº¡n, "
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "háº¿t háº¡n: %s, "
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "thuáºt toÃ¡n khoÃ¡ %s (%d bit)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "khÃ´ng nháºn ra thuáºt toÃ¡n khoÃ¡ (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "ThÃ´ng tin chá»©ng nháºn OpenPGP:\n"


hooks/post-receive
-- 
GNU gnutls
[Prev in Thread]
Current Thread
[Next in Thread]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-49-gea038ef, Simon Josefsson <=
Prev by Date: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-46-gd2c494e
Next by Date: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-52-g520cf54
Previous by thread: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-46-gd2c494e
Next by thread: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-52-g520cf54
Index(es):
- Date
- Thread