From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 10 Aug 2009 13:05:11 +0000 (+0200)
Subject: Sync with TP.
X-Git-Tag: gnutls_2_9_2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ddc66d342cd1bd1a290effa3299f5ccd6120263;p=thirdparty%2Fgnutls.git

Sync with TP.
---

diff --git a/lib/po/cs.po.in b/lib/po/cs.po.in
index 8f2c180e7e..750b54d381 100644
--- a/lib/po/cs.po.in
+++ b/lib/po/cs.po.in
@@ -1,554 +1,558 @@
-# Czech translation of gnutls.
+# Czech translation of libgnutls.
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls package.
+# This file is distributed under the same license as the libgnutls package.
 # Petr Pisar <petr.pisar@atlas.cz>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls 2.5.7\n"
+"Project-Id-Version: libgnutls 2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2009-01-19 19:39+0100\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-07-05 22:29+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "Úspěch."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Nezdařilo se vyjednat seznam podporovaných šifer."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
 msgstr "Tento druh šifry není podporován."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
 msgstr "Certifikát a daný klíč se k sobě nehodí."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "Nezdařilo se vyjednat podporovanou kompresní metodu."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
 msgstr "Narazil jsem na neznámý algoritmus veřejného klíče."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Byl vyjednán algoritmus, který není povolen."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Byl přijat packet s velkou TLS strukturou."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Byl přijat packet s neplatnou verzí struktury."
 
-#: 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 "Diffieho-Hellmanovo prvočíslo poslané serverem není přijatelné (není dost dlouhé)."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
 msgstr "Byl přijat TLS packet s neočekávanou délkou."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
-msgstr "Zadaná relace byl z nějakého důvodu zneplatněna."
+msgstr "Zadaná relace byla z nějakého důvodu zneplatněna."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "Vnitřní chyba GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "Přijato neplatné rozšíření TLS."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
 msgstr "Bylo přijato nepřekonatelné upozornění TLS."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Byl přijat neočekávaný TLS packet."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
 msgstr "Bylo přijato varovné upozornění TLS."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Při výpočtu packetu TLS Finished došlo k chybě."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "Druhá strana neposlala žádný certifikát."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Kryptografický algoritmus s nižší prioritou je již přítomen."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "Nebyly nalezeny žádné dočasné parametry RSA."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "Nebyly nalezeny žádné dočasné parametry DH."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Byl přijat neočekávaný packet zahajující TLS."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Prohlížení velkého celého čísla selhalo."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "Velké celé číslo nebylo možné exportovat."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
 msgstr "Dešifrování selhalo."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
 msgstr "Šifrování selhalo."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
 msgstr "Dešifrovaní veřejného klíče selhalo."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
 msgstr "Šifrování veřejného klíče selhalo."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Podepisování veřejného klíče selhalo."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Podpis veřejného klíče se nepodařilo ověřit."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekomprese packetu s TLS strukturou selhala."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Komprese packetu s TLS strukturou selhala."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "Vnitřní chyba při alokaci paměti."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Byla požadována neimplementovaná nebo zakázaná vlastnost."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "Na takový požadavek chybí prokázání totožnosti."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "Chyba v souboru s hesly."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Chybná výplň v PKCS1 packetu."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
 msgstr "Požadovaná relace vypršela."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Hašování selhalo."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "Chyba při dekódování Base64."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Neočekávaná Base64 hlavička (chyba)."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "Chyba kódování do Base64."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "Chyba při rozebírání souboru s hesly."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "Požadovaná data nebyla dostupná."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "Chyba v pull funkci."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "Chyba v push funkci."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Bylo dosaženo horní meze pořadového čísla packetu se strukturou. Zírám!"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "Chyba v certifikátu."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Neznámé alternativní jméno subjektu v X.509 certifikátu."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Nepodporované kritické rozšíření v X.509 certifikátu."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "Bylo zaznamenáno použití klíče v rozporu s pravidly."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "Zdroj je dočasně nedostupný, zkusí se znovu."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "Funkce byla přerušena."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "Druhá strana požádala o znovuzahájení relace."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
-msgstr "Byla přijata data TLS Application, zatímco měly přijít data zahájení."
+msgstr "Byla přijata aplikační data TLS, zatímco měla přijít data zahájení."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "Chyba databázovém jádře."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
 msgstr "Tento druh certifikátu není podporován."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Zadaný paměťový buffer je pro uložení parametrů příliš malý."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "Požadavek je neplatný."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "Byl přijat neplatný parametr."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "Chyba při čtení souboru."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1 parser: Prvek nebyl nalezen."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1 parser: Identifikátor nebyl nalezen."
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1 parser: Chyba při rozebírání DER."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1 parser: Hodnota nebyla nalezena."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1 parser: Obecná chyba při rozebírání."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1 parser: Hodnota není platná."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1 parser: Chyba ve ZNAČCE."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1 parser: chyba v implicitní značce"
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1 parser: Chyba v typu „ANY“."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1 parser: Chyba syntaxe."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1 parser: Přetečení při rozebírání DER."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
 msgstr "Bylo přijato příliš mnoho packetů s prázdnou strukturou."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Inicializace GnuTLS-extra selhala."
 
-#: lib/gnutls_errors.c:203
+#: gnutls_errors.c:202
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Verze knihovny GnuTLS se neshoduje s verzí knihovny GnuTLS-extra."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
 msgstr "Verze knihovny gcrypt je příliš stará."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
 msgstr "Verze knihovny tasn1 je příliš stará."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "ID OpenPGP uživatele bylo odvoláno."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "Chyba při načítání souboru s klíči. "
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Inicializace LZO selhala."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "Žádné podporované kompresní algoritmy nebyly nalezeny."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "Žádné podporované režimy šifer nebyly nalezeny."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "Nebylo možné získat OpenPGP klíč."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "Nebylo možné najít OpenPGP podklíč."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "Zadané SRP uživatelské jméno je neplatné."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "OpenPGP otisk není podporován."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Certifikát má nepodporované atributy."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "Tento OID není podporován."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
 msgstr "Hašovací algoritmus není znám."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
 msgstr "Typ obsahu struktury PKCS není znám."
 
 # „Bag“ překládá jako „kufřík“ Klíma
 # <http://crypto-world.info/klima/2001/chip-2001-04-176-178.pdf>. Jedná se
 # o prvek struktury PFX.
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Typ kufříku ve struktuře PKCS není znám."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "Zadané heslo obsahuje neplatné znaky."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "MAC (autentizační kód zprávy) se nepodařilo ověřit."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "Některé hranice omezení byly dosaženy."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Nezdařilo se získat náhodná data."
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Přijata TLS/IA zpráva Intermediate Phase Finished"
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Přijata TLS/IA zpráva Final Phase Finished"
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Kontrolní součet fáze TLS/IA se nepodařilo ověřit"
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Zadaný algoritmus nebo protokol není znám."
 
-#: 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 "Zahajovací data jsou příliš velká (DoS?), zkontrolujte gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(neznámý chybový kód)"
 
-#: lib/gnutls_alert.c:42
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "Oznámení o uzavření"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "Neočekávaná zpráva"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "Chybný MAC zprávy"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
 msgstr "Dešifrování selhalo"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "Přetečení struktury"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
 msgstr "Dekomprese selhala"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
 msgstr "Zahájení (handshake) selhalo"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "Certifikát je špatný"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Certifikát není podporován"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Certifikát byl odvolán"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Certifikát vypršel"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "Neznámý certifikát"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Neplatný parametr"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "Autorita není známa"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Přístup byl zamítnut"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "Chyba dekódování"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "Chyba dešifrování"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
 msgstr "Omezení na export"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "Chyba ve verzi protokolu"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "Nedostatečné zabezpečení"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "Uživatel zrušen"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "Znovuvyjednání není dovoleno"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "Zadaný certifikát nebylo možné získat"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "Bylo odesláno nepodporované rozšíření"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "Odeslané jméno serveru nebylo rozpoznáno"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
 msgstr "SRP/PSK jméno uživatele chybí nebo není známo"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
 msgstr "Vyjednávání vnitřní aplikace (IA) selhalo"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
 msgstr "Ověření vnitřní aplikace (IA) selhalo"
 
-#: 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\tOmezení délky cesty: %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
-msgstr "\t\t\tJazyk polity: %s"
+msgstr "\t\t\tJazyk politiky: %s"
 
-#: lib/x509/output.c:123
+#: x509/output.c:166
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -556,7 +560,7 @@ msgstr ""
 "\t\t\tPolitika:\n"
 "\t\t\t\tASCII: "
 
-#: lib/x509/output.c:125
+#: x509/output.c:168
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -564,252 +568,282 @@ msgstr ""
 "\n"
 "\t\t\t\tHexavýpis: "
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tDigitální podpis.\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tDigitální podpis.\n"
 
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\tNepopiratelnost.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tNepopiratelnost.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tŠifrování klíčů.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tŠifrování klíčů.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tŠifrování dat.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tŠifrování dat.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tDohodnutí klíče.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tDohodnutí klíče.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tPodepisování certifikátu.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tPodepisování certifikátu.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tPodepisování CRL.\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tPodepisování CRL.\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tPouze šifrování klíčů.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tPouze šifrování klíčů.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tPouze dešifrování klíčů.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tPouze dešifrování klíčů.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tTLS WWW server.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tTLS WWW server.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tTLS WWW klient.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tTLS WWW klient.\n"
 
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tPodepisování kódu.\n"
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tPodepisování kódu.\n"
+
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tOchrana e-mailu.\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tOchrana e-mailu.\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tČasové razítkování.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tČasové razítkování.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tPodepisování OCSP.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tPodepisování OCSP.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tJakýkoliv účel.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tJakýkoliv účel.\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tCertifikační autorita (CA): NE\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tCertifikační autorita (CA): NE\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tCertifikační autorita (CA): ANO\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tCertifikační autorita (CA): ANO\n"
+#: x509/output.c:493
+#, c-format
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tOmezení délky cesty: %d\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tXMPP adresa: %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tXMPP adresa: %.*s\n"
 
-#: lib/x509/output.c:494
+#: x509/output.c:630
 #, c-format
-msgid "\t\t\totherName OID: %.*s\n"
-msgstr "\t\t\tOID dalšíhoJména: %.*s\n"
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\tOID dalšíhoJména: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\tdalšíJméno v DER: "
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\tdalšíJméno v DER: "
 
-#: 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\tdalšíJméno v ASCII: "
+"%s\t\t\tdalšíJméno v ASCII: "
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tRozšíření:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tZákladní omezení (%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 "kritické"
+
+#: 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 "není kritické"
+
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\t\tIdentifikátor klíče subjektu (%s):\n"
+
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tIdentifikátor klíče autority (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tUžití klíče (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tÚčel klíče (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tAlternativní jméno subjektu (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tMísta distribuce CRL (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tInformace o zástupném certifikátu (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tNeznámé rozšíření %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\tHexavýpis: "
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVerze: %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tSériové číslo (hex): "
 
-#: 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 "\tVydavatel: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tPlatnost:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNe před: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNe po: %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tSubjekt: %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 "není známo"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritmus veřejného klíče subjektu: %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\tModul (%d bitů:)\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tMocnitel:\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tMocnitel (%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\tVeřejný klíč (%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 "\tRozšíření:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tZákladní omezení (%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 "kritické"
-
-#: 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 "není kritické"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\t\tIdentifikátor klíče subjektu (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tIdentifikátor klíče autority (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tUžití klíče (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tÚčel klíče (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tAlternativní jméno subjektu (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tMísta distribuce CRL (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tInformace o zástupném certifikátu (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tNeznámé rozšíření %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\tHexavýpis: "
-
-#: 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 "\tAlgoritmus podpisu: %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 "varování: podepsáno vadným podpisovým algoritmem, kterým lze falšovat.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tPodpis:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -817,7 +851,7 @@ msgstr ""
 "\tMD5 otisk:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -825,7 +859,7 @@ msgstr ""
 "\tSHA-1 otisk:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -833,129 +867,192 @@ msgstr ""
 "\tID veřejného klíče:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "podepsáno pomocí %s (rozbito!), "
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "podepsáno pomocí %s, "
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
 msgstr "Informace X.509 certifikátu:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "Další Informace:\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVerze: 1 (implicitní)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tData aktualizací:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tVydáno: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tDalší v: %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tRozšíření:\n"
+
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tČíslo CRL (%s): "
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tIdentifikátor klíče autority (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tNeznámé rozšíření %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\tHexavýpis: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tOdvolané certifikáty (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tŽádné odvolané certifikáty.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSériové číslo (hex): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tOdvoláno v: %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informace o seznamu odvolaných X.509 certifikátů (CRL):\n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tMocnitel:\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tAtributy:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr "\t\tHeslo výzvy: %s\n"
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tNeznámý atribut %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "Informace PKCS #10 žádosti o certifikát:\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tUžití klíče:\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "chyba: get_key_usage: %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitální podpisy.\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tŠifrování komunikace.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tŠifrování uložených dat.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAutentizace.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tPodepisování certifikátu.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tOtisk (hex): "
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tOdvolán: Ano\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tOdvolán: Ne\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tČasová razítka:\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tVytvoření: %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tVypršení: Nikdy\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tVypršení: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritmus veřejného klíče: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tJméno[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tOdvolané jméno[%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -964,6 +1061,44 @@ msgstr ""
 "\n"
 "\tPodklíč[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "jméno[%d]: %s, "
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "odvolané jméno[%d]: %s, "
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "otisk: "
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "vytvořen: %s, "
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "platnost nikdy nevyprší, "
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "platnost vyprší: %s, "
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "algoritmus klíče %s (%d bitů)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "neznámý algoritmus klíče (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informace o OpenPGP certifikátu:\n"
diff --git a/lib/po/fr.po.in b/lib/po/fr.po.in
index 6e371efae4..b528001672 100644
--- a/lib/po/fr.po.in
+++ b/lib/po/fr.po.in
@@ -1,551 +1,555 @@
-# translation of gnutls-2.5.7.po to French
+# translation of libgnutls-2.8.1.po to French
 # Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls-2.5.7 package.
-# Nicolas Provost <nprovost@quadriv.com>, 2008.
+# This file is distributed under the same license as the libgnutls package.
+# Nicolas Provost <nprovost@quadriv.com>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls-2.5.7 2.5.7\n"
+"Project-Id-Version: libgnutls 2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2008-09-17 12:12+0100\n"
-"Last-Translator: N. Provost <nprovost@quadriv.com>\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-07-03 20:50+0100\n"
+"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "Succès."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Impossible de négocier une méthode de chiffrement."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
 msgstr "Algorithme de chiffrement non supporté."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
 msgstr "Le certificat ne correspond pas avec la clef fournie."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "Echec lors de la négociation d'une méthode de compression."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
 msgstr "Algorithme de clef publique inconnu."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Un algorithme non encore opérationnel a été négocié."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Un paquet TLS volumineux de données applicatives a été reçu."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Un paquet de données contenant un numéro de version incorrect a été reçu."
 
-#: lib/gnutls_errors.c:72
-msgid "The Diffie Hellman prime sent by the server is not acceptable (not long enough)."
-msgstr "Le nombre premier de Diffie Hellman envoyé par le serveur n'est pas acceptable (pas suffisamment grand)."
+#: gnutls_errors.c:70
+msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."
+msgstr "Le nombre de Diffie-Hellman envoyé par le serveur n'est pas suffisamment grand."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
 msgstr "Un paquet TLS de longueur incorrecte a été reçu."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
 msgstr "La session courante a été invalidée pour une raison non précisée."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "Erreur interne GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "Une extension TLS incorrecte a été reçue."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
 msgstr "Une alerte TLS fatale a été reçue."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Un paquet TLS incorrect a été reçu."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
 msgstr "Un avertissement TLS a été reçu."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Erreur durant la préparation du paquet TLS de fin d'établissement de session (\"TLS Finished\")."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "La machine distante n'a pas envoyé de certificat."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Un algorithme de chiffrement de priorité inférieure a déjà été sélectionné."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "Paramètres temporaires RSA non trouvés."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "Paramètres temporaires DH non trouvés."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Un paquet de négociation (handshake) TLS incorrect a été reçu."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Echec lors de la recherche d'un grand entier."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "Impossible de transmettre un grand nombre entier."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
 msgstr "Le décryptage a échoué."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
 msgstr "Le chiffrement a échoué."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
 msgstr "Le déchiffrement a échoué (clef publique)."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
 msgstr "Le chiffrement a échoué (clef publique)."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Echec de la signature (clef publique)."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Echec lors de la vérification de la signature (clef publique)."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Echec de la décompression d'un paquet TLS de données applicatives (\"TLS Record\")."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Echec de la compression d'un paquet TLS de données applicatives (\"TLS Record\")."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "Erreur interne d'allocation mémoire."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Une fonctionnalité non supportée a été demandée."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "Droits insuffisants pour satisfaire cette demande."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "Erreur dans le fichier de mots de passe."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Bourrage (padding) PKCS1 incorrect."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
 msgstr "La session a expiré."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Le calcul d'empreinte (hash) a échoué."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "Erreur de décodage Base64."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Erreur au niveau de l'entête Base64."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "Erreur d'encodage Base64."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "Erreur d'analyse du fichier de mots de passe."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "Les données demandées ne sont pas disponibles."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "Erreur au niveau de la fonction \"pull\"."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "Erreur au niveau de la fonction \"push\"."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "La valeur maximale des numéros de séquence des paquets de données applicatives \"TLS Record\" a été atteinte !"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "Erreur dans le certificat."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "L'entrée \"Subject Alternative Name\" (autre nom du sujet) du certificat X509 est vide."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Une extension critique du certificat X509 n'est pas supportée."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "Utilisation de la clef d'un certificat pour un usage non prévu."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "Ressource temporairement indisponible, réessayer."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "Interruption de fonction."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "Une renégociation a été demandée par la machine distante."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Des données applicatives TLS ont été reçues alors que des données de négociation étaient attendues."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "Erreur dans la structure de la base de données."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
 msgstr "Ce type de certificat n'est pas supporté."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Le tampon mémoire donné est trop petit pour contenir tous les paramètres."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "Requête incorrecte."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "Un paramètre incorrect a été reçu."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "Erreur de lecture de fichier."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "Element manquant durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "Identifiant non trouvé durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "Erreur de décodage DER durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "Valeur non trouvée durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "Erreur durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "Valeur incorrecte détectée durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "Erreur d'étiquette (tag) détectée durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "Erreur d'étiquette (tag implicite) détectée durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "Erreur dans un type \"ANY\" détectée lors de l'analyse ASN1."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "Erreur de syntaxe détectée lors de l'analyse ASN1."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "Dépassement de capacité lors du décodage DER durant l'analyse ASN1."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
 msgstr "Trop de paquets de données applicatives (\"TLS Record\") vides ont été reçus."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Echec de l'initialisation de 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 "La version de la librairie GnuTLS ne correspond pas à celle de la librairie GnuTLS-extra."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
 msgstr "La version utilisée de la librairie gcrypt est trop ancienne."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
 msgstr "La version utilisée de la librairie tasn1 est trop ancienne."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "L'identifiant d'utilisateur OpenPGP (User ID) est révoqué."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "Erreur durant le chargement du trousseau de clefs."
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Echec de l'initialisation de LZO."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "Aucun algorithme de compression n'est disponible."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "Aucune méthode de chiffrement n'est disponible."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "Impossible d'obtenir la clef OpenPGP."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "Impossible de trouver la sous-clef OpenPGP."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "Le nom d'utilisateur SRP communiqué est illicite."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "Cette empreinte OpenPGP n'est pas supportée."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Le certificat possède des attributs non supportés."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "Identifiant OID non supporté."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
 msgstr "Algorithme d'empreinte (hash) inconnu."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
 msgstr "Type de structure PKCS inconnu."
 
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Type de conteneur (bag) PKCS inconnu."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "Le mot de passe fourni comporte des caractères invalides."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "Echec de la vérification du code d'authentification du message (MAC)."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "Certaines valeurs limites ont été atteintes."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Impossible de générer une valeur aléatoire."
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Un message signalant l'avant-dernière étape de l'échange de données et clefs complémentaires (\"TLS/IA Intermediate Phase Finished\") a été reçu."
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Un message signalant la fin de l'échange de données et clefs complémentaires (\"TLS/IA Final Phase Finished\") a été reçu."
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Echec de la vérification de la somme de contrôle durant la phase \"TLS/IA\" (échange complémentaire de données et clefs)."
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "L'algorithme ou le protocole demandé est inconnu."
 
-#: 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 "La taille des données de négociation (handshake) est trop grande (déni de service ?). Contrôlez gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(code d'erreur inconnu)"
 
-#: lib/gnutls_alert.c:42
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "Notification de fermeture"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "Message inattendu"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "Mauvais bloc MAC"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
 msgstr "Le décryptage a échoué"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "Dépassement de taille d'enregistrement"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
 msgstr "Echec de décompression"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
 msgstr "Echec de négociation"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "Mauvais certificat"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Ce certificat n'est pas supporté"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Le certificat est révoqué"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Le certificat a expiré"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "Certificat inconnu"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Paramètre illégal"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "Autorité racine CA inconnue"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Accès refusé"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "Erreur de décodage"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "Erreur de déchiffrage"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
 msgstr "Restriction à l'export"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "Erreur de version de protocole"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "Sécurité insuffisante"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "Annulation par l'utilisateur"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "Renégociation interdite"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "Impossible d'obtenir le certificat spécifié"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "Une extension non supportée a été transmise"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "Le nom de serveur transmis n'est pas reconnu"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
 msgstr "Le nom d'utilisateur SRP/PSK est absent ou inconnu"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
 msgstr "Echec de négociation interne à l'application"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
 msgstr "La vérification interne à l'application a échoué"
 
-#: 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\tProfondeur de chemin de certificats (Path Length Constraint): %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tTermes de politique d'utilisation: %s"
 
-#: lib/x509/output.c:123
+#: x509/output.c:166
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -553,7 +557,7 @@ msgstr ""
 "\t\t\tPolitique-d'utilisation:\n"
 "\t\t\t\tASCII:"
 
-#: lib/x509/output.c:125
+#: x509/output.c:168
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -561,252 +565,282 @@ msgstr ""
 "\n"
 "\t\t\t\tCode-hexadécimal :"
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tSignature électronique.\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tSignature électronique.\n"
 
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\t\tNon répudiation.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tNon répudiation.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tChiffrement de clef.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tChiffrement de clef.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tChiffrement de données.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tChiffrement de données.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tValidation de clef.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tValidation de clef.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tSignature de certificat.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tSignature de certificat.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tSignature de liste de révocation (CRL).\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tSignature de liste de révocation (CRL).\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tChiffrement de clef seulement.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tChiffrement de clef seulement.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tDéchiffrement de clef seulement.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tDéchiffrement de clef seulement.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tServeur web TLS.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tServeur web TLS.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tClient web TLS.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tClient web TLS.\n"
 
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tSignature de code.\n"
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tSignature de code.\n"
+
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tProtection d'email.\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tProtection d'email.\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tHorodatage.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tHorodatage.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tSignature OCSP.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tSignature OCSP.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tToutes utilisations.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tToutes utilisations.\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tCertificat autorité (CA): NON\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tCertificat autorité (CA): NON\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tCertificat autorité (CA): OUI\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tCertificat autorité (CA): OUI\n"
+#: x509/output.c:493
+#, c-format
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tProfondeur de chemin de certificats (Path Length Constraint): %d\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tAdresse XMPP: %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tAdresse XMPP: %.*s\n"
 
-#: lib/x509/output.c:494
+#: x509/output.c:630
 #, c-format
-msgid "\t\t\totherName OID: %.*s\n"
-msgstr "\t\t\tautre nom OID: %.*s\n"
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\tautre nom OID: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\tautre Nom DER: "
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\tautre Nom DER: "
 
-#: 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\tautreNom ASCII:"
+"%s\t\t\tautreNom ASCII:"
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tExtensions:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tContraintes de base (%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 "critique"
+
+#: 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 "non critique"
+
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\t\tIdentifiant de clef du sujet (%s):\n"
+
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tIdentifiant de la clef de l'autorité (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tUsages possibles de la clef (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tUtilisation prévue de la clef (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tAutre nom du sujet (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tPoints de distribution des listes de révocation (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tDétails du certificat du proxy (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tExtension inconnue %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\tCode hexadécimal: "
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersion: %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tNuméro de série (hexadécimal): "
 
-#: 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 "\tEmetteur: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tValidité:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tPas avant: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tPas après: %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tSujet: %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 "inconnu"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgorithme de clef publique du sujet: %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\tModule (bits %d):\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tExposant:\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tExposant (bits %d):\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\tClef publique (bits %d):\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 "\tExtensions:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tContraintes de base (%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 "critique"
-
-#: 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 "non critique"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\t\tIdentifiant de clef du sujet (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tIdentifiant de la clef de l'autorité (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tUsages possibles de la clef (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tUtilisation prévue de la clef (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tAutre nom du sujet (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tPoints de distribution des listes de révocation (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tDétails du certificat du proxy (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tExtension inconnue %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\tCode hexadécimal: "
-
-#: 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 "\tAlgorithme de signature: %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 "attention : signé en utilisant un algorithme de signature déjà \"cassé\" (faible) potentiellement corruptible.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tSignature:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -814,7 +848,7 @@ msgstr ""
 "\tEmpreinte MD5:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -822,7 +856,7 @@ msgstr ""
 "\tEmpreinte SHA-1:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -830,129 +864,192 @@ msgstr ""
 "\tId de clef publique:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "signé avec %s (cassé !),"
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "signé avec %s,"
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
 msgstr "Détail du certificat X509:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "Autres informations :\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersion: 1 (défaut)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tDates de mise à jour:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tEmis: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tProchainement: %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tExtensions:\n"
+
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tNuméro de liste de révoc. CRL (%s):"
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tIdentifiant de la clef de l'autorité (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tExtension inconnue %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\tCode hexadécimal: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tCertificats révoqués (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tCertificats non révoqués.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tNuméro de série (hexa): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tRévoqué le : %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Détails sur la liste de révocation du certificat X509 : \n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tExposant:\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tAttributs:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr "\t\tMot de passe \"challenge\": %s\n"
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tAttribut inconnu %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "Informations de requête de certificat PKCS10 :\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tUsages possibles de la clef :\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "Erreur: get_key_usage: %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tSignatures électroniques.\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tChiffrement de communications.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tChiffrement de stockage de données.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAuthentification.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tSignature de certificat.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tID (hexa) :"
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tEmpreinte (hexa) : "
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tRévoqué: oui\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tRévoqué: non\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tHorodatage:\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tCréation: %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tExpiration: jamais\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tExpiration: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgorithme de clef publique: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNom[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tNom révoqué[%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -961,6 +1058,44 @@ msgstr ""
 "\n"
 "\tSous-clef[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "nom[%d]: %s, "
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "nom révoqué[%d]: %s, "
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "empreinte: "
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "créé: %s, "
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "n'expire jamais, "
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "expire: %s, "
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "algorithme de clé %s (%d bits)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "algorithme de clef inconnu (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Détails du certificat OpenPGP :\n"
diff --git a/lib/po/nl.po.in b/lib/po/nl.po.in
index 433b423c13..64a5c15453 100644
--- a/lib/po/nl.po.in
+++ b/lib/po/nl.po.in
@@ -1,553 +1,557 @@
-# Dutch translations for gnutls-2.5.7.
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls package.
-#
+# Dutch translations for libgnutls
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgnutls package.
 # Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
+# Erwin Poeze <erwin.poeze@gmail.com>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls-2.5.7\n"
+"Project-Id-Version: libgnutls-2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2008-09-21 22:06+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-07-03 09:34+0200\n"
+"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.3.1\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "Gelukt."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Kan geen gemeenschappelijke coderingsmethode overeenkomen."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
 msgstr "De coderingsmethode wordt niet ondersteund."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
 msgstr "Het certificaat en de gegeven sleutel passen niet bij elkaar."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "Kan geen gemeenschappelijke compressiemethode overeenkomen."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
 msgstr "Onbekend versleutelingsalgoritme gevonden."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Er werd een uitgeschakeld algoritme overeengekomen."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Er werd een groot TLS-datapakket ontvangen."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Er werd een datapakket met een ongedige versie ontvangen."
 
-#: 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 "Het door de server toegezonden Diffie-Hellman-priemgetal is niet acceptabel (niet lang genoeg)."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
 msgstr "Er werd een TLS-pakket met een onverwachte lengte ontvangen."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
 msgstr "De aangegeven sessie is om een of andere reden ongeldig geworden."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "**Interne fout** in GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "Er werd een ongeldige TLS-uitbreiding ontvangen."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
 msgstr "Er werd een ernstig TLS-alarm ontvangen."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Er werd een onverwacht TLS-pakket ontvangen."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
 msgstr "Er is een TLS-waarschuwing ontvangen."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Er is een fout opgetreden tijdens de TLS-pakketeinde-berekening."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "De andere computer heeft geen certificaat gestuurd."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Er is al een encryptie-algoritme met een lagere prioriteit."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "Er zijn geen tijdelijke RSA-parameters gevonden."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "Er zijn geen tijdelijke DH-parameters gevonden."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Er werd een onverwacht TLS-handshake-pakket ontvangen."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Het lezen van een groot geheel getal is mislukt."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "Het exporteren van een groot geheel getal is mislukt."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
 msgstr "Ontsleuteling is mislukt."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
 msgstr "Versleuteling is mislukt."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
 msgstr "Ontsleuteling met publieke sleutel is mislukt."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
 msgstr "Versleuteling met publieke sleutel is mislukt."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Ondertekenen met publieke sleutel is mislukt."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Controle van ondertekening met publieke sleutel is mislukt."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Decompressie van het TLS-datapakket is mislukt."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Compressie van het TLS-datapakket is mislukt."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "**Interne fout** bij reserveren van geheugen."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Er werd een uitgeschakelde of ongeïmplementeerde functie gevraagd."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "Onvoldoende rechten voor dat verzoek."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "Fout in wachtwoordenbestand."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Onjuiste opvulbytes in PKCS1-pakket."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
 msgstr "De gevraagde sessie is verlopen."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Hashen is mislukt."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "Base64-decoderingsfout."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Onverwachte fout in base64-kopregel."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "Base64-coderingsfout."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "Fout in de indeling van wachtwoordenbestand."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "De gevraagde gegevens zijn niet beschikbaar."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "Fout in de 'pull'-functie."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "Fout in de 'push'-functie."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Het hoogste volgnummer voor datapakketten is bereikt.  Wauw!"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "Fout in het certificaat."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Onbekende naam van toegevoegd onderwerp in X.509-certificaat."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Niet-ondersteunde kritieke uitbreiding in X.509-certificaat."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "Er is een overtreding van het sleutelgebruik in het certificaat geconstateerd."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "Resource is tijdelijk niet beschikbaar, probeer later nogmaals."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "Functie werd onderbroken."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "De andere computer heeft om een hernieuwde handshake gevraagd."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Er werd TLS-toepassingsdata ontvangen, terwijl handshake-gegevens verwacht werden."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "Fout in databank-backend."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
 msgstr "Het certificaattype wordt niet ondersteund."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Beschikbare buffer is te klein voor de gegeven parameters."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "Het verzoek is ongeldig."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "Er werd een ongeoorloofde parameter ontvangen."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "Fout tijdens lezen van bestand."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1-parser: Element niet gevonden."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1-parser: Naam niet gevonden."
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1-parser: Fout in ontleden van DER."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1-parser: Waarde niet gevonden."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1-parser: Algemene ontledingsfout."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1-parser: Waarde is ongeldig."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1-parser: Fout in TAG."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1-parser: Fout in impliete tag."
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1-parser: Fout in type 'ANY'."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1-parser: Syntaxfout."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1-parser: Overloop in DER-ontleding."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
 msgstr "Er zijn te veel lege datapakketten ontvangen."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Het initialiseren van GnuTLS-extra is mislukt."
 
-#: lib/gnutls_errors.c:203
+#: gnutls_errors.c:202
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "De versies van de GnuTLS- en GnuTLS-extra-bibliotheken komen niet overeen."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
 msgstr "De versie van de gcrypt-bibliotheek is te oud."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
 msgstr "De versie van de tasn1-bibliotheek is te oud."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "Het OpenPGP-gebruikers-ID is ingetrokken."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "Fout tijdens laden van de sleutelring."
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Het initialiseren van LZO is mislukt."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "Er is geen ondersteund compressie-algoritme gevonden."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "Er is geen ondersteund encryptie-algoritme gevonden."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "Kan OpenPGP-sleutel niet verkrijgen."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "Kan OpenPGP-subsleutel niet vinden."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "De gegeven SRP-gebruikersnaam is ongeldig."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "De OpenPGP-vingerafdruk wordt niet ondersteund."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Het certificaat heeft niet-ondersteunde eigenschappen."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "Het OID wordt niet ondersteund."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
 msgstr "Onbekend hash-algoritme."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
 msgstr "Onbekend inhoudstype van PKCS-structuur."
 
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Onbekend buideltype van PKCS-structuur."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "Het opgegeven wachtwoord bevat ongeldige tekens."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "Verificatie van berichtauthenticatiecode is mislukt."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "Sommige beperkingsgrenzen werden bereikt."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Kan geen willekeurige bits verkrijgen."
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "TLS/IA-tussenfasebeëindigingsbericht ontvangen"
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "TLS/IA-eindfasebeëindigingsbericht ontvangen"
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Verificatie van TLS/IA-fasecontrolesom is mislukt"
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Het opgegeven algoritme of protocol is onbekend."
 
-#: 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 "De gegevensgrootte van de handshake is te groot (DoS-aanval?); controleer gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(onbekende foutcode)"
 
-#: lib/gnutls_alert.c:42
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "Afsluitingsbericht"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "Onverwacht bericht"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "Record met ongeldige MAC"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
 msgstr "Ontsleuteling is mislukt"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "Recordoverloop"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
 msgstr "Decompressie is mislukt"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
 msgstr "Handshake is mislukt"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "Certificaat is ongeldig"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Certificaat wordt niet ondersteund"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Certificaat is ingetrokken"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Certificaat is verlopen"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "Onbekend certificaat"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Ongeldige parameter"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "CA is onbekend"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Toegang werd geweigerd"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "Decoderingsfout"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "Ontsleutelingsfout"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
 msgstr "Exportbeperking"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "Fout in protocolversie"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "Onvoldoende veiligheid"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "Door gebruiker geannuleerd"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "**Interne fout**"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "Heronderhandeling is niet toegestaan"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "Kan het opgegeven certificaat niet ophalen"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "Een niet-ondersteunde uitbreiding werd toegezonden"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "De toegezonden servernaam werd niet herkend"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
 msgstr "De SRP/PSK-gebruikersnaam ontbreekt of is onbekend"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
 msgstr "Inwendige programmaonderhandeling is mislukt"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
 msgstr "Inwendige programmaverificatie is mislukt"
 
-#: 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\tPadlengtebeperking: %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tBeleidstaal: %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\tBeleid:\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\tHexdump: "
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tDigitale ondertekening.\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tDigitale ondertekening.\n"
 
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\t\tNiet-herroeping.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tNiet-herroeping.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tSleutel-encryptie.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tSleutel-encryptie.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tData-encryptie.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tData-encryptie.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tSleutelovereenstemming.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tSleutelovereenstemming.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tCertificaatondertekening.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tCertificaatondertekening.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tCRL-ondertekening.\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tCRL-ondertekening.\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tAlleen sleutel-encryptie.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tAlleen sleutel-encryptie.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tAlleen sleutel-decryptie.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tAlleen sleutel-decryptie.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tTLS WWW-server.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tTLS WWW-server.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tTLS WWW-cliënt.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tTLS WWW-cliënt.\n"
 
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tCode-ondertekening.\n"
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tCode-ondertekening.\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tE-mailbescherming.\n"
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tE-mailbescherming.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tTijdsstempels.\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tTijdsstempels.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tOCSP-ondertekening.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tOCSP-ondertekening.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tElk doel.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tElk doel.\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tCertificaatautoriteit (CA): ONWAAR\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tCertificaatautoriteit (CA): ONWAAR\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tCertificaatautoriteit (CA): WAAR\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tCertificaatautoriteit (CA): WAAR\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:493
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tXMPP-adres: %.*s\n"
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tPadlengtebeperking: %d\n"
 
-#: lib/x509/output.c:494
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\totherName OID: %.*s\n"
-msgstr "\t\t\tAndere naam (OID): %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tXMPP-adres: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\tAndere naam (DER): "
+#: x509/output.c:630
+#, c-format
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\tAndere naam (OID): %.*s\n"
+
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\tAndere naam (DER): "
 
-#: 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\tAndere naam (ASCII): "
+"%s\t\t\tAndere naam (ASCII): "
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tUitbreidingen:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tFundamentele beperkingen (%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 "kritiek"
+
+#: 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 "niet kritiek"
+
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\t\tOnderwerps-ID van sleutel (%s):\n"
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tAutoriteits-ID van sleutel (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tGebruik van sleutel (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tDoel van sleutel (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tToegevoegde onderwerpen (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tCRL-distributiepunten (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tInformatie over proxy-certificaat (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tOnbekende uitbreiding %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\tHexdump: "
+
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersie: %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tSerienummer (hex): "
 
-#: 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 "\tUitgever: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tGeldigheid:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNiet vóór: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNiet na: %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tOnderwerp: %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 "onbekend"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritme van publieke sleutel: %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\tModulus (bits %d):\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tExponent:\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tExponent (bits %d):\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\tPublieke sleutel (bits %d):\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 "\tUitbreidingen:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tFundamentele beperkingen (%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 "kritiek"
-
-#: 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 "niet kritiek"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\t\tOnderwerps-ID van sleutel (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tAutoriteits-ID van sleutel (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tGebruik van sleutel (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tDoel van sleutel (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tToegevoegde onderwerpen (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tCRL-distributiepunten (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tInformatie over proxy-certificaat (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tOnbekende uitbreiding %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\tHexdump: "
-
-#: 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 "\tOndertekeningsalgoritme: %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 "Waarschuwing: ondertekend met een algoritme dat vervalst kan worden.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tOndertekening:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -816,7 +850,7 @@ msgstr ""
 "\tMD5-vingerafdruk:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -824,7 +858,7 @@ msgstr ""
 "\tSHA-1-vingerafdruk:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -832,129 +866,192 @@ msgstr ""
 "\tID van publieke sleutel:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "Ondertekend met %s (beschadigd!),"
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "ondertekent met %s,"
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
 msgstr "Informatie over X.509-certificaten:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "Andere informatie:\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersie: 1 (standaard)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tBijwerkingsdata:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tUitgegeven: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tVolgende op: %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tUitbreidingen:\n"
+
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tCRL-nummer (%s): "
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tAutoriteits-ID van sleutel (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tOnbekende uitbreiding %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\tHexdump: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tIngetrokken certificaten (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tGeen ingetrokken certificaten.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSerienummer (hex): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tIngetrokken op: %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informatie over ingetrokken X.509-certificaten:\n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tExponent:\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tEigenschappen:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr ""
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tOnbekende uitbreiding %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "Informatieverzoek PKCS #10-certificaat:\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tGebruik van sleutel:\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "fout in get_key_usage(): %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitale ondertekeningen.\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tEncryptie van communicatie.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tEncryptie van opgeslagen data.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAuthenticatie.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tCertificaatondertekening.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tVingerafdruk (hex): "
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tIngetrokken: Ja\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tIngetrokken: Nee\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tTijdsstempels:\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tAangemaakt op: %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tVervaldatum: Nooit\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tVervaldatum: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritme van publieke sleutel: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNaam[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tIngetrokken naam[%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -963,6 +1060,44 @@ msgstr ""
 "\n"
 "\tSubsleutel[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "naam[%d]: %s,"
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "ingetrokken naam[%d]: %s,"
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "vingerafdruk:"
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "aangemaakt: %s,"
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "verloopt nooit,"
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "verloopt: %s,"
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "versleutelingsalgoritme %s (%d bits)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "onbekend versleutelingsalgoritme (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informatie over OpenPGP-certificaten:\n"
diff --git a/lib/po/pl.po.in b/lib/po/pl.po.in
index 12f9d5c110..bcb85781d2 100644
--- a/lib/po/pl.po.in
+++ b/lib/po/pl.po.in
@@ -1,551 +1,555 @@
 # Polish translation for gnutls.
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2006-2008.
+# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgnutls package.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2006-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls-2.5.7\n"
+"Project-Id-Version: libgnutls-2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2008-09-17 16:22+0200\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-07-03 17:02+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "Sukces."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Nie uda³o siê wynegocjowaæ obs³ugiwanego zestawu certyfikatów."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
 msgstr "Ten typ certyfikatu nie jest obs³ugiwany."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
 msgstr "Certyfikat i dany klucz nie pasuj± do siebie."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "Nie uda³o siê wynegocjowaæ obs³ugiwanej metody kompresji."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
 msgstr "Napotkano nieznany algorytm klucza publicznego."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Wynegocjowano algorytm, który nie zosta³ w³±czony."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Odebrano du¿y pakiet rekordu TLS."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Odebrano pakiet rekordu o niedozwolonej wersji."
 
-#: 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 "Liczba pierwsza Diffie Hellmana wys³ana przez serwer jest nieakceptowalna (zbyt ma³a)."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
 msgstr "Odebrano pakiet TLS o nieoczekiwanej d³ugo¶ci."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
 msgstr "Podana sesja zosta³a z jakiego¶ powodu uniewa¿niona."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "B³±d wewnêtrzny GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "Odebrano niedozwolone rozszerzenie TLS."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
 msgstr "Odebrano krytyczny alarm TLS."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Odebrano nieoczekiwany pakiet TLS."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
 msgstr "Odebrano ostrzegawczy alarm TLS."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Wykryto b³±d przy obliczaniu pakietu TLS Finished."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "Druga strona nie wys³a³a ¿adnego certyfikatu."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Istnieje ju¿ algorytm kryptograficzny z ni¿szym priorytetem."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "Nie znaleziono parametrów tymczasowych RSA."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "Nie znaleziono parametrów tymczasowych DH."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Odebrano nieoczekiwany pakiet nawi±zania TLS."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Poszukiwanie du¿ej liczby ca³kowitej nie powiod³o siê."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "Nie uda³o siê wyeksportowaæ du¿ej liczby ca³kowitej."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
 msgstr "Odszyfrowywanie nie powiod³o siê."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
 msgstr "Szyfrowanie nie powiod³o siê."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
 msgstr "Odszyfrowywanie z kluczem publicznym nie powiod³o siê."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
 msgstr "Szyfrowanie z kluczem publicznym nie powiod³o siê."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Podpisywanie z kluczem publicznym nie powiod³o siê."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Sprawdzenie podpisu z kluczem publicznym nie powiod³o siê."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekompresja pakietu rekordu TLS nie powiod³a siê."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Kompresja pakietu rekordu TLS nie powiod³a siê."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "B³±d wewnêtrzny przy przydzielaniu pamiêci."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Za¿±dano niezaimplementowanej lub wy³±czonej opcji."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "Niewystarczaj±ce uprawnienia dla tego ¿±dania."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "B³±d w pliku hase³."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "B³êdne wyrównanie w pakiecie PKCS1."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
 msgstr "¯±dana sesja wygas³a."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Funkcja skrótu nie powiod³a siê."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "B³±d dekodowania base64."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Nieoczekiwany b³±d nag³ówka base64."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "B³±d kodowania base64."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "B³±d przetwarzania pliku hase³."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "¯±dane dane nie by³y dostêpne."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "B³±d w funkcji pull."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "B³±d w funkcji push."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Osi±gniêto górne ograniczenie numerów sekwencyjnych pakietów rekordów. Wow!"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "B³±d w certyfikacie."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Nieznana nazwa Subject Alternative w certyfikacie X.509."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Nieobs³ugiwane rozszerzenie krytyczne w certyfikacie X.509."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "Wykryto naruszenie u¿ycia klucza w certyfikacie."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "Zasoby chwilowo niedostêpne, proszê spróbowaæ ponownie."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "Funkcja zosta³a przerwana."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "Druga strona za¿±da³a ponownego nawi±zania sesji."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Odebrano dane aplikacji TLS, ale oczekiwano na nawi±zanie sesji."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "B³±d w backendzie bazy danych."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
 msgstr "Ten typ certyfikatu nie jest obs³ugiwany."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Przekazany bufor pamiêci jest zbyt ma³y do przechowania parametrów."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "¯±danie jest nieprawid³owe."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "Odebrano niedozwolony parametr."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "B³±d podczas odczytu pliku."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "Analiza ASN1: Nie znaleziono elementu."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "Analiza ASN1: Nie znaleziono identyfikatora."
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "Analiza ASN1: B³±d przy analizie DER."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "Analiza ASN1: Nie znaleziono warto¶ci."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "Analiza ASN1: Ogólny b³±d przetwarzania."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "Analiza ASN1: Warto¶æ nie jest prawid³owa."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "Analiza ASN1: B³±d w znaczniku."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "Analiza ASN1: b³±d w domy¶lnym znaczniku."
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "Analiza ASN1: B³±d w typie 'ANY'."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "Analiza ASN1: B³±d sk³adni."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "Analiza ASN1: Przepe³nienie przy analizie DER."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
 msgstr "Odebrano zbyt du¿o pustych pakietów rekordów."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Inicjalizacja GnuTLS-extra nie powiod³a siê."
 
-#: lib/gnutls_errors.c:203
+#: gnutls_errors.c:202
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Wersja biblioteki GnuTLS nie zgadza siê z wersj± biblioteki GnuTLS-extra."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
 msgstr "Wersja biblioteki gcrypt jest zbyt stara."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
 msgstr "Wersja biblioteki tasn1 jest zbyt stara."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "Identyfikator u¿ytkownika OpenPGP jest uniewa¿niony."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "B³±d przy wczytywaniu zbioru kluczy."
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Inicjalizacja LZO nie powiod³a siê."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "Nie znaleziono obs³ugiwanego algorytmu kompresji."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "Nie znaleziono obs³ugiwanego zestawu certyfikatów."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "Nie uda³o siê uzyskaæ klucza OpenPGP."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "Nie uda³o siê odnale¼æ podklucza OpenPGP."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "Podana nazwa u¿ytkownika SRP nie jest dozwolona."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "Odcisk klucza OpenPGP nie jest obs³ugiwany."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Certyfikat ma nieobs³ugiwane atrybuty."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "OID nie jest obs³ugiwany."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
 msgstr "Algorytm skrótu jest nieznany."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
 msgstr "Typ zawarto¶ci struktury PKCS jest nieznany."
 
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Typ opakowania struktury PKCS jest nieznany."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "Podane has³o zawiera nieprawid³owe znaki."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "Sprawdzenie kodu autentyczno¶ci wiadomo¶ci (MAC) nie powiod³o siê."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "Osi±gniêto niektóre ograniczenia."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Nie uda³o siê pozyskaæ danych losowych."
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Odebrano wiadomo¶æ TLS/IA Intermediate Phase Finished"
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Odebrano wiadomo¶æ TLS/IA Final Phase Finished"
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Sprawdzenie sumy kontrolnej frazy TLS/IA nie powiod³o siê"
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Podany algorytm lub protokó³ jest nieznany."
 
-#: 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 "Rozmiar danych nawi±zania jest zbyt du¿y (DoS?), proszê sprawdziæ gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(nieznany kod b³êdu)"
 
-#: lib/gnutls_alert.c:42
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "Powiadomienie o zamkniêciu"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "Nieoczekiwany komunikat"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "B³êdny MAC rekordu"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
 msgstr "Odszyfrowywanie nie powiod³o siê"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "Przepe³nienie rekordu"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
 msgstr "Dekompresja nie powiod³a siê"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
 msgstr "Nawi±zanie komunikacji nie powiod³o siê"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "B³êdny certyfikat"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Nieobs³ugiwany certyfikat"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Certyfikat zosta³ anulowany"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Certyfikat wygas³"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "Nieznany certyfikat"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Niedozwolony parametr"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "Nieznane CA"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Dostêp zabroniony"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "B³±d dekodowania"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "B³±d odszyfrowywania"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
 msgstr "Ograniczenia eksportowe"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "B³±d w wersji protoko³u"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "Niewystarczaj±ce bezpieczeñstwo"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "Anulowane przez u¿ytkownika"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "B³±d wewnêtrzny"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "Renegocjacja niedozwolona"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "Nie uda³o siê pobraæ wskazanego certyfikatu"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "Wys³ano nieobs³ugiwane rozszerzenie"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "Nierozpoznana wys³ana nazwa serwera"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
 msgstr "Brak lub nieznana nazwa u¿ytkownika SRP/PSK"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
 msgstr "Negocjacja w ramach aplikacji nie powiod³a siê"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
 msgstr "Weryfikacja w ramach aplikacji nie powiod³a siê"
 
-#: 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\tOgraniczenie d³ugo¶ci ¶cie¿ki: %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tJêzyk polityki: %s"
 
-#: lib/x509/output.c:123
+#: x509/output.c:166
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -553,7 +557,7 @@ msgstr ""
 "\t\t\tPolityka:\n"
 "\t\t\tASCII: "
 
-#: lib/x509/output.c:125
+#: x509/output.c:168
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -561,252 +565,282 @@ msgstr ""
 "\n"
 "\t\t\t\tZrzut hex: "
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tPodpis cyfrowy.\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tPodpis cyfrowy.\n"
 
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\t\tBez odmowy.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tBez odmowy.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tSzyfrowanie klucza.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tSzyfrowanie klucza.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tSzyfrowanie danych.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tSzyfrowanie danych.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tUzgodnienie klucza.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tUzgodnienie klucza.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tPodpisanie certyfikatu.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tPodpisanie certyfikatu.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tPodpisanie CRL.\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tPodpisanie CRL.\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tTylko szyfrowanie klucza.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tTylko szyfrowanie klucza.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tTylko deszyfrowanie klucza.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tTylko deszyfrowanie klucza.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tSerwer WWW TLS.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tSerwer WWW TLS.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tKlient WWW TLS.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tKlient WWW TLS.\n"
 
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tPodpisywanie kodu.\n"
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tPodpisywanie kodu.\n"
+
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tOchrona poczty elektronicznej.\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tOchrona poczty elektronicznej.\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tOznaczanie czasu.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tOznaczanie czasu.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tPodpisywanie OCSP.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tPodpisywanie OCSP.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tDowolne zastosowanie.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tDowolne zastosowanie.\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tCA: NIE\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tCA: NIE\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tCA: TAK\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tCA: TAK\n"
+#: x509/output.c:493
+#, c-format
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tOgraniczenie d³ugo¶ci ¶cie¿ki: %d\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tAdres XMPP: %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tAdres 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 otherName: %.*s\n"
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\tOID otherName: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\tDER otherName: "
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\tDER otherName: "
 
-#: 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 otherName: "
+"%s\t\t\tASCII otherName: "
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tRozszerzenia:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tOgraniczenia podstawowe (%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 "krytyczny"
+
+#: 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 "niekrytyczny"
+
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\t\tIdentyfikator klucza przedmiotu (%s):\n"
+
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tIdentyfikator klucza autorytetu (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tU¿ycie klucza (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tPrzeznaczenie klucza (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tAlternatywna nazwa przedmiotu (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tPunkty rozprowadzania CRL (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tNieznane rozszerzenie %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\tZrzut hex: "
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tWersja: %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tNumer seryjny (hex): "
 
-#: 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 "\tWystawca: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tWa¿no¶æ:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNie wcze¶niej ni¿: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNie pó¼niej ni¿: %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tPrzedmiot: %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 "nieznany"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgorytm klucza publicznego: %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\tReszta (bitów: %d):\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tWyk³adnik:\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tWyk³adnik (bitów: %d):\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\tKlucz publiczny (bitów: %d):\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 "\tRozszerzenia:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tOgraniczenia podstawowe (%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 "krytyczny"
-
-#: 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 "niekrytyczny"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\t\tIdentyfikator klucza przedmiotu (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tIdentyfikator klucza autorytetu (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tU¿ycie klucza (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tPrzeznaczenie klucza (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tAlternatywna nazwa przedmiotu (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tPunkty rozproszenia CRL (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tInformacja o certyfikacie proxy (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tNieznane rozszerzenie %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\tZrzut hex: "
-
-#: 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 "\tAlgorytm podpisu: %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 "uwaga: podpisano z³amanym algorytmem podpisu, który mo¿e byæ podrobiony.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tPodpis:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -814,7 +848,7 @@ msgstr ""
 "\tOdcisk MD5:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -822,7 +856,7 @@ msgstr ""
 "\tOdcisk SHA-1:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -830,129 +864,192 @@ msgstr ""
 "\tIdentyfikator klucza publicznego:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "podpisano przy u¿yciu %s (uszkodzonego!), "
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "podpisano przy u¿yciu %s, "
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
 msgstr "Informacja o certyfikacie X.509:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "Inne informacje:\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tWersja: 1 (domy¶lna)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tDaty uaktualnieñ:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tWystawiono: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tNastêpnie: %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tRozszerzenia:\n"
+
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tNumer CRL (%s): "
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tIdentyfikator klucza autorytetu (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tNieznane rozszerzenie %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\tZrzut hex: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tUniewa¿nione certyfikaty (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tBrak uniewa¿nionych certyfikatów.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tNumer seryjny (hex): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tUniewa¿niono: %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informacja o li¶cie uniewa¿nieñ certyfikatów X.509:\n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tWyk³adnik:\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tAtrybuty:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr "\t\tHas³o wyzwania: %s\n"
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tNieznane rozszerzenie %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "Informacja o ¿±daniu certyfikatu PKCS #10:\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tU¿ycie klucza:\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "b³±d: get_key_usage: %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tPodpisy cyfrowe.\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tSzyfrowanie komunikacji.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tSzyfrowanie przechowywanych danych.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tUwierzytelnianie.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tPodpisanie certyfikatu.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tOdcisk (hex): "
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tUniewa¿niony: tak\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tUniewa¿niony: nie\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tOznaczenia czasu:\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tUtworzenie: %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tWyga¶niêcie: nigdy\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tWyga¶niêcie: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgorytm klucza publicznego: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNazwa[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tNazwa uniewa¿niona[%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -961,6 +1058,44 @@ msgstr ""
 "\n"
 "\tPodklucz[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "nazwa[%d]: %s, "
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "nazwa uniewa¿niona[%d]: %s, "
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "odcisk: "
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "utworzono: %s, "
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "nigdy nie wygasa, "
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "wygasa: %s, "
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "algorytm klucza publicznego %s (bitów: %d)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "nieznany algorytm klucza publicznego (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informacja o certyfikacie OpenPGP:\n"
diff --git a/lib/po/sv.po.in b/lib/po/sv.po.in
index 52eaabb2c8..fb09e879a1 100644
--- a/lib/po/sv.po.in
+++ b/lib/po/sv.po.in
@@ -1,554 +1,558 @@
-# Swedish translation of gnutls.
-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnutls package.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
+# Swedish translation of libgnutls.
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgnutls package.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnutls 2.5.7\n"
+"Project-Id-Version: libgnutls 2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2008-09-16 16:45+0200\n"
-"PO-Revision-Date: 2008-09-17 13:35+0100\n"
+"POT-Creation-Date: 2009-06-10 16:24+0200\n"
+"PO-Revision-Date: 2009-07-07 01:38+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gnutls_errors.c:53
+#: gnutls_errors.c:51
 msgid "Success."
 msgstr "Lyckades."
 
-#: lib/gnutls_errors.c:54
+#: gnutls_errors.c:52
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Kunde inte förhandla fram en krypteringssvit som stöds."
 
-#: lib/gnutls_errors.c:56
+#: gnutls_errors.c:54
 msgid "The cipher type is unsupported."
 msgstr "Krypteringstypen stöds inte."
 
-#: lib/gnutls_errors.c:58
+#: gnutls_errors.c:56
 msgid "The certificate and the given key do not match."
 msgstr "Certifikatet och den angivna nyckeln stämmer inte överens."
 
-#: lib/gnutls_errors.c:60
+#: gnutls_errors.c:58
 msgid "Could not negotiate a supported compression method."
 msgstr "Kunde inte förhandla fram en stödd komprimeringsmetod."
 
-#: lib/gnutls_errors.c:62
+#: gnutls_errors.c:60
 msgid "An unknown public key algorithm was encountered."
-msgstr "En okänd publik nyckelalgoritm påträffades."
+msgstr "En okänd publik nyckel-algoritm påträffades."
 
-#: lib/gnutls_errors.c:65
+#: gnutls_errors.c:63
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "En algoritm som inte är aktiverad blev förhandlad."
 
-#: lib/gnutls_errors.c:67
+#: gnutls_errors.c:65
 msgid "A large TLS record packet was received."
 msgstr "Ett stort TLS-journalpaket togs emot."
 
-#: lib/gnutls_errors.c:69
+#: gnutls_errors.c:67
 msgid "A record packet with illegal version was received."
 msgstr "Ett journalpaket med otillåten version togs emot."
 
 # Stort?
-#: lib/gnutls_errors.c:72
-msgid "The Diffie Hellman prime sent by the server is not acceptable (not long enough)."
-msgstr "Diffie Hellman-primtalet som skickades av servern är inte acceptabelt (inte tillräckligt långt)."
+#: gnutls_errors.c:70
+msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."
+msgstr "Diffie-Hellman-primtalet som skickades av servern är inte acceptabelt (inte tillräckligt långt)."
 
-#: lib/gnutls_errors.c:74
+#: gnutls_errors.c:72
 msgid "A TLS packet with unexpected length was received."
 msgstr "Ett TLS-paket med oväntad längd togs emot."
 
-#: lib/gnutls_errors.c:77
+#: gnutls_errors.c:75
 msgid "The specified session has been invalidated for some reason."
 msgstr "Angiven session har av någon anledning blivit ogiltigförklarad."
 
-#: lib/gnutls_errors.c:80
+#: gnutls_errors.c:78
 msgid "GnuTLS internal error."
 msgstr "Internt fel i GnuTLS."
 
-#: lib/gnutls_errors.c:81
+#: gnutls_errors.c:79
 msgid "An illegal TLS extension was received."
 msgstr "En otillåten TLS-utökning togs emot."
 
-#: lib/gnutls_errors.c:83
+#: gnutls_errors.c:81
 msgid "A TLS fatal alert has been received."
 msgstr "Ett ödesdigert TLS-larm togs emot."
 
-#: lib/gnutls_errors.c:85
+#: gnutls_errors.c:83
 msgid "An unexpected TLS packet was received."
 msgstr "Ett oväntat TLS-paket togs emot."
 
-#: lib/gnutls_errors.c:87
+#: gnutls_errors.c:85
 msgid "A TLS warning alert has been received."
 msgstr "En TLS-varning har tagits emot."
 
-#: lib/gnutls_errors.c:90
+#: gnutls_errors.c:88
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Ett fel påträffades vid beräkning av TLS Finished-paketet."
 
-#: lib/gnutls_errors.c:92
+#: gnutls_errors.c:90
 msgid "The peer did not send any certificate."
 msgstr "Motparten skickade inget certifikat."
 
-#: lib/gnutls_errors.c:95
+#: gnutls_errors.c:93
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Det finns redan en krypteringsalgoritm med lägre prioritet."
 
-#: lib/gnutls_errors.c:98
+#: gnutls_errors.c:96
 msgid "No temporary RSA parameters were found."
 msgstr "Inga temporära RSA-parametrar hittades."
 
-#: lib/gnutls_errors.c:100
+#: gnutls_errors.c:98
 msgid "No temporary DH parameters were found."
 msgstr "Inga temporära DH-parametrar hittades."
 
-#: lib/gnutls_errors.c:102
+#: gnutls_errors.c:100
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Ett oväntat TLS-handskakningspaket togs emot."
 
-#: lib/gnutls_errors.c:104
+#: gnutls_errors.c:102
 msgid "The scanning of a large integer has failed."
 msgstr "Avsökningen av ett stort heltal misslyckades."
 
-#: lib/gnutls_errors.c:106
+#: gnutls_errors.c:104
 msgid "Could not export a large integer."
 msgstr "Kunde inte exportera ett stort heltal."
 
-#: lib/gnutls_errors.c:108
+#: gnutls_errors.c:106
 msgid "Decryption has failed."
 msgstr "Dekryptering misslyckades."
 
-#: lib/gnutls_errors.c:109
+#: gnutls_errors.c:107
 msgid "Encryption has failed."
 msgstr "Kryptering misslyckades."
 
-#: lib/gnutls_errors.c:110
+#: gnutls_errors.c:108
 msgid "Public key decryption has failed."
 msgstr "Dekryptering av publik nyckel misslyckades."
 
-#: lib/gnutls_errors.c:112
+#: gnutls_errors.c:110
 msgid "Public key encryption has failed."
 msgstr "Kryptering av publik nyckel misslyckades."
 
-#: lib/gnutls_errors.c:114
+#: gnutls_errors.c:112
 msgid "Public key signing has failed."
 msgstr "Signering av publik nyckel misslyckades."
 
-#: lib/gnutls_errors.c:116
+#: gnutls_errors.c:114
 msgid "Public key signature verification has failed."
 msgstr "Validering av av publika nyckelns signatur misslyckades."
 
-#: lib/gnutls_errors.c:118
+#: gnutls_errors.c:116
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekomprimering av TLS-journalpaketet har misslyckades."
 
-#: lib/gnutls_errors.c:120
+#: gnutls_errors.c:118
 msgid "Compression of the TLS record packet has failed."
 msgstr "Komprimering av TLS-journalpaketet har misslyckades."
 
-#: lib/gnutls_errors.c:123
+#: gnutls_errors.c:121
 msgid "Internal error in memory allocation."
 msgstr "Internt fel i minnesallokering."
 
-#: lib/gnutls_errors.c:125
+#: gnutls_errors.c:123
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "En icke implementerad eller inaktiverad funktion begärdes."
 
-#: lib/gnutls_errors.c:127
+#: gnutls_errors.c:125
 msgid "Insufficient credentials for that request."
 msgstr "Otillräckliga rättigheter för begäran."
 
-#: lib/gnutls_errors.c:129
+#: gnutls_errors.c:127
 msgid "Error in password file."
 msgstr "Fel i lösenordsfil."
 
-#: lib/gnutls_errors.c:130
+#: gnutls_errors.c:128
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Fel utfyllnad i PKCS1-paket."
 
-#: lib/gnutls_errors.c:132
+#: gnutls_errors.c:130
 msgid "The requested session has expired."
 msgstr "Den begärda sessionen har tagit slut."
 
-#: lib/gnutls_errors.c:133
+#: gnutls_errors.c:131
 msgid "Hashing has failed."
 msgstr "Hashning misslyckades."
 
-#: lib/gnutls_errors.c:134
+#: gnutls_errors.c:132
 msgid "Base64 decoding error."
 msgstr "Base64-avkodningsfel."
 
-#: lib/gnutls_errors.c:136
+#: gnutls_errors.c:134
 msgid "Base64 unexpected header error."
 msgstr "Oväntat fel i Base64-huvud."
 
-#: lib/gnutls_errors.c:139
+#: gnutls_errors.c:137
 msgid "Base64 encoding error."
 msgstr "Base64-kodningsfel."
 
-#: lib/gnutls_errors.c:141
+#: gnutls_errors.c:139
 msgid "Parsing error in password file."
 msgstr "Tolkningsfel i lösenordsfil."
 
-#: lib/gnutls_errors.c:143
+#: gnutls_errors.c:141
 msgid "The requested data were not available."
 msgstr "Begärt data var inte tillgängligt."
 
-#: lib/gnutls_errors.c:145
+#: gnutls_errors.c:143
 msgid "Error in the pull function."
 msgstr "Fel i inhämtningsfunktionen."
 
-#: lib/gnutls_errors.c:146
+#: gnutls_errors.c:144
 msgid "Error in the push function."
 msgstr "Fel i utsändningsfunktionen."
 
-#: lib/gnutls_errors.c:148
+#: gnutls_errors.c:146
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Den övre gränsen för sekvensnummer för journalpaket har nåtts. Wow!"
 
-#: lib/gnutls_errors.c:150
+#: gnutls_errors.c:148
 msgid "Error in the certificate."
 msgstr "Fel i certifikatet."
 
-#: lib/gnutls_errors.c:152
+#: gnutls_errors.c:150
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Okänt alternativt namn för innehavare i X.509-certifikat."
 
-#: lib/gnutls_errors.c:155
+#: gnutls_errors.c:153
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Icke stödd kritisk utökning i X.509-certifikat."
 
-#: lib/gnutls_errors.c:157
+#: gnutls_errors.c:155
 msgid "Key usage violation in certificate has been detected."
 msgstr "Överträdelse av nyckelanvändning i certifikat har upptäckts."
 
-#: lib/gnutls_errors.c:159 lib/gnutls_errors.c:160
+#: gnutls_errors.c:157
+msgid "Resource temporarily unavailable, try again."
+msgstr "Resursen är temporärt otillgänglig, försök igen."
+
+#: gnutls_errors.c:159
 msgid "Function was interrupted."
 msgstr "Funktionen avbröts."
 
-#: lib/gnutls_errors.c:161
+#: gnutls_errors.c:160
 msgid "Rehandshake was requested by the peer."
 msgstr "Upprepad handskakning begärdes av motparten."
 
-#: lib/gnutls_errors.c:164
+#: gnutls_errors.c:163
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "TLS-programdata togs emot när handskakningsdata förväntades."
 
-#: lib/gnutls_errors.c:166
+#: gnutls_errors.c:165
 msgid "Error in Database backend."
 msgstr "Fel i databasbakänden."
 
-#: lib/gnutls_errors.c:167
+#: gnutls_errors.c:166
 msgid "The certificate type is not supported."
 msgstr "Certifikattypen stöds inte."
 
-#: lib/gnutls_errors.c:169
+#: gnutls_errors.c:168
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Den angivna minnesbufferten är för liten för att lagra parametrar."
 
-#: lib/gnutls_errors.c:171
+#: gnutls_errors.c:170
 msgid "The request is invalid."
 msgstr "Begäran är ogiltig."
 
-#: lib/gnutls_errors.c:172
+#: gnutls_errors.c:171
 msgid "An illegal parameter has been received."
 msgstr "En otillåten parameter har tagits emot."
 
-#: lib/gnutls_errors.c:174
+#: gnutls_errors.c:173
 msgid "Error while reading file."
 msgstr "Fel vid läsning av fil."
 
-#: lib/gnutls_errors.c:176
+#: gnutls_errors.c:175
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1-tolkare: Elementet hittades inte."
 
-#: lib/gnutls_errors.c:178
+#: gnutls_errors.c:177
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1-tolkare: Identifieraren hittades inte"
 
-#: lib/gnutls_errors.c:180
+#: gnutls_errors.c:179
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1-tolkare: Fel i DER-tolkning."
 
-#: lib/gnutls_errors.c:182
+#: gnutls_errors.c:181
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1-tolkare: Värdet hittades inte."
 
-#: lib/gnutls_errors.c:184
+#: gnutls_errors.c:183
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1-tolkare: Allmänt tolkningsfel."
 
-#: lib/gnutls_errors.c:186
+#: gnutls_errors.c:185
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1-tolkare: Värdet är inte giltigt."
 
-#: lib/gnutls_errors.c:188
+#: gnutls_errors.c:187
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1-tolkare: Fel i TAG."
 
-#: lib/gnutls_errors.c:189
+#: gnutls_errors.c:188
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1-tolkare: fel i implicit tag"
 
-#: lib/gnutls_errors.c:191
+#: gnutls_errors.c:190
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1-tolkare: Fel i typen \"ANY\"."
 
-#: lib/gnutls_errors.c:193
+#: gnutls_errors.c:192
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1-tolkare: Syntaxfel."
 
-#: lib/gnutls_errors.c:195
+#: gnutls_errors.c:194
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1-tolkare: Överflöde i DER-tolkning."
 
-#: lib/gnutls_errors.c:198
+#: gnutls_errors.c:197
 msgid "Too many empty record packets have been received."
 msgstr "För många tom journalpaket har tagits emot."
 
-#: lib/gnutls_errors.c:200
+#: gnutls_errors.c:199
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Initieringen av GnuTLS-extra har misslyckats."
 
-#: lib/gnutls_errors.c:203
+#: gnutls_errors.c:202
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Versionen av GnuTLS-biblioteket stämmer inte överens med versionen av GnuTLS-extra-biblioteket."
 
-#: lib/gnutls_errors.c:205
+#: gnutls_errors.c:204
 msgid "The gcrypt library version is too old."
 msgstr "Versionen av gcrypt-biblioteket är för gammal."
 
-#: lib/gnutls_errors.c:208
+#: gnutls_errors.c:207
 msgid "The tasn1 library version is too old."
 msgstr "Versionen av tasn1-biblioteket är för gammal."
 
-#: lib/gnutls_errors.c:210
+#: gnutls_errors.c:209
 msgid "The OpenPGP User ID is revoked."
 msgstr "OpenPGP-användaridentiteten är spärrad."
 
-#: lib/gnutls_errors.c:212
+#: gnutls_errors.c:211
 msgid "Error loading the keyring."
 msgstr "Fel vid inläsning av nyckelringen."
 
-#: lib/gnutls_errors.c:214
+#: gnutls_errors.c:213
 msgid "The initialization of LZO has failed."
 msgstr "Initiering av LZO misslyckades."
 
-#: lib/gnutls_errors.c:216
+#: gnutls_errors.c:215
 msgid "No supported compression algorithms have been found."
 msgstr "Inga stödda komprimeringsalgoritmer har hittats."
 
-#: lib/gnutls_errors.c:218
+#: gnutls_errors.c:217
 msgid "No supported cipher suites have been found."
 msgstr "Inga stödda krypteringssviter har hittats."
 
-#: lib/gnutls_errors.c:220
+#: gnutls_errors.c:219
 msgid "Could not get OpenPGP key."
 msgstr "Kunde inte hämta OpenPGP-nyckel."
 
-#: lib/gnutls_errors.c:222
+#: gnutls_errors.c:221
 msgid "Could not find OpenPGP subkey."
 msgstr "Kunde inte hitta OpenPGP-undernyckel."
 
-#: lib/gnutls_errors.c:225
+#: gnutls_errors.c:224
 msgid "The SRP username supplied is illegal."
 msgstr "Det angivna SRP-användarnamnet är inte tillåtet."
 
-#: lib/gnutls_errors.c:228
+#: gnutls_errors.c:227
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "OpenPGP-fingeravtrycket stöds inte."
 
-#: lib/gnutls_errors.c:230
+#: gnutls_errors.c:229
 msgid "The certificate has unsupported attributes."
 msgstr "Certifikatet har attribut som inte stöds."
 
-#: lib/gnutls_errors.c:232
+#: gnutls_errors.c:231
 msgid "The OID is not supported."
 msgstr "OID:n stöds inte."
 
-#: lib/gnutls_errors.c:234
+#: gnutls_errors.c:233
 msgid "The hash algorithm is unknown."
 msgstr "Hashalgoritmen är okänd."
 
-#: lib/gnutls_errors.c:236
+#: gnutls_errors.c:235
 msgid "The PKCS structure's content type is unknown."
 msgstr "PKCS-strukturens innehållstyp är okänd."
 
 # Hjälp!
-#: lib/gnutls_errors.c:238
+#: gnutls_errors.c:237
 msgid "The PKCS structure's bag type is unknown."
 msgstr "PKCS-strukturens väsktyp är okänd."
 
-#: lib/gnutls_errors.c:240
+#: gnutls_errors.c:239
 msgid "The given password contains invalid characters."
 msgstr "Det angivna lösenordet innehåller ogiltiga tecken."
 
-#: lib/gnutls_errors.c:242
+#: gnutls_errors.c:241
 msgid "The Message Authentication Code verification failed."
 msgstr "Validering av meddelandeautentiseringskoden (MAC) misslyckades."
 
-#: lib/gnutls_errors.c:244
+#: gnutls_errors.c:243
 msgid "Some constraint limits were reached."
 msgstr "Vissa begränsningar nåddes."
 
-#: lib/gnutls_errors.c:246
+#: gnutls_errors.c:245
 msgid "Failed to acquire random data."
 msgstr "Misslyckades med att få tag på slumpmässigt data."
 
-#: lib/gnutls_errors.c:249
+#: gnutls_errors.c:248
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Tog emot ett TLS/IA Intermediate Phase Finished-meddelande"
 
-#: lib/gnutls_errors.c:251
+#: gnutls_errors.c:250
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Tog emot ett TLS/IA Final Phase Finished-meddelande"
 
-#: lib/gnutls_errors.c:253
+#: gnutls_errors.c:252
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Validering av kontrollsumma för TLS/IA-fas misslyckades"
 
-#: lib/gnutls_errors.c:256
+#: gnutls_errors.c:255
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Angivna algoritmen eller protokollet är okänt."
 
-#: 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 "Datastorleken för handskakningen är för stor (DoS?), kontrollera gnutls_handshake_set_max_packet_length()."
 
-#: lib/gnutls_errors.c:348
+#: gnutls_errors.c:347
 msgid "(unknown error code)"
 msgstr "(okänd felkod)"
 
-# SSL_shutdown() shuts down an active TLS/SSL connection. It sends the ``close notify'' shutdown alert to the peer. 
-#: lib/gnutls_alert.c:42
+# SSL_shutdown() shuts down an active TLS/SSL connection. It sends the ``close notify'' shutdown alert to the peer.
+#: gnutls_alert.c:42
 msgid "Close notify"
 msgstr "Stängningsnotifiering"
 
-#: lib/gnutls_alert.c:43
+#: gnutls_alert.c:43
 msgid "Unexpected message"
 msgstr "Oväntat meddelande"
 
-#: lib/gnutls_alert.c:44
+#: gnutls_alert.c:44
 msgid "Bad record MAC"
 msgstr "Felaktig MAC-post"
 
-#: lib/gnutls_alert.c:45
+#: gnutls_alert.c:45
 msgid "Decryption failed"
 msgstr "Dekryptering misslyckades"
 
-#: lib/gnutls_alert.c:46
+#: gnutls_alert.c:46
 msgid "Record overflow"
 msgstr "Överflöde i post"
 
-#: lib/gnutls_alert.c:47
+#: gnutls_alert.c:47
 msgid "Decompression failed"
 msgstr "Dekomprimering misslyckades"
 
-#: lib/gnutls_alert.c:48
+#: gnutls_alert.c:48
 msgid "Handshake failed"
 msgstr "Handskakning misslyckades"
 
-#: lib/gnutls_alert.c:49
+#: gnutls_alert.c:49
 msgid "Certificate is bad"
 msgstr "Certifikatet är felaktigt"
 
-#: lib/gnutls_alert.c:50
+#: gnutls_alert.c:50
 msgid "Certificate is not supported"
 msgstr "Certifikatet stöds inte"
 
-#: lib/gnutls_alert.c:51
+#: gnutls_alert.c:51
 msgid "Certificate was revoked"
 msgstr "Certifikatet var spärrat"
 
-#: lib/gnutls_alert.c:52
+#: gnutls_alert.c:52
 msgid "Certificate is expired"
 msgstr "Certifikatet har gått ut"
 
-#: lib/gnutls_alert.c:53
+#: gnutls_alert.c:53
 msgid "Unknown certificate"
 msgstr "Okänt certifikat"
 
-#: lib/gnutls_alert.c:54
+#: gnutls_alert.c:54
 msgid "Illegal parameter"
 msgstr "Otillåten parameter"
 
-#: lib/gnutls_alert.c:55
+#: gnutls_alert.c:55
 msgid "CA is unknown"
 msgstr "Certifikatutfärdare är okänd"
 
-#: lib/gnutls_alert.c:56
+#: gnutls_alert.c:56
 msgid "Access was denied"
 msgstr "Åtkomst nekades"
 
-#: lib/gnutls_alert.c:57
+#: gnutls_alert.c:57
 msgid "Decode error"
 msgstr "Avkodningsfel"
 
-#: lib/gnutls_alert.c:58
+#: gnutls_alert.c:58
 msgid "Decrypt error"
 msgstr "Dekrypteringsfel"
 
-#: lib/gnutls_alert.c:59
+#: gnutls_alert.c:59
 msgid "Export restriction"
 msgstr "Exportbegränsning"
 
-#: lib/gnutls_alert.c:60
+#: gnutls_alert.c:60
 msgid "Error in protocol version"
 msgstr "Fel i protokollversion"
 
-#: lib/gnutls_alert.c:61
+#: gnutls_alert.c:61
 msgid "Insufficient security"
 msgstr "Otillräcklig säkerhet"
 
-#: lib/gnutls_alert.c:62
+#: gnutls_alert.c:62
 msgid "User canceled"
 msgstr "Användaren avbröt"
 
-#: lib/gnutls_alert.c:63
+#: gnutls_alert.c:63
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: lib/gnutls_alert.c:64
+#: gnutls_alert.c:64
 msgid "No renegotiation is allowed"
 msgstr "Ingen återförhandling tillåts"
 
-#: lib/gnutls_alert.c:66
+#: gnutls_alert.c:66
 msgid "Could not retrieve the specified certificate"
 msgstr "Kunde inte hämta angivet certifikat"
 
-#: lib/gnutls_alert.c:67
+#: gnutls_alert.c:67
 msgid "An unsupported extension was sent"
 msgstr "En utökning skickades som inte stöds"
 
-#: lib/gnutls_alert.c:69
+#: gnutls_alert.c:69
 msgid "The server name sent was not recognized"
 msgstr "Servernamnet som skickades kändes inte igen"
 
-#: lib/gnutls_alert.c:71
+#: gnutls_alert.c:71
 msgid "The SRP/PSK username is missing or not known"
 msgstr "SRP/PSK-användarnamn saknas eller är inte känt"
 
-#: lib/gnutls_alert.c:73
+#: gnutls_alert.c:73
 msgid "Inner application negotiation failed"
 msgstr "Förhandling för inre program misslyckades"
 
-#: lib/gnutls_alert.c:75
+#: gnutls_alert.c:75
 msgid "Inner application verification failed"
 msgstr "Validering av inre program misslyckades"
 
-#: 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\tRestriktion för sökvägslängd: %d\n"
+msgstr "\t\t\tBegränsning för sökvägslängd: %d\n"
 
-#: lib/x509/output.c:114
+#: x509/output.c:157
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tPolicyspråk: %s"
 
-#: lib/x509/output.c:123
+#: x509/output.c:166
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -556,7 +560,7 @@ msgstr ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
 
-#: lib/x509/output.c:125
+#: x509/output.c:168
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -564,254 +568,284 @@ msgstr ""
 "\n"
 "\t\t\t\tHexdump: "
 
-#: lib/x509/output.c:217
-msgid "\t\t\tDigital signature.\n"
-msgstr "\t\t\tDigital signatur.\n"
+#: x509/output.c:295
+#, c-format
+msgid "%s\t\t\tDigital signature.\n"
+msgstr "%s\t\t\tDigital signatur.\n"
 
 # Klassisk term inom digitala certifikat.
-#: lib/x509/output.c:219
-msgid "\t\t\tNon repudiation.\n"
-msgstr "\t\t\tOförnekbarhet.\n"
+#: x509/output.c:297
+#, c-format
+msgid "%s\t\t\tNon repudiation.\n"
+msgstr "%s\t\t\tOförnekbarhet.\n"
 
-#: lib/x509/output.c:221
-msgid "\t\t\tKey encipherment.\n"
-msgstr "\t\t\tNyckelkryptering.\n"
+#: x509/output.c:299
+#, c-format
+msgid "%s\t\t\tKey encipherment.\n"
+msgstr "%s\t\t\tNyckelkryptering.\n"
 
-#: lib/x509/output.c:223
-msgid "\t\t\tData encipherment.\n"
-msgstr "\t\t\tDatakryptering.\n"
+#: x509/output.c:301
+#, c-format
+msgid "%s\t\t\tData encipherment.\n"
+msgstr "%s\t\t\tDatakryptering.\n"
 
-#: lib/x509/output.c:225
-msgid "\t\t\tKey agreement.\n"
-msgstr "\t\t\tNyckelförhandling.\n"
+#: x509/output.c:303
+#, c-format
+msgid "%s\t\t\tKey agreement.\n"
+msgstr "%s\t\t\tNyckelförhandling.\n"
 
-#: lib/x509/output.c:227 lib/openpgp/output.c:107
-msgid "\t\t\tCertificate signing.\n"
-msgstr "\t\t\tCertifikatsignering.\n"
+#: x509/output.c:305
+#, c-format
+msgid "%s\t\t\tCertificate signing.\n"
+msgstr "%s\t\t\tCertifikatsignering.\n"
 
-#: lib/x509/output.c:229
-msgid "\t\t\tCRL signing.\n"
-msgstr "\t\t\tCRL-signering.\n"
+#: x509/output.c:307
+#, c-format
+msgid "%s\t\t\tCRL signing.\n"
+msgstr "%s\t\t\tCRL-signering.\n"
 
-#: lib/x509/output.c:231
-msgid "\t\t\tKey encipher only.\n"
-msgstr "\t\t\tEndast nyckelkryptering.\n"
+#: x509/output.c:309
+#, c-format
+msgid "%s\t\t\tKey encipher only.\n"
+msgstr "%s\t\t\tEndast nyckelkryptering.\n"
 
-#: lib/x509/output.c:233
-msgid "\t\t\tKey decipher only.\n"
-msgstr "\t\t\tEndast nyckeldekryptering.\n"
+#: x509/output.c:311
+#, c-format
+msgid "%s\t\t\tKey decipher only.\n"
+msgstr "%s\t\t\tEndast nyckeldekryptering.\n"
 
-#: lib/x509/output.c:348
-msgid "\t\t\tTLS WWW Server.\n"
-msgstr "\t\t\tTLS-webbserver.\n"
+#: x509/output.c:443
+#, c-format
+msgid "%s\t\t\tTLS WWW Server.\n"
+msgstr "%s\t\t\tTLS WWW-server.\n"
 
-#: lib/x509/output.c:350
-msgid "\t\t\tTLS WWW Client.\n"
-msgstr "\t\t\tTLS-webbklient.\n"
+#: x509/output.c:445
+#, c-format
+msgid "%s\t\t\tTLS WWW Client.\n"
+msgstr "%s\t\t\tTLS WWW-klient.\n"
 
 # Källkodssignering?
-#: lib/x509/output.c:352
-msgid "\t\t\tCode signing.\n"
-msgstr "\t\t\tKodsignering.\n"
+#: x509/output.c:447
+#, c-format
+msgid "%s\t\t\tCode signing.\n"
+msgstr "%s\t\t\tKodsignering.\n"
+
+#: x509/output.c:449
+#, c-format
+msgid "%s\t\t\tEmail protection.\n"
+msgstr "%s\t\t\tE-postskydd.\n"
 
-#: lib/x509/output.c:354
-msgid "\t\t\tEmail protection.\n"
-msgstr "\t\t\tE-postskydd.\n"
+#: x509/output.c:451
+#, c-format
+msgid "%s\t\t\tTime stamping.\n"
+msgstr "%s\t\t\tTidsstämpling.\n"
 
-#: lib/x509/output.c:356
-msgid "\t\t\tTime stamping.\n"
-msgstr "\t\t\tTidsstämpling.\n"
+#: x509/output.c:453
+#, c-format
+msgid "%s\t\t\tOCSP signing.\n"
+msgstr "%s\t\t\tOCSP-signering.\n"
 
-#: lib/x509/output.c:358
-msgid "\t\t\tOCSP signing.\n"
-msgstr "\t\t\tOCSP-signering.\n"
+#: x509/output.c:455
+#, c-format
+msgid "%s\t\t\tAny purpose.\n"
+msgstr "%s\t\t\tValfritt syfte.\n"
 
-#: lib/x509/output.c:360
-msgid "\t\t\tAny purpose.\n"
-msgstr "\t\t\tValfritt syfte.\n"
+#: x509/output.c:488
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr "%s\t\t\tCertifikatutfärdare (CA): FALSKT\n"
 
-#: lib/x509/output.c:384
-msgid "\t\t\tCertificate Authority (CA): FALSE\n"
-msgstr "\t\t\tCertifikatutfärdare (CA): FALSKT\n"
+#: x509/output.c:490
+#, c-format
+msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr "%s\t\t\tCertifikatutfärdare (CA): SANT\n"
 
-#: lib/x509/output.c:386
-msgid "\t\t\tCertificate Authority (CA): TRUE\n"
-msgstr "\t\t\tCertifikatutfärdare (CA): SANT\n"
+#: x509/output.c:493
+#, c-format
+msgid "%s\t\t\tPath Length Constraint: %d\n"
+msgstr "%s\t\t\tBegränsning för sökvägslängd: %d\n"
 
-#: lib/x509/output.c:491
+#: x509/output.c:626
 #, c-format
-msgid "\t\t\tXMPP Address: %.*s\n"
-msgstr "\t\t\tXMPP-adress: %.*s\n"
+msgid "%s\t\t\tXMPP Address: %.*s\n"
+msgstr "%s\t\t\tXMPP-adress: %.*s\n"
 
-#: lib/x509/output.c:494
+#: x509/output.c:630
 #, c-format
-msgid "\t\t\totherName OID: %.*s\n"
-msgstr "\t\t\totherName OID: %.*s\n"
+msgid "%s\t\t\totherName OID: %.*s\n"
+msgstr "%s\t\t\totherName OID: %.*s\n"
 
-#: lib/x509/output.c:495
-msgid "\t\t\totherName DER: "
-msgstr "\t\t\totherName DER: "
+#: x509/output.c:632
+#, c-format
+msgid "%s\t\t\totherName DER: "
+msgstr "%s\t\t\totherName DER: "
 
-#: 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\totherName ASCII: "
+"%s\t\t\totherName ASCII: "
+
+#: x509/output.c:696
+#, c-format
+msgid "%s\tExtensions:\n"
+msgstr "%s\tTillägg:\n"
+
+#: x509/output.c:706
+#, c-format
+msgid "%s\t\tBasic Constraints (%s):\n"
+msgstr "%s\t\tAllmänna begränsningar (%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 "kritisk"
+
+#: 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 "ej kritisk"
+
+#: x509/output.c:721
+#, c-format
+msgid "%s\t\tSubject Key Identifier (%s):\n"
+msgstr "%s\t\tInnehavarens nyckelidentifierare (%s):\n"
+
+#: x509/output.c:738
+#, c-format
+msgid "%s\t\tAuthority Key Identifier (%s):\n"
+msgstr "%s\t\tUtfärdarens nyckelidentifierare (%s):\n"
+
+#: x509/output.c:754
+#, c-format
+msgid "%s\t\tKey Usage (%s):\n"
+msgstr "%s\t\tNyckelanvändning (%s):\n"
+
+#: x509/output.c:769
+#, c-format
+msgid "%s\t\tKey Purpose (%s):\n"
+msgstr "%s\t\tNyckelsyfte (%s):\n"
+
+#: x509/output.c:786
+#, c-format
+msgid "%s\t\tSubject Alternative Name (%s):\n"
+msgstr "%s\t\tInnehavarens alternativa namn (%s):\n"
+
+#: x509/output.c:801
+#, c-format
+msgid "%s\t\tCRL Distribution points (%s):\n"
+msgstr "%s\t\tCRL-distributionspunkter (%s):\n"
+
+#: x509/output.c:819
+#, c-format
+msgid "%s\t\tProxy Certificate Information (%s):\n"
+msgstr "%s\t\tInformation om proxycertifikat (%s):\n"
+
+#: x509/output.c:832
+#, c-format
+msgid "%s\t\tUnknown extension %s (%s):\n"
+msgstr "%s\t\tOkänt tillägg %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\tHexdump: "
 
-#: lib/x509/output.c:523 lib/x509/output.c:1195 lib/openpgp/output.c:326
+#: x509/output.c:900 x509/output.c:1385 x509/output.c:1698
+#: openpgp/output.c:323
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersion: %d\n"
 
-#: lib/x509/output.c:537
+#: x509/output.c:914
 msgid "\tSerial Number (hex): "
 msgstr "\tSerienummer (hex): "
 
-#: 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 "\tUtfärdare: %s\n"
 
-#: lib/x509/output.c:561
+#: x509/output.c:938
 msgid "\tValidity:\n"
 msgstr "\tGiltighet:\n"
 
-#: lib/x509/output.c:574
+#: x509/output.c:951
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tInte före: %s\n"
 
-#: lib/x509/output.c:588
+#: x509/output.c:965
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tInte efter: %s\n"
 
-#: lib/x509/output.c:602
+#: x509/output.c:979 x509/output.c:1711
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tInnehavare: %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 "okänd"
 
-#: lib/x509/output.c:619
+#: x509/output.c:996 x509/output.c:1728
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritm för innehavarens publika nyckel: %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\tModulus (bitar %d):\n"
 
-#: lib/x509/output.c:635 lib/openpgp/output.c:260
-msgid "\t\tExponent:\n"
-msgstr "\t\tExponent:\n"
+#: x509/output.c:1012
+#, c-format
+msgid "\t\tExponent (bits %d):\n"
+msgstr "\t\tExponent (bitar %d):\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\tPublik nyckel (bitar %d):\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 "\tTillägg:\n"
-
-#: lib/x509/output.c:716
-#, c-format
-msgid "\t\tBasic Constraints (%s):\n"
-msgstr "\t\tAllmänna restriktioner (%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 "kritisk"
-
-#: 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 "ej kritisk"
-
-#: lib/x509/output.c:731
-#, c-format
-msgid "\t\tSubject Key Identifier (%s):\n"
-msgstr "\t\tInnehavarens nyckelidentifierare (%s):\n"
-
-#: lib/x509/output.c:746
-#, c-format
-msgid "\t\tAuthority Key Identifier (%s):\n"
-msgstr "\t\tUtfärdarens nyckelidentifierare (%s):\n"
-
-#: lib/x509/output.c:761
-#, c-format
-msgid "\t\tKey Usage (%s):\n"
-msgstr "\t\tNyckelanvändning (%s):\n"
-
-#: lib/x509/output.c:776
-#, c-format
-msgid "\t\tKey Purpose (%s):\n"
-msgstr "\t\tNyckelsyfte (%s):\n"
-
-#: lib/x509/output.c:793
-#, c-format
-msgid "\t\tSubject Alternative Name (%s):\n"
-msgstr "\t\tInnehavarens alternativa namn (%s):\n"
-
-#: lib/x509/output.c:808
-#, c-format
-msgid "\t\tCRL Distribution points (%s):\n"
-msgstr "\t\tCRL-distributionspunkter (%s):\n"
-
-#: lib/x509/output.c:825
-#, c-format
-msgid "\t\tProxy Certificate Information (%s):\n"
-msgstr "\t\tInformation om proxycertifikat (%s):\n"
-
-#: lib/x509/output.c:837
-#, c-format
-msgid "\t\tUnknown extension %s (%s):\n"
-msgstr "\t\tOkänt tillägg %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\tHexdump: "
-
-#: 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 "\tSignaturalgoritm: %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 "varning: signerad med en trasig signaturalgoritm som kan förfalskas.\n"
 
-#: lib/x509/output.c:926 lib/x509/output.c:1337
+#: x509/output.c:1112 x509/output.c:1647
 msgid "\tSignature:\n"
 msgstr "\tSignatur:\n"
 
-#: lib/x509/output.c:949
+#: x509/output.c:1135
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -819,7 +853,7 @@ msgstr ""
 "\tMD5-fingeravtryck:\n"
 "\t\t"
 
-#: lib/x509/output.c:951
+#: x509/output.c:1137
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -827,7 +861,7 @@ msgstr ""
 "\tSHA-1-fingeravtryck:\n"
 "\t\t"
 
-#: lib/x509/output.c:985
+#: x509/output.c:1156 x509/output.c:1924
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -835,129 +869,193 @@ msgstr ""
 "\tPublik nyckel-identitet:\n"
 "\t\t"
 
-#: lib/x509/output.c:1151
+#: x509/output.c:1226
+#, c-format
+msgid "signed using %s (broken!), "
+msgstr "signerat med %s (trasig!), "
+
+#: x509/output.c:1228
+#, c-format
+msgid "signed using %s, "
+msgstr "signerat med %s, "
+
+#: x509/output.c:1341
 msgid "X.509 Certificate Information:\n"
 msgstr "Information om X.509-certifikat:\n"
 
-#: lib/x509/output.c:1155
+#: x509/output.c:1345 x509/output.c:1961
 msgid "Other Information:\n"
 msgstr "Övrig information:\n"
 
-#: lib/x509/output.c:1191
+#: x509/output.c:1381
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersion: 1 (standard)\n"
 
-#: lib/x509/output.c:1216
+#: x509/output.c:1406
 msgid "\tUpdate dates:\n"
 msgstr "\tUppdateringsdatum:\n"
 
-#: lib/x509/output.c:1229
+#: x509/output.c:1419
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tUtfärdat: %s\n"
 
-#: lib/x509/output.c:1245
+#: x509/output.c:1435
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tNästa den: %s\n"
 
-#: lib/x509/output.c:1255
+#: x509/output.c:1466
+msgid "\tExtensions:\n"
+msgstr "\tTillägg:\n"
+
+# Nummer? Antal?
+#: x509/output.c:1481
+#, c-format
+msgid "\t\tCRL Number (%s): "
+msgstr "\t\tCRL-nummer (%s): "
+
+#: x509/output.c:1504
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr "\t\tUtfärdarens nyckelidentifierare (%s):\n"
+
+#: x509/output.c:1517
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr "\t\tOkänt tillägg %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\tHexdump: "
+
+#: x509/output.c:1566
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tSpärrade certifikat (%d):\n"
 
-#: lib/x509/output.c:1257
+#: x509/output.c:1568
 msgid "\tNo revoked certificates.\n"
 msgstr "\tInga spärrade certifikat.\n"
 
-#: lib/x509/output.c:1276
+#: x509/output.c:1587
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSerienummer (hex): "
 
-#: lib/x509/output.c:1285
+#: x509/output.c:1596
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tSpärrat den: %s\n"
 
-#: lib/x509/output.c:1368
+#: x509/output.c:1678
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Information om spärrlista för X.509-certifikat:\n"
 
-#: lib/openpgp/output.c:85
+#: x509/output.c:1743 openpgp/output.c:259
+msgid "\t\tExponent:\n"
+msgstr "\t\tExponent:\n"
+
+#: x509/output.c:1810
+msgid "\tAttributes:\n"
+msgstr "\tAttribut:\n"
+
+#: x509/output.c:1845
+#, c-format
+msgid "\t\tChallenge password: %s\n"
+msgstr "\t\tMotsvarslösenord: %s\n"
+
+#: x509/output.c:1854
+#, c-format
+msgid "\t\tUnknown attribute %s:\n"
+msgstr "\t\tOkänt attribut %s:\n"
+
+#: x509/output.c:1957
+msgid "PKCS #10 Certificate Request Information:\n"
+msgstr "Information om begäran av PKCS #10-certifikat:\n"
+
+#: openpgp/output.c:84
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tNyckelanvändning:\n"
 
-#: lib/openpgp/output.c:94
+#: openpgp/output.c:93
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "fel: get_key_usage: %s\n"
 
-#: lib/openpgp/output.c:99
+#: openpgp/output.c:98
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitala signaturer.\n"
 
-#: lib/openpgp/output.c:101
+#: openpgp/output.c:100
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tKommunikationskryptering.\n"
 
-#: lib/openpgp/output.c:103
+#: openpgp/output.c:102
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tKryptering för datalagring.\n"
 
-#: lib/openpgp/output.c:105
+#: openpgp/output.c:104
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAutentisering.\n"
 
-#: lib/openpgp/output.c:128
+#: openpgp/output.c:106
+msgid "\t\t\tCertificate signing.\n"
+msgstr "\t\t\tCertifikatsignering.\n"
+
+#: openpgp/output.c:127
 msgid "\tID (hex): "
 msgstr "\tIdentitet (hex): "
 
-#: lib/openpgp/output.c:149
+#: openpgp/output.c:148
 msgid "\tFingerprint (hex): "
 msgstr "\tFingeravtryck (hex): "
 
-#: lib/openpgp/output.c:166
+#: openpgp/output.c:165
 msgid "\tRevoked: True\n"
 msgstr "\tSpärrat: Sant\n"
 
-#: lib/openpgp/output.c:168
+#: openpgp/output.c:167
 msgid "\tRevoked: False\n"
 msgstr "\tSpärrat: Falskt\n"
 
-#: lib/openpgp/output.c:176
+#: openpgp/output.c:175
 msgid "\tTime stamps:\n"
 msgstr "\tTidsstämplar:\n"
 
-#: lib/openpgp/output.c:193
+#: openpgp/output.c:192
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tSkapat den: %s\n"
 
-#: lib/openpgp/output.c:207
+#: openpgp/output.c:206
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tUtgångsdatum: Aldrig\n"
 
-#: lib/openpgp/output.c:216
+#: openpgp/output.c:215
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tUtgångsdatum: %s\n"
 
-#: lib/openpgp/output.c:240
+#: openpgp/output.c:239
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritm för publik nyckel: %s\n"
 
-#: lib/openpgp/output.c:349
+#: openpgp/output.c:346
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNamn[%d]: %s\n"
 
-#: lib/openpgp/output.c:352
+#: openpgp/output.c:349
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tSpärrat namn[%d]: %s\n"
 
-#: lib/openpgp/output.c:369
+#: openpgp/output.c:366
 #, c-format
 msgid ""
 "\n"
@@ -966,7 +1064,45 @@ msgstr ""
 "\n"
 "\tUndernyckel[%d]:\n"
 
-#: lib/openpgp/output.c:404
+#: openpgp/output.c:399
+#, c-format
+msgid "name[%d]: %s, "
+msgstr "namn[%d]: %s, "
+
+#: openpgp/output.c:401
+#, c-format
+msgid "revoked name[%d]: %s, "
+msgstr "spärrat namn[%d]: %s, "
+
+#: openpgp/output.c:415
+msgid "fingerprint: "
+msgstr "fingeravtryck: "
+
+#: openpgp/output.c:435
+#, c-format
+msgid "created: %s, "
+msgstr "skapat: %s, "
+
+#: openpgp/output.c:445
+msgid "never expires, "
+msgstr "går aldrig ut, "
+
+#: openpgp/output.c:453
+#, c-format
+msgid "expires: %s, "
+msgstr "går ut: %s, "
+
+#: openpgp/output.c:465
+#, c-format
+msgid "key algorithm %s (%d bits)"
+msgstr "nyckelalgoritm %s (%d bitar)"
+
+#: openpgp/output.c:467
+#, c-format
+msgid "unknown key algorithm (%d)"
+msgstr "okänd nyckelalgoritm (%d)"
+
+#: openpgp/output.c:499
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Information om OpenPGP-certifikat:\n"