Sync with TP.

6 files changed, 2138 insertions, 1838 deletions

diff --git a/po/cs.po.in b/po/cs.po.in
index ecd9d40bff..c02a4ae620 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the libgnutls package.
 # Petr Pisar <petr.pisar@atlas.cz>, 2009, 2011.
 #
+# handshake → zahájení
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls 2.12.7\n"
+"Project-Id-Version: libgnutls 3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-12 20:40+0200\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-05 09:47+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -16,658 +18,682 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Úspěch."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Nezdařilo se vyjednat seznam podporovaných šifer."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "Tento druh šifry není podporován."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Certifikát a daný klíč se k sobě nehodí."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Nezdařilo se vyjednat podporovanou kompresní metodu."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "Narazil jsem na neznámý algoritmus veřejného klíče."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Byl vyjednán algoritmus, který není povolen."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Byl přijat packet s velkou TLS strukturou."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Byl přijat packet s neplatnou verzí struktury."
 
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 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é)."
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Byl přijat TLS packet s neočekávanou délkou."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "Spojení TLS nebylo řádně ukončeno."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "Zadaná relace byla z nějakého důvodu zneplatněna."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
 msgstr "Vnitřní chyba GnuTLS."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "Přijato neplatné rozšíření TLS."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Bylo přijato nepřekonatelné upozornění TLS."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Byl přijat neočekávaný TLS packet."
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "Bylo přijato varovné upozornění TLS."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Při výpočtu packetu TLS Finished došlo k chybě."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "Druhá strana neposlala žádný certifikát."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "Zadaný klíč DSA není slučitelný s vybraným protokolem TLS."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Kryptografický algoritmus s nižší prioritou je již přítomen."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Nebyly nalezeny žádné dočasné parametry RSA."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Nebyly nalezeny žádné dočasné parametry DH."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Byl přijat neočekávaný packet zahajující TLS."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Prohlížení velkého celého čísla selhalo."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Velké celé číslo nebylo možné exportovat."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Dešifrování selhalo."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Šifrování selhalo."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Dešifrovaní veřejného klíče selhalo."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Šifrování veřejného klíče selhalo."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Podepisování veřejného klíče selhalo."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Podpis veřejného klíče se nepodařilo ověřit."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekomprese packetu s TLS strukturou selhala."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "Komprese packetu s TLS strukturou selhala."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
 msgstr "Vnitřní chyba při alokaci paměti."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Byla požadována neimplementovaná nebo zakázaná vlastnost."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Na takový požadavek chybí prokázání totožnosti."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "Chyba v souboru s hesly."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Chybná výplň v PKCS1 packetu."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "Požadovaná relace vypršela."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Hašování selhalo."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "Chyba při dekódování Base64."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Neočekávaná Base64 hlavička (chyba)."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "Chyba kódování do Base64."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "Chyba při rozebírání souboru s hesly."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "Požadovaná data nebyla dostupná."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "Chyba v pull funkci."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "Chyba v push funkci."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 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!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "Chyba v certifikátu."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Neznámé alternativní jméno subjektu v X.509 certifikátu."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Nepodporované kritické rozšíření v X.509 certifikátu."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Bylo zaznamenáno použití klíče v rozporu s pravidly."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Zdroj je dočasně nedostupný, zkusí se znovu."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Funkce byla přerušena."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "Druhá strana požádala o znovuzahájení relace."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Byla přijata aplikační data TLS, zatímco měla přijít data zahájení."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "Chyba databázovém jádře."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Tento druh certifikátu není podporován."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Zadaný paměťový buffer je pro uložení parametrů příliš malý."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "Požadavek je neplatný."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "Cookie byl chybný."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "Byl přijat neplatný parametr."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "Chyba při čtení souboru."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1 parser: Prvek nebyl nalezen."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1 parser: Identifikátor nebyl nalezen."
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1 parser: Chyba při rozebírání DER."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1 parser: Hodnota nebyla nalezena."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1 parser: Obecná chyba při rozebírání."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1 parser: Hodnota není platná."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1 parser: Chyba ve ZNAČCE."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1 parser: chyba v implicitní značce"
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1 parser: Chyba v typu „ANY“."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1 parser: Chyba syntaxe."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1 parser: Přetečení při rozebírání DER."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
 msgstr "Bylo přijato příliš mnoho packetů s prázdnou strukturou."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "Bylo přijato příliš mnoho zahajovacích packetů."
+
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Inicializace GnuTLS-extra selhala."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Verze knihovny GnuTLS se neshoduje s verzí knihovny GnuTLS-extra."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "Verze knihovny gcrypt je příliš stará."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "Verze kryptografické knihovny je příliš stará."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "Verze knihovny tasn1 je příliš stará."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "ID OpenPGP uživatele bylo odvoláno."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "OpenPGP klíč postrádá množinu přednostních klíčů."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "Chyba při načítání souboru s klíči. "
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Inicializace kryptografického jádra selhala."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "Inicializace LZO selhala."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
 msgstr "Žádné podporované kompresní algoritmy nebyly nalezeny."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
 msgstr "Žádné podporované režimy šifer nebyly nalezeny."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Nebylo možné získat OpenPGP klíč."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Nebylo možné najít OpenPGP podklíč."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Bezpečné znovuvyjednání selhalo."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Nebezpečné znovuvyjednání je zakázáno."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "Zadané SRP uživatelské jméno je neplatné."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "Zadané SRP uživatelské jméno není známo."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "OpenPGP otisk není podporován."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Algoritmus podpisu není podporován."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Certifikát má nepodporované atributy."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "Tento OID není podporován."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Hašovací algoritmus není znám."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 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.
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Typ kufříku ve struktuře PKCS není znám."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "Zadané heslo obsahuje neplatné znaky."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "MAC (autentizační kód zprávy) se nepodařilo ověřit."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Některé hranice omezení byly dosaženy."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Nezdařilo se získat náhodná data."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Přijata TLS/IA zpráva Intermediate Phase Finished"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Přijata TLS/IA zpráva Final Phase Finished"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Kontrolní součet fáze TLS/IA se nepodařilo ověřit"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Zadaný algoritmus nebo protokol není znám."
 
-#: gnutls_errors.c:275
-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:276
+msgid "The handshake data size is too large."
+msgstr "Velikost zahajovacích dat je příliš velká."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "Chyba při otevírání /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "Chyba na rozhraní /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Údaje o vazbě kanálu nejsou dostupné"
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "Chyba PKCS #11."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "Chyba inicializace PKCS #11."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "Chyba rozboru."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "Chyba PKCS #11 v PIN."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "PKCS #11 PIN by měl být uložen."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "PKCS #11 chyba ve slotu"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "Chyba zamykaní vlákna"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "PKCS #11 chyba v atributu"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "PKCS #11 chyba v zařízení"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "PKCS #11 chyba v datech"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "Nepodporovaná vlastnost PKCS #11"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "PKCS #11 chyba v klíči"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "PKCS #11 PINu vypršela platnost"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "PKCS #11 PIN uzamknut"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "PKCS #11 chyba v relaci"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "PKCS #11 chyba v podpisu"
 
 # XXX: Nepřekládat jako zařízení, hláška „PKCS #11 error in device“ již
 # existuje.
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "PKCS #11 chyba v tokenu"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "PKCS #11 chyba uživatele"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "Operace neskončila v řádném čase"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "Operace byla zrušena kvůli chybě uživatele"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Nebyly nalezeny žádné podporované křivky ECC"
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "Tato křivka není podporována"
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "Požadovaný PKCS #11 object není dostupný"
+
+#: lib/gnutls_errors.c:419
 msgid "(unknown error code)"
 msgstr "(neznámý chybový kód)"
 
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Oznámení o uzavření"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Neočekávaná zpráva"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "Chybný MAC zprávy"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Dešifrování selhalo"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Přetečení struktury"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Dekomprese selhala"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Zahájení (handshake) selhalo"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "Certifikát je špatný"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Certifikát není podporován"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Certifikát byl odvolán"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Certifikát vypršel"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Neznámý certifikát"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Neplatný parametr"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "Autorita není známa"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Přístup byl zamítnut"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "Chyba dekódování"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "Chyba dešifrování"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Omezení na export"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "Chyba ve verzi protokolu"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Nedostatečné zabezpečení"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Uživatel zrušen"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Žádný certifikát (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Znovuvyjednání není dovoleno"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Zadaný certifikát nebylo možné získat"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "Bylo odesláno nepodporované rozšíření"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "Odeslané jméno serveru nebylo rozpoznáno"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "SRP/PSK jméno uživatele chybí nebo není známo"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Vyjednávání vnitřní aplikace (IA) selhalo"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Ověření vnitřní aplikace (IA) selhalo"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tOmezení délky cesty: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tJazyk politiky: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -675,138 +701,138 @@ msgstr ""
 "\t\t\tPolitika:\n"
 "\t\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
 msgstr ""
 "\n"
-"\t\t\t\tHexavýpis: "
+"\t\t\t\tŠestnáctkový ýpis: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tDigitální podpis.\n"
 
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tNepopiratelnost.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tŠifrování klíčů.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tŠifrování dat.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tDohodnutí klíče.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tPodepisování certifikátu.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tPodepisování CRL.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tPouze šifrování klíčů.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tPouze dešifrování klíčů.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "pozor: distribuční místo CRL obsahuje znak NULL, bude nahrazen „!“\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tTLS WWW server.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tTLS WWW klient.\n"
 
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tPodepisování kódu.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tOchrana e-mailu.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tČasové razítkování.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tPodepisování OCSP.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIPsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tJakýkoliv účel.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tCertifikační autorita (CA): NE\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tCertifikační autorita (CA): ANO\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\tOmezení délky cesty: %d\n"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "pozor: alternativní jméno obsahuje znak NULL, bude nahrazen „!“\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tXMPP adresa: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\tOID dalšíhoJména: %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\tdalšíJméno v DER: "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -815,175 +841,194 @@ msgstr ""
 "\n"
 "%s\t\t\tdalšíJméno v ASCII: "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tRozšíření:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tZákladní omezení (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "kritické"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "není kritické"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tIdentifikátor klíče subjektu (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tIdentifikátor klíče autority (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tUžití klíče (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tÚčel klíče (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tAlternativní jméno subjektu (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tAlternativní jméno vydavatele (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tMísta distribuce CRL (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, 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:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tNeznámé rozšíření %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tHexavýpis: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVerze: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tSériové číslo (hex): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tVydavatel: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tPlatnost:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNe před: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNe po: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tSubjekt: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "není známo"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritmus veřejného klíče subjektu: %s\n"
 
-#: x509/output.c:1163
+# TODO: Pluralize
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tÚroveň bezpečnosti certifikátu: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tÚroveň bezpečnosti certifikátu: %s (%d bitů)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+# TODO: Pluralize
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tModul (%d bitů:)\n"
 
-#: x509/output.c:1182
+# TODO: Pluralize
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tMocnitel (%d bitů):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tKřivka:\t%s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+# TODO: Pluralize
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tVeřejný klíč (%d bitů):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tAlgoritmus podpisu: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 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"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tPodpis:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -991,7 +1036,7 @@ msgstr ""
 "\tMD5 otisk:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -999,7 +1044,7 @@ msgstr ""
 "\tSHA-1 otisk:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1007,197 +1052,197 @@ msgstr ""
 "\tID veřejného klíče:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "podepsáno pomocí %s (rozbito!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "podepsáno pomocí %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "Informace X.509 certifikátu:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Další Informace:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVerze: 1 (implicitní)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tData aktualizací:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tVydáno: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tDalší v: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tRozšíření:\n"
 
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tČíslo CRL (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tIdentifikátor klíče autority (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tNeznámé rozšíření %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tHexavýpis: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tOdvolané certifikáty (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tŽádné odvolané certifikáty.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSériové číslo (hex): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tOdvoláno v: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informace o seznamu odvolaných X.509 certifikátů (CRL):\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tMocnitel:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tAtributy:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tHeslo výzvy: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tNeznámý atribut %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
-msgstr "Informace PKCS #10 žádosti o certifikát:\n"
+msgstr "Údaje o PKCS #10 žádosti o certifikát:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tUžití klíče:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "chyba: get_key_usage: %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitální podpisy.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tŠifrování komunikace.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tŠifrování uložených dat.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAutentizace.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tPodepisování certifikátu.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tOtisk (hex): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tOdvolán: Ano\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tOdvolán: Ne\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tČasová razítka:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tVytvoření: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tVypršení: Nikdy\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tVypršení: %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritmus veřejného klíče: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tÚroveň bezpečnosti klíče: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tJméno[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tOdvolané jméno[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1206,44 +1251,56 @@ msgstr ""
 "\n"
 "\tPodklíč[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "jméno[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "odvolané jméno[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "otisk: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "vytvořen: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "platnost nikdy nevyprší, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "platnost vyprší: %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "algoritmus klíče %s (%d bitů)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "neznámý algoritmus klíče (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informace o OpenPGP certifikátu:\n"
+
+#~ msgid "The initialization of LZO has failed."
+#~ msgstr "Inicializace LZO selhala."
+
+#~ 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()."
+
+#~ msgid "Inner application negotiation failed"
+#~ msgstr "Vyjednávání vnitřní aplikace (IA) selhalo"
+
+#~ msgid "Inner application verification failed"
+#~ msgstr "Ověření vnitřní aplikace (IA) selhalo"
diff --git a/po/fi.po.in b/po/fi.po.in
index 3e5d1420f1..d552f48df1 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls 2.12.7\n"
+"Project-Id-Version: libgnutls 3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-12 15:32+0200\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-03 10:36+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -17,653 +17,677 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Onnistui."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Ei voitu neuvotella tuetusta salakirjoitusmenetelmästä."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "Salakirjoitusmenetelmätyyppiä ei tueta."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Varmenne ja annettu avain eivät täsmää."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Ei voitu neuvotella tuetusta pakkaamismenetelmästä."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "Kohdattiin tuntematon julkinen avainalgoritmi."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Neuvoteltiin algoritmista, jota ei ole otettu käyttöön."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Vastaanotettiin suuri TLS-tietuepaketti."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Vastaanotettiin tietuepaketti, jonka versio oli virheellinen."
 
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."
 msgstr "Palvelimen lähettämä Diffie-Hellman -perusavain ei ollut hyväksyttävä (ei riittävän pitkä)."
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Vastaanotettiin odottamattoman pituinen TLS-paketti."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "TLS-yhteys ei ollut päätetty oikein."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "Määritelty istunto on jostain syystä virheellinen."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
 msgstr "Sisäinen GnuTLS-virhe."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "Vastaanotettiin virheellinen TLS-laajennus."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Vastaanotettiin kohtalokas TLS-hälytys."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Vastaanotettiin odottamaton TLS-paketti."
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "Vastaanotettiin TLS-varoitushälytys."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Kohdattiin virhe ”TLS Finished”-paketin laskennassa."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "Vastapuoli ei lähettänyt mitään varmennetta."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "Annettu DSA-avain on yhteensopimaton valitun TLS-yhteyskäytännön kanssa."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Salausalgoritmi alemmalla prioriteetilla on jo olemassa."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Ei löytynyt tilapäisiä RSA-parametreja."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Ei löytynyt tilapäisiä DH-parametreja."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Vastaanotettiin odottamaton TLS-kättelypaketti."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Suurikokoisen kokonaisluvun etsintä epäonnistui."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Suurta kokonaislukua ei voitu viedä."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Salauksen purku epäonnistui."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Salaus epäonnistui."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Salauksen purku julkisella avaimella epäonnistui."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Salaus julkisella avaimella epäonnistui."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Allekirjoitus julkisella avaimella epäonnistui."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Allekirjoituksen todennus julkisella avaimella epäonnistui."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "TLS-tietuepaketin pakkaamisen purkaminen epäonnistui."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "TLS-tietuepaketin pakkaaminen epäonnistui."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
 msgstr "Sisäinen virhe muistivarauksessa."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Pyydettiin toteuttamatonta tai käytöstä pois otettua ominaisuutta."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Riittämättömästi valtuustietoja tuolle pyynnölle."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "Virhe salasanatiedostossa."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Väärä täyte PKCS1-paketissa."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "Vaadittu istunto on vanhentunut."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Tiivisteen laskeminen epäonnistui."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "Base64-dekoodausvirhe."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Base64 odottamaton otsakevirhe."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "Base64-koodausvirhe."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "Jäsennysvirhe salasanatiedostossa."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "Pyydetyt tiedot eivät olleet saatavilla."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "Virhe pull-toiminnossa."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "Virhe push-toiminnossa."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Tietuepakettijärjestysnumeroiden yläraja on saavutettu. Wow!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "Virhe varmenteessa."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Tuntematon aihevaihtoehtonimi X.509-varmenteessa."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Tukematon kriittinen laajennus X.509-varmenteessa."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Havaittiin avainkäytön rikkomus varmenteessa."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Resurssi on tilapäisesti tavoittamattomissa, yritä uudelleen."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Funktio keskeytettiin."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "Vastapuoli vaati uudelleenkättelyn."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Vastaanotettiin TLS-sovelluksen tietoja, vaikka odotettiin kättelytietoja."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "Virhe tietokantatallennusmoduulissa."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Varmenteen tyyppiä ei tueta."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Annettu muistipuskuri on liian lyhyt parametrien säilyttämiseen."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "Pyyntö on virheellinen."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "Eväste oli väärä."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "Vastaanotettiin virheellinen parametri."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1-jäsennin: Elementtiä ei löytynyt."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1-jäsennin: Tunnistetta ei löytynyt"
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1-jäsennin: Virhe DER-jäsennyksessä."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1-jäsennin: Arvoa ei löytynyt."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1-jäsennin: Yleinen jäsennysvirhe."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1-jäsennin: Arvo on virheellinen."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1-jäsennin: Virhe TUNNUKSESSA."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1-jäsennin: virhe implisiittisessä tunnuksessa"
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1-jäsennin: Virhe tyypissä ’ANY’."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1-jäsennin: Syntaksivirhe."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1-jäsennin: Ylivuoto DER-jäsennyksessä."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
 msgstr "Vastaanotettiin liian monta tyhjää tietuepakettia."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "Vastaanotettiin liian monta kättelypakettia."
+
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "GnuTLS-extra -alustus epäonnistui."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "GnuTLS-kirjastoversio ei täsmää GnuTLS-extra -kirjastoversion kanssa."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "Kirjaston grypt versio on liian vanha."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "Kirjaston crypto versio on liian vanha."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "Kirjaston tasn1 versio on liian vanha."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "Kumottiin OpenPGP-käyttäjätunniste."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "OpenPGP-avaimella ei ole ensisijaista avainjoukkoa."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "Virhe ladattaessa avainrengasta."
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Salaustaustaohjelman alustus epäonnistui."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "LZO-alustus epäonnistui."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
 msgstr "Ei ole löytynyt yhtään tuettua pakkausalgoritmia."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
 msgstr "Ei ole löytynyt yhtään tuettua salakirjoitusmenetelmää."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Ei voitu vastaanottaa OpenPGP-avainta."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Ei voitu löytää OpenPGP-aliavainta."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Turvallinen uudelleenneuvottelu epäonnistui."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Turvaton uudelleenneuvottelu kielletty."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "Tarjottu SRP-käyttäjänimi on virheellinen."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "Tarjottu SRP-käyttäjänimi on tuntematon."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "OpenPGP-sormenjälkeä ei tueta."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Allekirjoitusalgoritmia ei tueta."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Varmenteessa on tukemattomia attribuutteja."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "OID on tukematon."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Tiivistealgoritmi on tuntematon."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 msgid "The PKCS structure's content type is unknown."
 msgstr "PKCS-rakenteen sisältötyyppi on tuntematon."
 
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "PKCS-rakenteen bag-tyyppi on tuntematon."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "Annettu salasana sisältää virheellisiä merkkejä."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "MAC-todennus epäonnistui."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Tavoitettiin joitakin rajoiterajoja."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Satunnaisten tietojen hankkiminen epäonnistui."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Vastaanotettiin ”TLS/IA Intermediate Phase Finished”-viesti"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Vastaanotettiin ”TLS/IA Final Phase Finished”-viesti"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "TLS/IA-vaiheen tarkistussumman todentaminen epäonnistui"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Määritelty algoritmi tai yhteyskäytäntö on tuntematon."
 
-#: gnutls_errors.c:275
-msgid "The handshake data size is too large (DoS?), check gnutls_handshake_set_max_packet_length()."
-msgstr "Kättelytietojen koko on liian suuri (DoS?), tarkista gnutls_handshake_set_max_packet_length()."
+#: lib/gnutls_errors.c:276
+msgid "The handshake data size is too large."
+msgstr "Kättelytietojen koko on liian suuri."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "Virhe avattaessa /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "Virhe rajapintaliitännässä /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Kanavan sitomistiedot eivät ole saatavilla."
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "PKCS #11 -virhe."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "PKCS #11 -alustusvirhe."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "Virhe jäsennettäessä."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "PKCS #11 virhe PIN-luvussa."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "PKCS #11 PIN-luku pitäisi tallentaa."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "PKCS #11 -virhe välissä"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "Säikeen lukitusvirhe"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "PKCS #11 -virhe attribuutissa"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "PKCS #11 -virhe laitteessa"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "PKCS #11 -virhe tiedoissa"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "PKCS #11 tukematon ominaisuus"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "PKCS #11 -vireh avaimessa"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "PKCS #11 PIN vanhentunut"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "PKCS #11 PIN lukittu"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "PKCS #11 -virhe istunnossa"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "PKCS #11 -virhe allekirjoituksessa"
 
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "PKCS #11 -virhe merkkijonossa"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "PKCS #11 -käyttäjävirhe"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "Toiminnan aikakatkaisu"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "Toiminto peruutettiin käyttäjävirheen vuoksi"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Ei ole löytynyt yhtään ECC-koordinaattia."
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "Koordinaattia ei tueta."
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "Pyydetty PKCS #11 -objekti ei ole saatavilla."
+
+#: lib/gnutls_errors.c:419
 msgid "(unknown error code)"
 msgstr "(tuntematon virhekoodi)"
 
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Sulkemisilmoitus"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Odottamaton viesti"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "Väärä tietue MAC"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Salauksen purku epäonnistui"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Tietueylivuoto"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Pakkauksen purkaminen epäonnistui"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Kättely epäonnistui"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "Varmenne on väärä"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Varmennetta ei tueta"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Varmenne kumottiin"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Varmenne on vanhentunut"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Tuntematon varmenne"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Virheellinen parametri"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "Varmenneviranomainen on tuntematon"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Pääsy kielletty"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "Dekoodausvirhe"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "Salauksen purkuvirhe"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Vientirajoite"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "Virhe yhteyskäytäntöversiossa"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Riittämättömästi turvallisuutta"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Käyttäjä perui"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Ei varmmennetta (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Uudelleenneuvottelua ei sallita"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Ei voitu noutaa määriteltyä varmennetta"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "Lähetettiin tukematon laajennus"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "Ei tunnistettu lähetettyä palvelinnimeä"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "SRP-/PSK-käyttäjänimi puuttuu tai on tuntematon"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Sisäinen sopimusneuvottelu epäonnistui"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Sisäinen sovellustodentaminen epäonnistui"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tPolkupituusrajoite: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tMenettelytapakieli: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -671,7 +695,7 @@ msgstr ""
 "\t\t\tMenettelytapa:\n"
 "\t\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -679,130 +703,130 @@ msgstr ""
 "\n"
 "\t\t\t\tHeksadesimaalivedos: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tDigitaalinen allekirjoitus.\n"
 
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tKiistämättömyys.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tAvainsalaus.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tTietosalaus.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tAvainsopimus.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tVarmenneallekirjoitus.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tCRL-allekirjoittaminen.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tVain avainsalaaja.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tVain avaimen salauspurkaja.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "varoitus: distributionPoint sisältää upotettuja NUL-merkkejä, korvataan merkillä ’!’\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tTLS-webpalvelin.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tTLS-webasiakas.\n"
 
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tKoodin allekirjoittaminen.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tSähköpostisuojaus.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tAikaleimaus.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tOCSP-allekirjoittaminen.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIpsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tMikä tahansa tarkoitus.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tVarmennusviranomainen (CA): EPÄTOSI\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tVarmenneviranomainen (CA): TOSI\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\tPolkupituusrajoite: %d\n"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "varoitus: altname sisältää upotettuja NUL-merkkejä, korvataan merkillä ’!’\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tXMPP-osoite: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\t”otherName OID”-tunniste: %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\totherName DER: "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -811,175 +835,190 @@ msgstr ""
 "\n"
 "%s\t\t\totherName ASCII: "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tLaajennukset:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tPerusrajoitteet (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "kriittinen"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "ei-kriittinen"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tAihepääavain (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tViranomaispääavain (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tAvainkäyttö (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tAvaintarkoitus (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tAiheen vaihtoehtoinen nimi (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tJulkaisijan vaihtoehtoinen nimi (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tCRL-jakelupisteitä (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\tVälityspalvelimen varmennetietoja (%s):\n"
 
-#: x509/output.c:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tTuntematon laajennus %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tHeksadesimaalivedos: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersio: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tSarjanumero (heksadesimaali): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tJulkaisija: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tKelpoisuus:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tEi ennen: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tEi jälkeen: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tAihe: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "tuntematon"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAiheen julkinen avainalgoritmi: %s\n"
 
-#: x509/output.c:1163
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tVarmenteen turvataso: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tVarmenteen turvataso: %s (%d bittiä)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tModulo (bitit %d):\n"
 
-#: x509/output.c:1182
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tEksponentti (bitit %d):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tKoordinaatti:\t%s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tJulkinen avain (bitit %d):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tAllekirjoitusalgoritmi: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 msgid "warning: signed using a broken signature algorithm that can be forged.\n"
 msgstr "varoitus: allekirjoitettu käyttäen murrettua allekirjoitusalgoritmia, joka voi olla väärennetty.\n"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tAllekirjoitus:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -987,7 +1026,7 @@ msgstr ""
 "\tMD5-sormenjälki:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -995,7 +1034,7 @@ msgstr ""
 "\tSHA-1-sormenjälki:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1003,197 +1042,197 @@ msgstr ""
 "\tJulkisen avaimen tunniste:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "allekirjoitettu käyttäen %s (rikki!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "allekirjoitettu käyttäen %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "X.509 -varmennetiedot:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Muuta tietoa:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersio: 1 (oletus)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tPäivityspäivämäärät:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tJulkaistu: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tSeuraava osoitteessa: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tLaajennukset:\n"
 
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tCRL-numero (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tViranomaispääavain (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tTuntematon laajennus %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tHeksadesimaalivedos: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tKumotut varmenteet (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tEi kumottuja varmenteita.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSarjanumero (heksaluku): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tKumottu osoitteessa: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "X.509-varmennekumoamisluettelotiedot:\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tEksponentti:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tAttribuutit:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tHaastesalasana: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tTuntematon attribuutti %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
 msgstr "PKCS #10 -varmennepyyntötiedot:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tAvainkäyttö:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "virhe: get_key_usage: %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitaaliset allekirjoitukset.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tViestintäsalaus.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tTallennustietosalaus.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tTodennus.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tVarmenneallekirjoitus.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tID (heksadesimaali): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tSormenjälki (heksadesimaali): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tKumottu: Tosi\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tKumottu: Epätosi\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tAikaleimat:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tLuonti: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tVanheneminen: Ei koskaan\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tVanheneminen: %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tJulkisen avaimen algoritmi: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tAvaimen turvataso: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNimi[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tKumottu nimi[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1202,44 +1241,56 @@ msgstr ""
 "\n"
 "\tAliavain[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "nimi[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "kumottu nimi[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "sormenjälki: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "luotu: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "ei vanhene koskaan, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "vanhenee: %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "avainalgoritmi %s (%d bittiä)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "tuntematon avainalgoritmi (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "OpenPGP-varmennetiedot:\n"
+
+#~ msgid "The initialization of LZO has failed."
+#~ msgstr "LZO-alustus epäonnistui."
+
+#~ msgid "The handshake data size is too large (DoS?), check gnutls_handshake_set_max_packet_length()."
+#~ msgstr "Kättelytietojen koko on liian suuri (DoS?), tarkista gnutls_handshake_set_max_packet_length()."
+
+#~ msgid "Inner application negotiation failed"
+#~ msgstr "Sisäinen sopimusneuvottelu epäonnistui"
+
+#~ msgid "Inner application verification failed"
+#~ msgstr "Sisäinen sovellustodentaminen epäonnistui"
diff --git a/po/nl.po.in b/po/nl.po.in
index 047b3b865b..a829d424eb 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -6,10 +6,10 @@
 # Erwin Poeze <erwin.poeze@gmail.com>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls-2.12.7\n"
+"Project-Id-Version: libgnutls-3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-17 21:34+0200\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-03 21:27+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -19,653 +19,677 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Gelukt."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Kan geen gemeenschappelijke coderingsmethode overeenkomen."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "De coderingsmethode wordt niet ondersteund."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Het certificaat en de gegeven sleutel passen niet bij elkaar."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Kan geen gemeenschappelijke compressiemethode overeenkomen."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "Onbekend versleutelingsalgoritme gevonden."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Er werd een uitgeschakeld algoritme overeengekomen."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Er werd een groot TLS-datapakket ontvangen."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Er werd een datapakket met een ongedige versie ontvangen."
 
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 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)."
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Er werd een TLS-pakket met een onverwachte lengte ontvangen."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "De TLS-verbinding is onjuist afgesloten."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "De aangegeven sessie is om een of andere reden ongeldig geworden."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
-msgstr "**Interne fout** in GnuTLS."
+msgstr "**Interne programmafout** in GnuTLS."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "Er werd een ongeldige TLS-uitbreiding ontvangen."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Er werd een ernstig TLS-alarm ontvangen."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Er werd een onverwacht TLS-pakket ontvangen."
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "Er is een TLS-waarschuwing ontvangen."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Er is een fout opgetreden tijdens de TLS-pakketeinde-berekening."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "De andere computer heeft geen certificaat gestuurd."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "De gegeven DSA-sleutel is incompatibel met het geselecteerde TLS-protocol."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Er is al een encryptie-algoritme met een lagere prioriteit."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Er zijn geen tijdelijke RSA-parameters gevonden."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Er zijn geen tijdelijke DH-parameters gevonden."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Er werd een onverwacht TLS-handshake-pakket ontvangen."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Het lezen van een groot geheel getal is mislukt."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Het exporteren van een groot geheel getal is mislukt."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Ontsleuteling is mislukt."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Versleuteling is mislukt."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Ontsleuteling met publieke sleutel is mislukt."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Versleuteling met publieke sleutel is mislukt."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Ondertekenen met publieke sleutel is mislukt."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Controle van ondertekening met publieke sleutel is mislukt."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Decompressie van het TLS-datapakket is mislukt."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "Compressie van het TLS-datapakket is mislukt."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
-msgstr "**Interne fout** bij reserveren van geheugen."
+msgstr "**Interne programmafout** bij reserveren van geheugen."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Er werd een uitgeschakelde of ongeïmplementeerde functie gevraagd."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Onvoldoende rechten voor dat verzoek."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "Fout in wachtwoordenbestand."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Onjuiste opvulbytes in PKCS1-pakket."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "De gevraagde sessie is verlopen."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Hashen is mislukt."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "Base64-decoderingsfout."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Onverwachte fout in base64-kopregel."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "Base64-coderingsfout."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "Fout in de indeling van wachtwoordenbestand."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "De gevraagde gegevens zijn niet beschikbaar."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "Fout in de 'pull'-functie."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "Fout in de 'push'-functie."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Het hoogste volgnummer voor datapakketten is bereikt.  Wauw!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "Fout in het certificaat."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Onbekende naam van toegevoegd onderwerp in X.509-certificaat."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Niet-ondersteunde kritieke uitbreiding in X.509-certificaat."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Er is een overtreding van het sleutelgebruik in het certificaat geconstateerd."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Bron is tijdelijk niet beschikbaar; probeer het later nogmaals."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Functie werd onderbroken."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "De andere computer heeft om een hernieuwde handshake gevraagd."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Er werd TLS-toepassingsdata ontvangen, terwijl handshake-gegevens verwacht werden."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "Fout in databank-backend."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Het certificaattype wordt niet ondersteund."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Beschikbare buffer is te klein voor de gegeven parameters."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "Het verzoek is ongeldig."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "De cookie is ongeldig."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "Er werd een ongeoorloofde parameter ontvangen."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "Fout tijdens lezen van bestand."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1-parser: Element niet gevonden."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1-parser: Naam niet gevonden."
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1-parser: Fout in ontleden van DER."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1-parser: Waarde niet gevonden."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1-parser: Algemene ontledingsfout."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1-parser: Waarde is ongeldig."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1-parser: Fout in TAG."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1-parser: Fout in impliete tag."
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1-parser: Fout in type 'ANY'."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1-parser: Syntaxfout."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1-parser: Overloop in DER-ontleding."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
 msgstr "Er zijn te veel lege datapakketten ontvangen."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "Er zijn te veel handshake-pakketten ontvangen."
+
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Het initialiseren van GnuTLS-extra is mislukt."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 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."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "De versie van de gcrypt-bibliotheek is te oud."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "De versie van de crypto-bibliotheek is te oud."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "De versie van de tasn1-bibliotheek is te oud."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "Het OpenPGP-gebruikers-ID is ingetrokken."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "De OpenPGP-sleutel heeft geen voorkeurssleutelset."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "Fout tijdens laden van de sleutelring."
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Het initialiseren van de cryptografische routines is mislukt."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "Het initialiseren van LZO is mislukt."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
 msgstr "Er is geen ondersteund compressie-algoritme gevonden."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
 msgstr "Er is geen ondersteund encryptie-algoritme gevonden."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Kan OpenPGP-sleutel niet verkrijgen."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Kan OpenPGP-subsleutel niet vinden."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Beveiligde heronderhandeling is mislukt."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Onbeveiligde heronderhandeling is geweigerd."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "De gegeven SRP-gebruikersnaam is ongeldig."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "De gegeven SRP-gebruikersnaam is onbekend."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "De OpenPGP-vingerafdruk wordt niet ondersteund."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Het ondertekeningsalgoritme wordt niet ondersteund."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Het certificaat heeft niet-ondersteunde eigenschappen."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "Het OID wordt niet ondersteund."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Onbekend hash-algoritme."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 msgid "The PKCS structure's content type is unknown."
 msgstr "Onbekend inhoudstype van PKCS-structuur."
 
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Onbekend buideltype van PKCS-structuur."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "Het opgegeven wachtwoord bevat ongeldige tekens."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "Verificatie van berichtauthenticatiecode is mislukt."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Sommige beperkingsgrenzen werden bereikt."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Kan geen willekeurige bits verkrijgen."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "TLS/IA-tussenfasebeëindigingsbericht ontvangen"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "TLS/IA-eindfasebeëindigingsbericht ontvangen"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Verificatie van TLS/IA-fasecontrolesom is mislukt"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Het opgegeven algoritme of protocol is onbekend."
 
-#: gnutls_errors.c:275
-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:276
+msgid "The handshake data size is too large."
+msgstr "De handshake-gegevens zijn te groot."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "Fout bij openen van /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "Fout bij interactie met /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Kanaalbindingsgegevens zijn niet beschikbaar."
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "PKCS #11 -- fout."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "PKCS #11 -- initialisatiefout."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "Fout bij ontleden."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "PKCS #11 -- fout in PIN."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "PKCS #11 -- PIN moet opgeslagen worden."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "PKCS #11 -- fout in plaats"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "Thread-vergrendelingsfout"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "PKCS #11 -- fout in eigenschap"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "PKCS #11 -- fout in apparaat"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "PKCS #11 -- fout in gegevens"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "PKCS #11 -- niet-ondersteunde functie"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "PKCS #11 -- fout in sleutel"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "PKCS #11 -- PIN is verlopen"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "PKCS #11 -- PIN is vergrendeld"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "PKCS #11 -- fout in sessie"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "PKCS #11 -- fout in ondertekening"
 
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "PKCS #11 -- fout in token"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "PKCS #11 -- gebruikersfout"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "De bewerking duurde te lang"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "De bewerking is geannuleerd vanwege een gebruikersfout"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Er zijn geen ondersteunde ECC-krommes gevonden"
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "De kromme wordt niet ondersteund"
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "Het gevraagde PKCS #11-object is niet beschikbaar"
+
+#: lib/gnutls_errors.c:419
 msgid "(unknown error code)"
 msgstr "(onbekende foutcode)"
 
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Afsluitingsbericht"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Onverwacht bericht"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "Record met ongeldige MAC"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Ontsleuteling is mislukt"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Recordoverloop"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Decompressie is mislukt"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Handshake is mislukt"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "Certificaat is ongeldig"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Certificaat wordt niet ondersteund"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Certificaat is ingetrokken"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Certificaat is verlopen"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Onbekend certificaat"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Ongeldige parameter"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "CA is onbekend"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Toegang werd geweigerd"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "Decoderingsfout"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "Ontsleutelingsfout"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Exportbeperking"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "Fout in protocolversie"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Onvoldoende veiligheid"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Door gebruiker geannuleerd"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Geen certificaat (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
-msgstr "**Interne fout**"
+msgstr "**Interne programmafout**"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Heronderhandeling is niet toegestaan"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Kan het opgegeven certificaat niet ophalen"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "Een niet-ondersteunde uitbreiding werd toegezonden"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "De toegezonden servernaam werd niet herkend"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "De SRP/PSK-gebruikersnaam ontbreekt of is onbekend"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Inwendige programmaonderhandeling is mislukt"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Inwendige programmaverificatie is mislukt"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tPadlengtebeperking: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tBeleidstaal: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -673,7 +697,7 @@ msgstr ""
 "\t\t\tBeleid:\n"
 "\t\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -681,130 +705,130 @@ msgstr ""
 "\n"
 "\t\t\t\tHexdump: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tDigitale ondertekening.\n"
 
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tNiet-herroeping.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tSleutel-encryptie.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tData-encryptie.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tSleutelovereenstemming.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tCertificaatondertekening.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tCRL-ondertekening.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tAlleen sleutel-encryptie.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tAlleen sleutel-decryptie.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "Waarschuwing: distributiepunt bevat een NUL-waarde, wordt vervangen door '!'\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tTLS WWW-server.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tTLS WWW-cliënt.\n"
 
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tCode-ondertekening.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tE-mailbescherming.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tTijdsstempels.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tOCSP-ondertekening.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIpsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tElk doel.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tCertificaatautoriteit (CA): ONWAAR\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tCertificaatautoriteit (CA): WAAR\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\tPadlengtebeperking: %d\n"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "Waarschuwing: alternatieve naam bevat een NUL-waarde, wordt vervangen door '!'\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tXMPP-adres: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\tAndere naam (OID): %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\tAndere naam (DER): "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -813,175 +837,190 @@ msgstr ""
 "\n"
 "%s\t\t\tAndere naam (ASCII): "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tUitbreidingen:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tFundamentele beperkingen (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "kritiek"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "niet kritiek"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tOnderwerps-ID van sleutel (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tAutoriteits-ID van sleutel (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tGebruik van sleutel (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tDoel van sleutel (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tToegevoegde onderwerpen (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tAlternatieve uitgevernaam (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tCRL-distributiepunten (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\tInformatie over proxy-certificaat (%s):\n"
 
-#: x509/output.c:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tOnbekende uitbreiding %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tHexdump: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersie: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tSerienummer (hex): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tUitgever: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tGeldigheid:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNiet vóór: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNiet na: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tOnderwerp: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "onbekend"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritme van publieke sleutel: %s\n"
 
-#: x509/output.c:1163
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tCertificaatveiligheidsniveau: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tCertificaatveiligheidsniveau: %s (%d bits)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tModulus (bits %d):\n"
 
-#: x509/output.c:1182
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tExponent (bits %d):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tKromme: %s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tPublieke sleutel (bits %d):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tOndertekeningsalgoritme: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 msgid "warning: signed using a broken signature algorithm that can be forged.\n"
 msgstr "Waarschuwing: ondertekend met een algoritme dat vervalst kan worden.\n"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tOndertekening:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -989,7 +1028,7 @@ msgstr ""
 "\tMD5-vingerafdruk:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -997,7 +1036,7 @@ msgstr ""
 "\tSHA-1-vingerafdruk:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1005,197 +1044,197 @@ msgstr ""
 "\tID van publieke sleutel:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "ondertekend met %s (beschadigd!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "ondertekend met %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "Informatie over X.509-certificaten:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Andere informatie:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersie: 1 (standaard)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tBijwerkingsdata:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tUitgegeven: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tVolgende op: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tUitbreidingen:\n"
 
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tCRL-nummer (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tAutoriteits-ID van sleutel (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tOnbekende uitbreiding %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tHexdump: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tIngetrokken certificaten (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tGeen ingetrokken certificaten.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSerienummer (hex): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tIngetrokken op: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informatie over ingetrokken X.509-certificaten:\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tExponent:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tEigenschappen:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tTest-wachtwoord: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tOnbekende eigenschap %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
 msgstr "Informatie over PKCS #10-certificaatverzoek:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tGebruik van sleutel:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "fout in get_key_usage(): %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitale ondertekeningen.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tEncryptie van communicatie.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tEncryptie van opgeslagen data.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAuthenticatie.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tCertificaatondertekening.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tVingerafdruk (hex): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tIngetrokken: Ja\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tIngetrokken: Nee\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tTijdsstempels:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tAangemaakt op: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tVervaldatum: Nooit\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tVervaldatum: %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritme van publieke sleutel: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tSleutelveiligheidsniveau: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNaam[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tIngetrokken naam[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1204,44 +1243,56 @@ msgstr ""
 "\n"
 "\tSubsleutel[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "naam[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "ingetrokken naam[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "vingerafdruk: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "aangemaakt: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "verloopt nooit, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "verloopt: %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "versleutelingsalgoritme %s (%d bits)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "onbekend versleutelingsalgoritme (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informatie over OpenPGP-certificaten:\n"
+
+#~ msgid "The initialization of LZO has failed."
+#~ msgstr "Het initialiseren van LZO is mislukt."
+
+#~ 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()."
+
+#~ msgid "Inner application negotiation failed"
+#~ msgstr "Inwendige programmaonderhandeling is mislukt"
+
+#~ msgid "Inner application verification failed"
+#~ msgstr "Inwendige programmaverificatie is mislukt"
diff --git a/po/pl.po.in b/po/pl.po.in
index bdfc6e0b44..0ca284ffed 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls-2.12.7\n"
+"Project-Id-Version: libgnutls-3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-12 18:02+0200\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-03 18:46+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -16,653 +16,677 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Sukces."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Nie uda�o si� wynegocjowa� obs�ugiwanego zestawu certyfikat�w."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "Ten typ certyfikatu nie jest obs�ugiwany."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Certyfikat i dany klucz nie pasuj� do siebie."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Nie uda�o si� wynegocjowa� obs�ugiwanej metody kompresji."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "Napotkano nieznany algorytm klucza publicznego."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Wynegocjowano algorytm, kt�ry nie zosta� w��czony."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Odebrano du�y pakiet rekordu TLS."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Odebrano pakiet rekordu o niedozwolonej wersji."
 
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 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)."
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Odebrano pakiet TLS o nieoczekiwanej d�ugo�ci."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "Po��czenie TLS nie zosta�o w�a�ciwie zako�czone."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "Podana sesja zosta�a z jakiego� powodu uniewa�niona."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
 msgstr "B��d wewn�trzny GnuTLS."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "Odebrano niedozwolone rozszerzenie TLS."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Odebrano krytyczny alarm TLS."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Odebrano nieoczekiwany pakiet TLS."
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "Odebrano ostrzegawczy alarm TLS."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Wykryto b��d przy obliczaniu pakietu TLS Finished."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "Druga strona nie wys�a�a �adnego certyfikatu."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "Podany klucz DSA jest niezgodny z wybranym protoko�em TLS."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Istnieje ju� algorytm kryptograficzny z ni�szym priorytetem."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Nie znaleziono parametr�w tymczasowych RSA."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Nie znaleziono parametr�w tymczasowych DH."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Odebrano nieoczekiwany pakiet nawi�zania TLS."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Poszukiwanie du�ej liczby ca�kowitej nie powiod�o si�."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Nie uda�o si� wyeksportowa� du�ej liczby ca�kowitej."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Odszyfrowywanie nie powiod�o si�."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Szyfrowanie nie powiod�o si�."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Odszyfrowywanie z kluczem publicznym nie powiod�o si�."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Szyfrowanie z kluczem publicznym nie powiod�o si�."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Podpisywanie z kluczem publicznym nie powiod�o si�."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Sprawdzenie podpisu z kluczem publicznym nie powiod�o si�."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekompresja pakietu rekordu TLS nie powiod�a si�."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "Kompresja pakietu rekordu TLS nie powiod�a si�."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
 msgstr "B��d wewn�trzny przy przydzielaniu pami�ci."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Za��dano niezaimplementowanej lub wy��czonej opcji."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Niewystarczaj�ce uprawnienia dla tego ��dania."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "B��d w pliku hase�."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "B��dne wyr�wnanie w pakiecie PKCS1."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "��dana sesja wygas�a."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Funkcja skr�tu nie powiod�a si�."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "B��d dekodowania base64."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Nieoczekiwany b��d nag��wka base64."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "B��d kodowania base64."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "B��d przetwarzania pliku hase�."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "��dane dane nie by�y dost�pne."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "B��d w funkcji pull."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "B��d w funkcji push."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 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!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "B��d w certyfikacie."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Nieznana nazwa Subject Alternative w certyfikacie X.509."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Nieobs�ugiwane rozszerzenie krytyczne w certyfikacie X.509."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Wykryto naruszenie u�ycia klucza w certyfikacie."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Zasoby chwilowo niedost�pne, prosz� spr�bowa� ponownie."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Funkcja zosta�a przerwana."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "Druga strona za��da�a ponownego nawi�zania sesji."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Odebrano dane aplikacji TLS, ale oczekiwano na nawi�zanie sesji."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "B��d w backendzie bazy danych."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Ten typ certyfikatu nie jest obs�ugiwany."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Przekazany bufor pami�ci jest zbyt ma�y do przechowania parametr�w."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "��danie jest nieprawid�owe."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "B��dne ciasteczko."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "Odebrano niedozwolony parametr."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "B��d podczas odczytu pliku."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "Analiza ASN1: Nie znaleziono elementu."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "Analiza ASN1: Nie znaleziono identyfikatora."
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "Analiza ASN1: B��d przy analizie DER."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "Analiza ASN1: Nie znaleziono warto�ci."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "Analiza ASN1: Og�lny b��d przetwarzania."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "Analiza ASN1: Warto�� nie jest prawid�owa."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "Analiza ASN1: B��d w znaczniku."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "Analiza ASN1: b��d w domy�lnym znaczniku."
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "Analiza ASN1: B��d w typie 'ANY'."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "Analiza ASN1: B��d sk�adni."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "Analiza ASN1: Przepe�nienie przy analizie DER."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
 msgstr "Odebrano zbyt du�o pustych pakiet�w rekord�w."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "Odebrano zbyt du�o pakiet�w nawi�zania po��czenia."
+
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Inicjalizacja GnuTLS-extra nie powiod�a si�."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 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."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "Wersja biblioteki gcrypt jest zbyt stara."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "Wersja biblioteki kryptograficznej jest zbyt stara."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "Wersja biblioteki tasn1 jest zbyt stara."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "Identyfikator u�ytkownika OpenPGP jest uniewa�niony."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "Klucz OpenPGP nie ma ustawionego preferowanego klucza."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "B��d przy wczytywaniu zbioru kluczy."
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Inicjalizacja backendu kryptograficznego nie powiod�a si�."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "Inicjalizacja LZO nie powiod�a si�."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
 msgstr "Nie znaleziono obs�ugiwanego algorytmu kompresji."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
 msgstr "Nie znaleziono obs�ugiwanego zestawu certyfikat�w."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Nie uda�o si� uzyska� klucza OpenPGP."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Nie uda�o si� odnale�� podklucza OpenPGP."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Bezpieczna renegocjacja nie powiod�a si�."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Odmowa niebiezpiecznej renegocjacji."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "Podana nazwa u�ytkownika SRP nie jest dozwolona."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "Podana nazwa u�ytkownika SRP jest nieznana."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "Odcisk klucza OpenPGP nie jest obs�ugiwany."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Ten algorytm podpisu nie jest obs�ugiwany."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Certyfikat ma nieobs�ugiwane atrybuty."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "OID nie jest obs�ugiwany."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Algorytm skr�tu jest nieznany."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 msgid "The PKCS structure's content type is unknown."
 msgstr "Typ zawarto�ci struktury PKCS jest nieznany."
 
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Typ opakowania struktury PKCS jest nieznany."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "Podane has�o zawiera nieprawid�owe znaki."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "Sprawdzenie kodu autentyczno�ci wiadomo�ci (MAC) nie powiod�o si�."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Osi�gni�to niekt�re ograniczenia."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Nie uda�o si� pozyska� danych losowych."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Odebrano wiadomo�� TLS/IA Intermediate Phase Finished"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Odebrano wiadomo�� TLS/IA Final Phase Finished"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Sprawdzenie sumy kontrolnej frazy TLS/IA nie powiod�o si�"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Podany algorytm lub protok� jest nieznany."
 
-#: gnutls_errors.c:275
-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:276
+msgid "The handshake data size is too large."
+msgstr "Rozmiar danych nawi�zania po��czenia jest zbyt du�y."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "B��d otwierania /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "B��d komunikacji z /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Dane wi���ce kana� nie s� dost�pne."
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "B��d PKCS #11."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "B��d inicjalizacji PKCS #11."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "B��d w trakcie analizy."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "B��d PKCS #11 w PIN-ie."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "PIN PKCS #11 powinien by� zapisany."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "B��d PKCS #11 w slocie"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "B��d blokowania w�tku"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "B��d PKCS #11 w atrybucie"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "B��d PKCS #11 w urz�dzeniu"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "B��d PKCS #11 w danych"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "Nieobs�ugiwana w�a�ciwo�� PKCS #11"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "B��d PKCS #11 w kluczu"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "PIN PKCS #11 wygas�"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "PIN PKCS #11 zablokowany"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "B��d PKCS #11 w sesji"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "B��d PKCS #11 w podpisie"
 
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "B��d PKCS #11 w tokenie"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "B��d u�ytkownika PKCS #11"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "Up�yn�� limit czasu operacji"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "Operacja zosta�� przerwana z powodu b��du u�ytkownika"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Nie znaleziono obs�ugiwanych krzywych ECC"
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "Ta krzywa nie jest obs�ugiwana"
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "��dany obiekt PKCS #11 nie jest dost�pny"
+
+#: lib/gnutls_errors.c:419
 msgid "(unknown error code)"
 msgstr "(nieznany kod b��du)"
 
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Powiadomienie o zamkni�ciu"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Nieoczekiwany komunikat"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "B��dny MAC rekordu"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Odszyfrowywanie nie powiod�o si�"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Przepe�nienie rekordu"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Dekompresja nie powiod�a si�"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Nawi�zanie komunikacji nie powiod�o si�"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "B��dny certyfikat"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Nieobs�ugiwany certyfikat"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Certyfikat zosta� anulowany"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Certyfikat wygas�"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Nieznany certyfikat"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Niedozwolony parametr"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "Nieznane CA"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Dost�p zabroniony"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "B��d dekodowania"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "B��d odszyfrowywania"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Ograniczenia eksportowe"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "B��d w wersji protoko�u"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Niewystarczaj�ce bezpiecze�stwo"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Anulowane przez u�ytkownika"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Brak certyfikatu (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Renegocjacja niedozwolona"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Nie uda�o si� pobra� wskazanego certyfikatu"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "Wys�ano nieobs�ugiwane rozszerzenie"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "Nierozpoznana wys�ana nazwa serwera"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "Brak lub nieznana nazwa u�ytkownika SRP/PSK"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Negocjacja w ramach aplikacji nie powiod�a si�"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Weryfikacja w ramach aplikacji nie powiod�a si�"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tOgraniczenie d�ugo�ci �cie�ki: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tJ�zyk polityki: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -670,7 +694,7 @@ msgstr ""
 "\t\t\tPolityka:\n"
 "\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -678,130 +702,130 @@ msgstr ""
 "\n"
 "\t\t\t\tZrzut hex: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tPodpis cyfrowy.\n"
 
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tBez odmowy.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tSzyfrowanie klucza.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tSzyfrowanie danych.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tUzgodnienie klucza.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tPodpisanie certyfikatu.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tPodpisanie CRL.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tTylko szyfrowanie klucza.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tTylko deszyfrowanie klucza.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "uwaga: distributionPoint zawiera znak NUL, zast�piono znakiem '!'\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tSerwer WWW TLS.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tKlient WWW TLS.\n"
 
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tPodpisywanie kodu.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tOchrona poczty elektronicznej.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tOznaczanie czasu.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tPodpisywanie OCSP.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIpsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tDowolne zastosowanie.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tCA: NIE\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tCA: TAK\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\tOgraniczenie d�ugo�ci �cie�ki: %d\n"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "uwaga: alternatywna nazwa zawiera znak NUL, zast�piono znakiem '!'\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tAdres XMPP: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\tOID otherName: %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\tDER otherName: "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -810,175 +834,190 @@ msgstr ""
 "\n"
 "%s\t\t\tASCII otherName: "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tRozszerzenia:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tOgraniczenia podstawowe (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "krytyczny"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "niekrytyczny"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tIdentyfikator klucza przedmiotu (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tIdentyfikator klucza autorytetu (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tU�ycie klucza (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tPrzeznaczenie klucza (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tAlternatywna nazwa przedmiotu (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tAlternatywna nazwa wystawcy (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tPunkty rozprowadzania CRL (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n"
 
-#: x509/output.c:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tNieznane rozszerzenie %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tZrzut hex: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tWersja: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tNumer seryjny (hex): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tWystawca: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tWa�no��:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tNie wcze�niej ni�: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tNie p�niej ni�: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tPrzedmiot: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "nieznany"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgorytm klucza publicznego: %s\n"
 
-#: x509/output.c:1163
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tPoziom bezpiecze�stwa certyfikatu: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tPoziom bezpiecze�stwa certyfikatu: %s (bit�w: %d)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tReszta (bit�w: %d):\n"
 
-#: x509/output.c:1182
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tWyk�adnik (bit�w: %d):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tKrzywa:\t%s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tKlucz publiczny (bit�w: %d):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tAlgorytm podpisu: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 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"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tPodpis:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -986,7 +1025,7 @@ msgstr ""
 "\tOdcisk MD5:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -994,7 +1033,7 @@ msgstr ""
 "\tOdcisk SHA-1:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1002,197 +1041,197 @@ msgstr ""
 "\tIdentyfikator klucza publicznego:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "podpisano przy u�yciu %s (uszkodzonego!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "podpisano przy u�yciu %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "Informacja o certyfikacie X.509:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Inne informacje:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tWersja: 1 (domy�lna)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tDaty uaktualnie�:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tWystawiono: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tNast�pnie: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tRozszerzenia:\n"
 
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tNumer CRL (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tIdentyfikator klucza autorytetu (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tNieznane rozszerzenie %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tZrzut hex: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tUniewa�nione certyfikaty (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tBrak uniewa�nionych certyfikat�w.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tNumer seryjny (hex): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tUniewa�niono: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Informacja o li�cie uniewa�nie� certyfikat�w X.509:\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tWyk�adnik:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tAtrybuty:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tHas�o wyzwania: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tNieznane rozszerzenie %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
 msgstr "Informacja o ��daniu certyfikatu PKCS #10:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tU�ycie klucza:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "b��d: get_key_usage: %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tPodpisy cyfrowe.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tSzyfrowanie komunikacji.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tSzyfrowanie przechowywanych danych.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tUwierzytelnianie.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tPodpisanie certyfikatu.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tID (hex): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tOdcisk (hex): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tUniewa�niony: tak\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tUniewa�niony: nie\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tOznaczenia czasu:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tUtworzenie: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tWyga�ni�cie: nigdy\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tWyga�ni�cie: %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgorytm klucza publicznego: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tPoziom bezpiecze�stwa klucza: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNazwa[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tNazwa uniewa�niona[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1201,44 +1240,44 @@ msgstr ""
 "\n"
 "\tPodklucz[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "nazwa[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "nazwa uniewa�niona[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "odcisk: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "utworzono: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "nigdy nie wygasa, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "wygasa: %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "algorytm klucza publicznego %s (bit�w: %d)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "nieznany algorytm klucza publicznego (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Informacja o certyfikacie OpenPGP:\n"
diff --git a/po/sv.po.in b/po/sv.po.in
index c2d36b5be6..ff21bd6e26 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls 2.12.7\n"
+"Project-Id-Version: libgnutls 3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-20 11:21+0100\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-03 11:12+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -16,656 +16,680 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Lyckades."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Kunde inte förhandla fram en krypteringssvit som stöds."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "Krypteringstypen stöds inte."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Certifikatet och den angivna nyckeln stämmer inte överens."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Kunde inte förhandla fram en stödd komprimeringsmetod."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "En okänd publik nyckel-algoritm påträffades."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "En algoritm som inte är aktiverad blev förhandlad."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Ett stort TLS-journalpaket togs emot."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Ett journalpaket med otillåten version togs emot."
 
 # Stort?
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 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:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Ett TLS-paket med oväntad längd togs emot."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "TLS-anslutningen avslutades inte korrekt."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "Angiven session har av någon anledning blivit ogiltigförklarad."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
 msgstr "Internt fel i GnuTLS."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "En otillåten TLS-utökning togs emot."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Ett ödesdigert TLS-larm togs emot."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Ett oväntat TLS-paket togs emot."
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "En TLS-varning har tagits emot."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Ett fel påträffades vid beräkning av TLS Finished-paketet."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "Motparten skickade inget certifikat."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "Angiven DSA-nyckel är inte kompatibel med det valda TLS-protokollet."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Det finns redan en krypteringsalgoritm med lägre prioritet."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Inga temporära RSA-parametrar hittades."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Inga temporära DH-parametrar hittades."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Ett oväntat TLS-handskakningspaket togs emot."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Avsökningen av ett stort heltal misslyckades."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Kunde inte exportera ett stort heltal."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Dekryptering misslyckades."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Kryptering misslyckades."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Dekryptering av publik nyckel misslyckades."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Kryptering av publik nyckel misslyckades."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Signering av publik nyckel misslyckades."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Validering av av publika nyckelns signatur misslyckades."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Dekomprimering av TLS-journalpaketet har misslyckades."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "Komprimering av TLS-journalpaketet har misslyckades."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
 msgstr "Internt fel i minnesallokering."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "En icke implementerad eller inaktiverad funktion begärdes."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Otillräckliga rättigheter för begäran."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "Fel i lösenordsfil."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Fel utfyllnad i PKCS1-paket."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "Den begärda sessionen har tagit slut."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Hashning misslyckades."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "Base64-avkodningsfel."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Oväntat fel i Base64-huvud."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "Base64-kodningsfel."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "Tolkningsfel i lösenordsfil."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "Begärt data var inte tillgängligt."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "Fel i inhämtningsfunktionen."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "Fel i utsändningsfunktionen."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 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!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "Fel i certifikatet."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Okänt alternativt namn för innehavare i X.509-certifikat."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Icke stödd kritisk utökning i X.509-certifikat."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Överträdelse av nyckelanvändning i certifikat har upptäckts."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Resursen är temporärt otillgänglig, försök igen."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Funktionen avbröts."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "Upprepad handskakning begärdes av motparten."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "TLS-programdata togs emot när handskakningsdata förväntades."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "Fel i databasbakänden."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Certifikattypen stöds inte."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Den angivna minnesbufferten är för liten för att lagra parametrar."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "Begäran är ogiltig."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "Kakan var felaktig."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "En otillåten parameter har tagits emot."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "Fel vid läsning av fil."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "ASN1-tolkare: Elementet hittades inte."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "ASN1-tolkare: Identifieraren hittades inte"
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "ASN1-tolkare: Fel i DER-tolkning."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "ASN1-tolkare: Värdet hittades inte."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "ASN1-tolkare: Allmänt tolkningsfel."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "ASN1-tolkare: Värdet är inte giltigt."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "ASN1-tolkare: Fel i TAG."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "ASN1-tolkare: fel i implicit tag"
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "ASN1-tolkare: Fel i typen \"ANY\"."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "ASN1-tolkare: Syntaxfel."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "ASN1-tolkare: Överflöde i DER-tolkning."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
-msgstr "För många tom journalpaket har tagits emot."
+msgstr "För många tomma journalpaket har tagits emot."
+
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "För många handskakningspaket har tagits emot."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Initieringen av GnuTLS-extra har misslyckats."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 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."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "Versionen av gcrypt-biblioteket är för gammal."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "Versionen av crypto-biblioteket är för gammal."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "Versionen av tasn1-biblioteket är för gammal."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "OpenPGP-användaridentiteten är spärrad."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "OpenPGP-nyckeln har inte en föredragen nyckeluppsättning."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "Fel vid inläsning av nyckelringen."
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Initieringen av krypteringsbakände misslyckades."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "Initiering av LZO misslyckades."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
-msgstr "Inga stödda komprimeringsalgoritmer har hittats."
+msgstr "Inga stödda komprimeringsalgoritmer hittades."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
-msgstr "Inga stödda krypteringssviter har hittats."
+msgstr "Inga krypteringssviter som stöds hittades."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Kunde inte hämta OpenPGP-nyckel."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Kunde inte hitta OpenPGP-undernyckel."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Säker återförhandling misslyckades."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Osäker återförhandling nekades."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "Det angivna SRP-användarnamnet är inte tillåtet."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "Det angivna SRP-användarnamnet är okänt."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "OpenPGP-fingeravtrycket stöds inte."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Signaturalgoritmen stöds inte."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Certifikatet har attribut som inte stöds."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "OID:n stöds inte."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Hashalgoritmen är okänd."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 msgid "The PKCS structure's content type is unknown."
 msgstr "PKCS-strukturens innehållstyp är okänd."
 
 # Hjälp!
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "PKCS-strukturens väsktyp är okänd."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "Det angivna lösenordet innehåller ogiltiga tecken."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "Validering av meddelandeautentiseringskoden (MAC) misslyckades."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Vissa begränsningar nåddes."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Misslyckades med att få tag på slumpmässigt data."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Tog emot ett TLS/IA Intermediate Phase Finished-meddelande"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Tog emot ett TLS/IA Final Phase Finished-meddelande"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Validering av kontrollsumma för TLS/IA-fas misslyckades"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Angivna algoritmen eller protokollet är okänt."
 
-#: gnutls_errors.c:275
-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:276
+msgid "The handshake data size is too large."
+msgstr "Datastorlek för handskakning är för stor."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "Fel vid öppning av /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "Fel vid kommunikation med /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Kanalbindningsdata är inte tillgängligt"
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "PKCS #11-fel."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "PKCS #11-initieringsfel."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "Fel i tolkning."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "PKCS #11-fel i PIN-kod."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "PKCS #11 PIN-kod bör sparas."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "PKCS #11-fel i kortplats"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "Trådlåsningsfel"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "PKCS #11-fel i attribut"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "PKCS #11-fel i enhet"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "PKCS #11-fel i data"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "PKCS #11-funktion stöds inte"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "PKCS #11-fel i nyckel"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "PKCS #11 PIN-kod utgången"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "PKCS #11 PIN-kod låst"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "PKCS #11-fel i session"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "PKCS #11-fel i signatur"
 
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "PKCS #11-fel i token"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "PKCS #11-användarfel"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "Åtgärden översteg tidsgränsen"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "Åtgärden avbröts på grund av ett användarfel"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Inga ECC-kurvor hittades som stöds"
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "Kurvan stöds inte"
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "Begärt PKCS #11-objekt är inte tillgängligt"
+
+#: lib/gnutls_errors.c:419
 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.
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Stängningsnotifiering"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Oväntat meddelande"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "Felaktig MAC-post"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Dekryptering misslyckades"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Överflöde i post"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Dekomprimering misslyckades"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Handskakning misslyckades"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "Certifikatet är felaktigt"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Certifikatet stöds inte"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Certifikatet var spärrat"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Certifikatet har gått ut"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Okänt certifikat"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Otillåten parameter"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "Certifikatutfärdare är okänd"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Åtkomst nekades"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "Avkodningsfel"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "Dekrypteringsfel"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Exportbegränsning"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "Fel i protokollversion"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Otillräcklig säkerhet"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Användaren avbröt"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Inget certifikat (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Ingen återförhandling tillåts"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Kunde inte hämta angivet certifikat"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "En utökning skickades som inte stöds"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "Servernamnet som skickades kändes inte igen"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "SRP/PSK-användarnamn saknas eller är inte känt"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Förhandling för inre program misslyckades"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Validering av inre program misslyckades"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tBegränsning för sökvägslängd: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tPolicyspråk: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -673,7 +697,7 @@ msgstr ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -681,132 +705,132 @@ msgstr ""
 "\n"
 "\t\t\t\tHexdump: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tDigital signatur.\n"
 
 # Klassisk term inom digitala certifikat.
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tOförnekbarhet.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tNyckelkryptering.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tDatakryptering.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tNyckelförhandling.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tCertifikatsignering.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tCRL-signering.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tEndast nyckelkryptering.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tEndast nyckeldekryptering.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "varning: distributionPoint innehåller en inbäddad NUL, ersätter med \"!\"\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tTLS WWW-server.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tTLS WWW-klient.\n"
 
 # Källkodssignering?
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tKodsignering.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tE-postskydd.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tTidsstämpling.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tOCSP-signering.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIpsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tValfritt syfte.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tCertifikatutfärdare (CA): FALSKT\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tCertifikatutfärdare (CA): SANT\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, 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"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "varning: altname innehåller en inbäddad NUL, ersätter med \"!\"\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tXMPP-adress: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\totherName OID: %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\totherName DER: "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -815,175 +839,190 @@ msgstr ""
 "\n"
 "%s\t\t\totherName ASCII: "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tTillägg:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tAllmänna begränsningar (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "kritisk"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "ej kritisk"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tInnehavarens nyckelidentifierare (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tUtfärdarens nyckelidentifierare (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tNyckelanvändning (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tNyckelsyfte (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tInnehavarens alternativa namn (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tUtfärdarens alternativa namn (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tCRL-distributionspunkter (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\tInformation om proxycertifikat (%s):\n"
 
-#: x509/output.c:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tOkänt tillägg %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tHexdump: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tVersion: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tSerienummer (hex): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tUtfärdare: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tGiltighet:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tInte före: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tInte efter: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tInnehavare: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "okänd"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tAlgoritm för innehavarens publika nyckel: %s\n"
 
-#: x509/output.c:1163
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tSäkerhetsnivå för certifikat: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tSäkerhetsnivå för certifikat: %s (%d bitar)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tModulus (bitar %d):\n"
 
-#: x509/output.c:1182
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tExponent (bitar %d):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tKurva:\t%s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tPublik nyckel (bitar %d):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tSignaturalgoritm: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 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"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tSignatur:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -991,7 +1030,7 @@ msgstr ""
 "\tMD5-fingeravtryck:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -999,7 +1038,7 @@ msgstr ""
 "\tSHA-1-fingeravtryck:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1007,198 +1046,198 @@ msgstr ""
 "\tPublik nyckel-identitet:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "signerat med %s (trasig!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "signerat med %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "Information om X.509-certifikat:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Övrig information:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tVersion: 1 (standard)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tUppdateringsdatum:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tUtfärdat: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tNästa den: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tTillägg:\n"
 
 # Nummer? Antal?
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tCRL-nummer (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tUtfärdarens nyckelidentifierare (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tOkänt tillägg %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tHexdump: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tSpärrade certifikat (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tInga spärrade certifikat.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tSerienummer (hex): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tSpärrat den: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Information om spärrlista för X.509-certifikat:\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tExponent:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tAttribut:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tMotsvarslösenord: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tOkänt attribut %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
 msgstr "Information om begäran av PKCS #10-certifikat:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tNyckelanvändning:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "fel: get_key_usage: %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tDigitala signaturer.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tKommunikationskryptering.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tKryptering för datalagring.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tAutentisering.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tCertifikatsignering.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tIdentitet (hex): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tFingeravtryck (hex): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tSpärrat: Sant\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tSpärrat: Falskt\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tTidsstämplar:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tSkapat den: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tUtgångsdatum: Aldrig\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tUtgångsdatum: %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tAlgoritm för publik nyckel: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tSäkerhetsnivå för nyckel: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tNamn[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tSpärrat namn[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1207,48 +1246,60 @@ msgstr ""
 "\n"
 "\tUndernyckel[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "namn[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "spärrat namn[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "fingeravtryck: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "skapat: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "går aldrig ut, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "går ut: %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "nyckelalgoritm %s (%d bitar)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "okänd nyckelalgoritm (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Information om OpenPGP-certifikat:\n"
 
+#~ msgid "The initialization of LZO has failed."
+#~ msgstr "Initiering av LZO misslyckades."
+
+#~ 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()."
+
+#~ msgid "Inner application negotiation failed"
+#~ msgstr "Förhandling för inre program misslyckades"
+
+#~ msgid "Inner application verification failed"
+#~ msgstr "Validering av inre program misslyckades"
+
 #~ msgid "The specified GnuPG TrustDB version is not supported. TrustDB v4 is supported."
 #~ msgstr "Den angivna GnuPG TrustDB-versionen stöds inte. TrustDB v4 stöds."
 
diff --git a/po/uk.po.in b/po/uk.po.in
index c8d9745a9d..14f88e034a 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -6,10 +6,10 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgnutls 2.12.7\n"
+"Project-Id-Version: libgnutls 3.0.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 21:08+0200\n"
-"PO-Revision-Date: 2011-07-13 12:56+0300\n"
+"POT-Creation-Date: 2011-07-29 21:37+0200\n"
+"PO-Revision-Date: 2011-08-03 10:05+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -19,653 +19,677 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnutls_errors.c:54
+#: lib/gnutls_errors.c:52
 msgid "Success."
 msgstr "Успіх."
 
-#: gnutls_errors.c:55
+#: lib/gnutls_errors.c:53
 msgid "Could not negotiate a supported cipher suite."
 msgstr "Не вдалося узгодити підтримуваний комплекс шифрування."
 
-#: gnutls_errors.c:57
+#: lib/gnutls_errors.c:55
 msgid "The cipher type is unsupported."
 msgstr "Тип шифрування не підтримується."
 
-#: gnutls_errors.c:59
+#: lib/gnutls_errors.c:57
 msgid "The certificate and the given key do not match."
 msgstr "Сертифікат і вказаний ключ не відповідають один одному."
 
-#: gnutls_errors.c:61
+#: lib/gnutls_errors.c:59
 msgid "Could not negotiate a supported compression method."
 msgstr "Не вдалося узгодити підтримуваний спосіб стискання."
 
-#: gnutls_errors.c:63
+#: lib/gnutls_errors.c:61
 msgid "An unknown public key algorithm was encountered."
 msgstr "Виявлено невідомий алгоритм роботи з відкритим ключем."
 
-#: gnutls_errors.c:66
+#: lib/gnutls_errors.c:64
 msgid "An algorithm that is not enabled was negotiated."
 msgstr "Узгоджено алгоритм, який не було увімкнено."
 
-#: gnutls_errors.c:68
+#: lib/gnutls_errors.c:66
 msgid "A large TLS record packet was received."
 msgstr "Отримано великий пакет записів TLS."
 
-#: gnutls_errors.c:70
+#: lib/gnutls_errors.c:68
 msgid "A record packet with illegal version was received."
 msgstr "Отримано пакет записів з некоректною версією."
 
-#: gnutls_errors.c:73
+#: lib/gnutls_errors.c:71
 msgid "The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."
 msgstr "Надіслане сервером просте число Діффі-Гелмана є неприйнятним (занадто коротким)."
 
-#: gnutls_errors.c:75
+#: lib/gnutls_errors.c:73
 msgid "A TLS packet with unexpected length was received."
 msgstr "Було отримано пакет TLS з неочікуваною довжиною."
 
-#: gnutls_errors.c:78
+#: lib/gnutls_errors.c:75
+msgid "The TLS connection was non-properly terminated."
+msgstr "З’єднання TLS було розірвано неналежним чином."
+
+#: lib/gnutls_errors.c:78
 msgid "The specified session has been invalidated for some reason."
 msgstr "Вказаний сеанс з якихось причин втратив чинність."
 
-#: gnutls_errors.c:81
+#: lib/gnutls_errors.c:81
 msgid "GnuTLS internal error."
 msgstr "Внутрішня помилка GnuTLS."
 
-#: gnutls_errors.c:82
+#: lib/gnutls_errors.c:82
 msgid "An illegal TLS extension was received."
 msgstr "Отримано некоректне розширення TLS."
 
-#: gnutls_errors.c:84
+#: lib/gnutls_errors.c:84
 msgid "A TLS fatal alert has been received."
 msgstr "Отримано критичне попередження TLS."
 
-#: gnutls_errors.c:86
+#: lib/gnutls_errors.c:86
 msgid "An unexpected TLS packet was received."
 msgstr "Було отримано неочікуваний пакет TLS"
 
-#: gnutls_errors.c:88
+#: lib/gnutls_errors.c:88
 msgid "A TLS warning alert has been received."
 msgstr "Отримано попередження TLS."
 
-#: gnutls_errors.c:91
+#: lib/gnutls_errors.c:91
 msgid "An error was encountered at the TLS Finished packet calculation."
 msgstr "Під час спроби обчислення остаточного пакета TLS сталася помилка."
 
-#: gnutls_errors.c:93
+#: lib/gnutls_errors.c:93
 msgid "The peer did not send any certificate."
 msgstr "Вузлом не було надіслано жодного сертифіката."
 
-#: gnutls_errors.c:95
+#: lib/gnutls_errors.c:95
 msgid "The given DSA key is incompatible with the selected TLS protocol."
 msgstr "Вказаний ключ DSA key є несумісним з вибраним протоколом TLS."
 
-#: gnutls_errors.c:98
+#: lib/gnutls_errors.c:98
 msgid "There is already a crypto algorithm with lower priority."
 msgstr "Алгоритм шифрування з нижчим пріоритетом вже існує."
 
-#: gnutls_errors.c:101
+#: lib/gnutls_errors.c:101
 msgid "No temporary RSA parameters were found."
 msgstr "Не було виявлено тимчасових параметрів RSA."
 
-#: gnutls_errors.c:103
+#: lib/gnutls_errors.c:103
 msgid "No temporary DH parameters were found."
 msgstr "Не було виявлено тимчасових параметрів DH."
 
-#: gnutls_errors.c:105
+#: lib/gnutls_errors.c:105
 msgid "An unexpected TLS handshake packet was received."
 msgstr "Було отримано неочікуваний пакет даних підтвердження з’єднання TLS."
 
-#: gnutls_errors.c:107
+#: lib/gnutls_errors.c:107
 msgid "The scanning of a large integer has failed."
 msgstr "Спроба сканування великого цілого числа зазнала невдачі."
 
-#: gnutls_errors.c:109
+#: lib/gnutls_errors.c:109
 msgid "Could not export a large integer."
 msgstr "Не вдалося експортувати велике ціле число."
 
-#: gnutls_errors.c:111
+#: lib/gnutls_errors.c:111
 msgid "Decryption has failed."
 msgstr "Спроба розшифрування була невдалою."
 
-#: gnutls_errors.c:112
+#: lib/gnutls_errors.c:112
 msgid "Encryption has failed."
 msgstr "Спроба шифрування зазнала невдачі."
 
-#: gnutls_errors.c:113
+#: lib/gnutls_errors.c:113
 msgid "Public key decryption has failed."
 msgstr "Не вдалося дешифрувати відкритим ключем."
 
-#: gnutls_errors.c:115
+#: lib/gnutls_errors.c:115
 msgid "Public key encryption has failed."
 msgstr "Не вдалося зашифрувати відкритим ключем."
 
-#: gnutls_errors.c:117
+#: lib/gnutls_errors.c:117
 msgid "Public key signing has failed."
 msgstr "Не вдалося підписати відкритим ключем."
 
-#: gnutls_errors.c:119
+#: lib/gnutls_errors.c:119
 msgid "Public key signature verification has failed."
 msgstr "Не вдалося перевірити підпис відкритим ключем."
 
-#: gnutls_errors.c:121
+#: lib/gnutls_errors.c:121
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Не вдалося розпакувати пакет записів TLS."
 
-#: gnutls_errors.c:123
+#: lib/gnutls_errors.c:123
 msgid "Compression of the TLS record packet has failed."
 msgstr "Не вдалося запакувати пакет записів TLS."
 
-#: gnutls_errors.c:126
+#: lib/gnutls_errors.c:126
 msgid "Internal error in memory allocation."
 msgstr "Внутрішня помилка під час розподілу пам’яті."
 
-#: gnutls_errors.c:128
+#: lib/gnutls_errors.c:128
 msgid "An unimplemented or disabled feature has been requested."
 msgstr "Надійшов запит щодо нереалізованої або вимкненої можливості."
 
-#: gnutls_errors.c:130
+#: lib/gnutls_errors.c:130
 msgid "Insufficient credentials for that request."
 msgstr "Недостатні реєстраційні дані для цього запиту."
 
-#: gnutls_errors.c:132
+#: lib/gnutls_errors.c:132
 msgid "Error in password file."
 msgstr "Помилка у файлі паролів."
 
-#: gnutls_errors.c:133
+#: lib/gnutls_errors.c:133
 msgid "Wrong padding in PKCS1 packet."
 msgstr "Помилкове доповнення у пакеті PKCS1."
 
-#: gnutls_errors.c:135
+#: lib/gnutls_errors.c:135
 msgid "The requested session has expired."
 msgstr "Строк дії запитаного сеансу завершено."
 
-#: gnutls_errors.c:136
+#: lib/gnutls_errors.c:136
 msgid "Hashing has failed."
 msgstr "Помилка хешування."
 
-#: gnutls_errors.c:137
+#: lib/gnutls_errors.c:137
 msgid "Base64 decoding error."
 msgstr "Помилка декодування даних Base64."
 
-#: gnutls_errors.c:139
+#: lib/gnutls_errors.c:139
 msgid "Base64 unexpected header error."
 msgstr "Неочікуваний заголовок даних Base64."
 
-#: gnutls_errors.c:142
+#: lib/gnutls_errors.c:142
 msgid "Base64 encoding error."
 msgstr "Помилка кодування даних Base64."
 
-#: gnutls_errors.c:144
+#: lib/gnutls_errors.c:144
 msgid "Parsing error in password file."
 msgstr "Помилка під час спроби обробки даних файла паролів."
 
-#: gnutls_errors.c:146
+#: lib/gnutls_errors.c:146
 msgid "The requested data were not available."
 msgstr "Запитані дані недоступні."
 
-#: gnutls_errors.c:148
+#: lib/gnutls_errors.c:148
 msgid "Error in the pull function."
 msgstr "Помилка у функції pull."
 
-#: gnutls_errors.c:149
+#: lib/gnutls_errors.c:149
 msgid "Error in the push function."
 msgstr "Помилка у функції push."
 
-#: gnutls_errors.c:151
+#: lib/gnutls_errors.c:151
 msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Досягнуто верхньої межі послідовності чисел пакета записів. Ого!"
 
-#: gnutls_errors.c:153
+#: lib/gnutls_errors.c:153
 msgid "Error in the certificate."
 msgstr "Помилка у сертифікаті."
 
-#: gnutls_errors.c:155
+#: lib/gnutls_errors.c:155
 msgid "Unknown Subject Alternative name in X.509 certificate."
 msgstr "Невідомий запис альтернативного призначення (Subject Alternative) у сертифікаті X.509."
 
-#: gnutls_errors.c:158
+#: lib/gnutls_errors.c:158
 msgid "Unsupported critical extension in X.509 certificate."
 msgstr "Непідтримуване важливе розширення у сертифікаті X.509."
 
-#: gnutls_errors.c:160
+#: lib/gnutls_errors.c:160
 msgid "Key usage violation in certificate has been detected."
 msgstr "Виявлено порушення правил використання ключів сертифіката."
 
-#: gnutls_errors.c:162
+#: lib/gnutls_errors.c:162
 msgid "Resource temporarily unavailable, try again."
 msgstr "Ресурс тимчасово недоступний, повторіть спробу."
 
-#: gnutls_errors.c:164
+#: lib/gnutls_errors.c:164
 msgid "Function was interrupted."
 msgstr "Роботу функції було перервано."
 
-#: gnutls_errors.c:165
+#: lib/gnutls_errors.c:165
 msgid "Rehandshake was requested by the peer."
 msgstr "Вузол надіслав запит на повторне надсилання даних підтвердження з’єднання."
 
-#: gnutls_errors.c:168
+#: lib/gnutls_errors.c:168
 msgid "TLS Application data were received, while expecting handshake data."
 msgstr "Було отримано дані застосування TLS, слід було отримати дані підтвердження з’єднання."
 
-#: gnutls_errors.c:170
+#: lib/gnutls_errors.c:170
 msgid "Error in Database backend."
 msgstr "Помилка у сервері бази даних."
 
-#: gnutls_errors.c:171
+#: lib/gnutls_errors.c:171
 msgid "The certificate type is not supported."
 msgstr "Підтримки сертифікатів такого типу не передбачено."
 
-#: gnutls_errors.c:173
+#: lib/gnutls_errors.c:173
 msgid "The given memory buffer is too short to hold parameters."
 msgstr "Вказаний буфер пам’яті є занадто малим для зберігання параметрів."
 
-#: gnutls_errors.c:175
+#: lib/gnutls_errors.c:175
 msgid "The request is invalid."
 msgstr "Некоректний запит."
 
-#: gnutls_errors.c:176
+#: lib/gnutls_errors.c:176
+msgid "The cookie was bad."
+msgstr "Помилкова кука."
+
+#: lib/gnutls_errors.c:177
 msgid "An illegal parameter has been received."
 msgstr "Отримано некоректний параметр."
 
-#: gnutls_errors.c:178
+#: lib/gnutls_errors.c:179
 msgid "Error while reading file."
 msgstr "Помилка читання файла."
 
-#: gnutls_errors.c:180
+#: lib/gnutls_errors.c:181
 msgid "ASN1 parser: Element was not found."
 msgstr "Обробка ASN1: елемент не знайдено."
 
-#: gnutls_errors.c:182
+#: lib/gnutls_errors.c:183
 msgid "ASN1 parser: Identifier was not found"
 msgstr "Обробка ASN1: ідентифікатор не знайдено"
 
-#: gnutls_errors.c:184
+#: lib/gnutls_errors.c:185
 msgid "ASN1 parser: Error in DER parsing."
 msgstr "Обробка ASN1: помилка під час обробки DER."
 
-#: gnutls_errors.c:186
+#: lib/gnutls_errors.c:187
 msgid "ASN1 parser: Value was not found."
 msgstr "Обробка ASN1: значення не знайдено."
 
-#: gnutls_errors.c:188
+#: lib/gnutls_errors.c:189
 msgid "ASN1 parser: Generic parsing error."
 msgstr "Обробка ASN1: загальна помилка обробки."
 
-#: gnutls_errors.c:190
+#: lib/gnutls_errors.c:191
 msgid "ASN1 parser: Value is not valid."
 msgstr "Обробка ASN1: некоректне значення."
 
-#: gnutls_errors.c:192
+#: lib/gnutls_errors.c:193
 msgid "ASN1 parser: Error in TAG."
 msgstr "Обробка ASN1: помилка у тезі (TAG)."
 
-#: gnutls_errors.c:193
+#: lib/gnutls_errors.c:194
 msgid "ASN1 parser: error in implicit tag"
 msgstr "Обробка ASN1: помилка у неявному тезі"
 
-#: gnutls_errors.c:195
+#: lib/gnutls_errors.c:196
 msgid "ASN1 parser: Error in type 'ANY'."
 msgstr "Обробка ASN1: помилка у типі 'ANY'."
 
-#: gnutls_errors.c:197
+#: lib/gnutls_errors.c:198
 msgid "ASN1 parser: Syntax error."
 msgstr "Обробка ASN1: синтаксична помилка."
 
-#: gnutls_errors.c:199
+#: lib/gnutls_errors.c:200
 msgid "ASN1 parser: Overflow in DER parsing."
 msgstr "Обробка ASN1: переповнення під час обробки DER."
 
-#: gnutls_errors.c:202
+#: lib/gnutls_errors.c:203
 msgid "Too many empty record packets have been received."
 msgstr "Було отримано занадто багато порожніх пакетів записів."
 
-#: gnutls_errors.c:204
+#: lib/gnutls_errors.c:205
+msgid "Too many handshake packets have been received."
+msgstr "Було отримано занадто багато пакетів встановлення з’єднання."
+
+#: lib/gnutls_errors.c:207
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Не вдалося ініціалізувати GnuTLS-extra."
 
-#: gnutls_errors.c:207
+#: lib/gnutls_errors.c:210
 msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Версія бібліотеки GnuTLS є невідповідною до версії бібліотеки GnuTLS-extra."
 
-#: gnutls_errors.c:209
-msgid "The gcrypt library version is too old."
-msgstr "У вас встановлено занадто стару версію бібліотеки gcrypt."
+#: lib/gnutls_errors.c:212
+msgid "The crypto library version is too old."
+msgstr "Бібліотека шифрування є занадто старою."
 
-#: gnutls_errors.c:212
+#: lib/gnutls_errors.c:215
 msgid "The tasn1 library version is too old."
 msgstr "У вас встановлено занадто стару версію бібліотеки tasn1."
 
-#: gnutls_errors.c:214
+#: lib/gnutls_errors.c:217
 msgid "The OpenPGP User ID is revoked."
 msgstr "Ідентифікатор користувача OpenPGP відкликано."
 
-#: gnutls_errors.c:216
+#: lib/gnutls_errors.c:219
 msgid "The OpenPGP key has not a preferred key set."
 msgstr "Ключ OpenPGP не пов’язано з основним набором ключів."
 
-#: gnutls_errors.c:218
+#: lib/gnutls_errors.c:221
 msgid "Error loading the keyring."
 msgstr "Помилка під час спроби завантаження даних сховища ключів."
 
-#: gnutls_errors.c:220
+#: lib/gnutls_errors.c:223
 msgid "The initialization of crypto backend has failed."
 msgstr "Не вдалося ініціалізувати сервер шифрування."
 
-#: gnutls_errors.c:222
-msgid "The initialization of LZO has failed."
-msgstr "Не вдалося ініціалізувати LZO."
-
-#: gnutls_errors.c:224
+#: lib/gnutls_errors.c:225
 msgid "No supported compression algorithms have been found."
 msgstr "Не виявлено підтримуваних алгоритмів стискання."
 
-#: gnutls_errors.c:226
+#: lib/gnutls_errors.c:227
 msgid "No supported cipher suites have been found."
 msgstr "Не виявлено підтримуваних комплексів програм для шифрування."
 
-#: gnutls_errors.c:228
+#: lib/gnutls_errors.c:229
 msgid "Could not get OpenPGP key."
 msgstr "Не вдалося отримати ключ OpenPGP."
 
-#: gnutls_errors.c:230
+#: lib/gnutls_errors.c:231
 msgid "Could not find OpenPGP subkey."
 msgstr "Не вдалося знайти підключ OpenPGP."
 
-#: gnutls_errors.c:232
+#: lib/gnutls_errors.c:233
 msgid "Safe renegotiation failed."
 msgstr "Спроба захищеного повторного узгодження зазнала невдачі."
 
-#: gnutls_errors.c:234
+#: lib/gnutls_errors.c:235
 msgid "Unsafe renegotiation denied."
 msgstr "Незахищене повторне узгодження заборонено."
 
-#: gnutls_errors.c:237
+#: lib/gnutls_errors.c:238
 msgid "The SRP username supplied is illegal."
 msgstr "Вказане ім’я користувача SRP є некоректним."
 
-#: gnutls_errors.c:239
+#: lib/gnutls_errors.c:240
 msgid "The SRP username supplied is unknown."
 msgstr "Вказане ім’я користувача SRP є невідомим."
 
-#: gnutls_errors.c:242
+#: lib/gnutls_errors.c:243
 msgid "The OpenPGP fingerprint is not supported."
 msgstr "Підтримки такого відбитка OpenPGP не передбачено."
 
-#: gnutls_errors.c:244
+#: lib/gnutls_errors.c:245
 msgid "The signature algorithm is not supported."
 msgstr "Підтримки цього алгоритму підписування не передбачено."
 
-#: gnutls_errors.c:246
+#: lib/gnutls_errors.c:247
 msgid "The certificate has unsupported attributes."
 msgstr "Цей сертифікат має непідтримувані атрибути."
 
-#: gnutls_errors.c:248
+#: lib/gnutls_errors.c:249
 msgid "The OID is not supported."
 msgstr "Підтримки цього OID не передбачено."
 
-#: gnutls_errors.c:250
+#: lib/gnutls_errors.c:251
 msgid "The hash algorithm is unknown."
 msgstr "Невідомий алгоритм хешування."
 
-#: gnutls_errors.c:252
+#: lib/gnutls_errors.c:253
 msgid "The PKCS structure's content type is unknown."
 msgstr "Невідомий тип вмісту структури PKCS."
 
-#: gnutls_errors.c:254
+#: lib/gnutls_errors.c:255
 msgid "The PKCS structure's bag type is unknown."
 msgstr "Невідомий тип мультимножини структури PKCS."
 
-#: gnutls_errors.c:256
+#: lib/gnutls_errors.c:257
 msgid "The given password contains invalid characters."
 msgstr "У вказаному паролі містяться некоректні символи."
 
-#: gnutls_errors.c:258
+#: lib/gnutls_errors.c:259
 msgid "The Message Authentication Code verification failed."
 msgstr "Спроба перевірки коду розпізнавання повідомлення була невдалою."
 
-#: gnutls_errors.c:260
+#: lib/gnutls_errors.c:261
 msgid "Some constraint limits were reached."
 msgstr "Досягнуто деяких граничних обмежень."
 
-#: gnutls_errors.c:262
+#: lib/gnutls_errors.c:263
 msgid "Failed to acquire random data."
 msgstr "Не вдалося отримати випадкові дані."
 
-#: gnutls_errors.c:265
+#: lib/gnutls_errors.c:266
 msgid "Received a TLS/IA Intermediate Phase Finished message"
 msgstr "Отримано повідомлення щодо завершення проміжної фази TLS/IA"
 
-#: gnutls_errors.c:267
+#: lib/gnutls_errors.c:268
 msgid "Received a TLS/IA Final Phase Finished message"
 msgstr "Отримано повідомлення щодо завершення остаточної фази TLS/IA"
 
-#: gnutls_errors.c:269
+#: lib/gnutls_errors.c:270
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Помилка під час перевірки контрольної суми фази TLS/IA"
 
-#: gnutls_errors.c:272
+#: lib/gnutls_errors.c:273
 msgid "The specified algorithm or protocol is unknown."
 msgstr "Вказано невідомий алгоритм або протокол."
 
-#: gnutls_errors.c:275
-msgid "The handshake data size is too large (DoS?), check gnutls_handshake_set_max_packet_length()."
-msgstr "Розмір даних встановлення з’єднання є занадто великим (спроба атаки?), перевірте значення gnutls_handshake_set_max_packet_length()."
+#: lib/gnutls_errors.c:276
+msgid "The handshake data size is too large."
+msgstr "Розмір даних щодо встановлення з’єднання є занадто великим."
 
-#: gnutls_errors.c:279
+#: lib/gnutls_errors.c:279
 msgid "Error opening /dev/crypto"
 msgstr "Не вдалося відкрити /dev/crypto"
 
-#: gnutls_errors.c:282
+#: lib/gnutls_errors.c:282
 msgid "Error interfacing with /dev/crypto"
 msgstr "Не вдалося розпочати взаємодію з /dev/crypto"
 
-#: gnutls_errors.c:285
+#: lib/gnutls_errors.c:285
 msgid "Channel binding data not available"
 msgstr "Дані прив’язки каналів недоступні"
 
-#: gnutls_errors.c:288
+#: lib/gnutls_errors.c:288
 msgid "PKCS #11 error."
 msgstr "Помилка PKCS #11."
 
-#: gnutls_errors.c:290
+#: lib/gnutls_errors.c:290
 msgid "PKCS #11 initialization error."
 msgstr "Помилка ініціалізації PKCS #11."
 
-#: gnutls_errors.c:292
+#: lib/gnutls_errors.c:292
 msgid "Error in parsing."
 msgstr "Помилка під час обробки."
 
-#: gnutls_errors.c:294
+#: lib/gnutls_errors.c:294
 msgid "PKCS #11 error in PIN."
 msgstr "Помилка у пін-коді PKCS #11."
 
-#: gnutls_errors.c:296
+#: lib/gnutls_errors.c:296
 msgid "PKCS #11 PIN should be saved."
 msgstr "Пін-код PKCS #11 має бути збережено."
 
-#: gnutls_errors.c:298
+#: lib/gnutls_errors.c:298
 msgid "PKCS #11 error in slot"
 msgstr "Помилка у слоті PKCS #11"
 
-#: gnutls_errors.c:300
+#: lib/gnutls_errors.c:300
 msgid "Thread locking error"
 msgstr "Помилка блокування потоку виконання"
 
-#: gnutls_errors.c:302
+#: lib/gnutls_errors.c:302
 msgid "PKCS #11 error in attribute"
 msgstr "Помилка у атрибуті PKCS #11"
 
-#: gnutls_errors.c:304
+#: lib/gnutls_errors.c:304
 msgid "PKCS #11 error in device"
 msgstr "Помилка у пристрої PKCS #11"
 
-#: gnutls_errors.c:306
+#: lib/gnutls_errors.c:306
 msgid "PKCS #11 error in data"
 msgstr "Помилка у даних PKCS #11"
 
-#: gnutls_errors.c:308
+#: lib/gnutls_errors.c:308
 msgid "PKCS #11 unsupported feature"
 msgstr "Непідтримувана можливість PKCS #11"
 
-#: gnutls_errors.c:310
+#: lib/gnutls_errors.c:310
 msgid "PKCS #11 error in key"
 msgstr "Помилка у ключі PKCS #11"
 
-#: gnutls_errors.c:312
+#: lib/gnutls_errors.c:312
 msgid "PKCS #11 PIN expired"
 msgstr "Пін-код PKCS #11 втратив чинність"
 
-#: gnutls_errors.c:314
+#: lib/gnutls_errors.c:314
 msgid "PKCS #11 PIN locked"
 msgstr "Пін-код PKCS #11 заблоковано"
 
-#: gnutls_errors.c:316
+#: lib/gnutls_errors.c:316
 msgid "PKCS #11 error in session"
 msgstr "Помилка у сеансі PKCS #11"
 
-#: gnutls_errors.c:318
+#: lib/gnutls_errors.c:318
 msgid "PKCS #11 error in signature"
 msgstr "Помилка у підписі PKCS #11"
 
-#: gnutls_errors.c:320
+#: lib/gnutls_errors.c:320
 msgid "PKCS #11 error in token"
 msgstr "Помилка у лексемі PKCS #11"
 
-#: gnutls_errors.c:322
+#: lib/gnutls_errors.c:322
 msgid "PKCS #11 user error"
 msgstr "Помилка користувача PKCS #11"
 
-#: gnutls_errors.c:409
+#: lib/gnutls_errors.c:324
+msgid "The operation timed out"
+msgstr "Перевищено час очікування завершення дії"
+
+#: lib/gnutls_errors.c:326
+msgid "The operation was cancelled due to user error"
+msgstr "Дію було скасовано через помилку користувача"
+
+#: lib/gnutls_errors.c:328
+msgid "No supported ECC curves were found"
+msgstr "Не виявлено підтримуваних кривих ECC"
+
+#: lib/gnutls_errors.c:330
+msgid "The curve is unsupported"
+msgstr "Підтримки цієї кривої не передбачено"
+
+#: lib/gnutls_errors.c:332
+msgid "The requested PKCS #11 object is not available"
+msgstr "Запитаний об’єкт PKCS #11 недоступний"
+
+#: lib/gnutls_errors.c:419
 msgid "(unknown error code)"
 msgstr "(невідомий код помилки)"
 
-#: gnutls_alert.c:43
+#: lib/gnutls_alert.c:45
 msgid "Close notify"
 msgstr "Закрити сповіщення"
 
-#: gnutls_alert.c:44
+#: lib/gnutls_alert.c:46
 msgid "Unexpected message"
 msgstr "Неочікуване повідомлення"
 
-#: gnutls_alert.c:45
+#: lib/gnutls_alert.c:47
 msgid "Bad record MAC"
 msgstr "Помилковий запис MAC"
 
-#: gnutls_alert.c:46
+#: lib/gnutls_alert.c:48
 msgid "Decryption failed"
 msgstr "Спроба розшифрування зазнала невдачі"
 
-#: gnutls_alert.c:47
+#: lib/gnutls_alert.c:49
 msgid "Record overflow"
 msgstr "Переповнення запису"
 
-#: gnutls_alert.c:48
+#: lib/gnutls_alert.c:50
 msgid "Decompression failed"
 msgstr "Помилка під час спроби видобування"
 
-#: gnutls_alert.c:49
+#: lib/gnutls_alert.c:51
 msgid "Handshake failed"
 msgstr "Помилка під час спроби встановлення з’єднання"
 
-#: gnutls_alert.c:50
+#: lib/gnutls_alert.c:52
 msgid "Certificate is bad"
 msgstr "Помилковий сертифікат"
 
-#: gnutls_alert.c:51
+#: lib/gnutls_alert.c:53
 msgid "Certificate is not supported"
 msgstr "Підтримки сертифіката не передбачено"
 
-#: gnutls_alert.c:52
+#: lib/gnutls_alert.c:54
 msgid "Certificate was revoked"
 msgstr "Сертифікат відкликано"
 
-#: gnutls_alert.c:53
+#: lib/gnutls_alert.c:55
 msgid "Certificate is expired"
 msgstr "Сертифікат втратив чинність"
 
-#: gnutls_alert.c:54
+#: lib/gnutls_alert.c:56
 msgid "Unknown certificate"
 msgstr "Невідомий сертифікат"
 
-#: gnutls_alert.c:55
+#: lib/gnutls_alert.c:57
 msgid "Illegal parameter"
 msgstr "Некоректний параметр"
 
-#: gnutls_alert.c:56
+#: lib/gnutls_alert.c:58
 msgid "CA is unknown"
 msgstr "Невідома служба сертифікації (CA)"
 
-#: gnutls_alert.c:57
+#: lib/gnutls_alert.c:59
 msgid "Access was denied"
 msgstr "Доступ заборонено"
 
-#: gnutls_alert.c:58
+#: lib/gnutls_alert.c:60
 msgid "Decode error"
 msgstr "Помилка декодування"
 
-#: gnutls_alert.c:59
+#: lib/gnutls_alert.c:61
 msgid "Decrypt error"
 msgstr "Помилка дешифрування"
 
-#: gnutls_alert.c:60
+#: lib/gnutls_alert.c:62
 msgid "Export restriction"
 msgstr "Обмеження експортування"
 
-#: gnutls_alert.c:61
+#: lib/gnutls_alert.c:63
 msgid "Error in protocol version"
 msgstr "Помилка у версії протоколу"
 
-#: gnutls_alert.c:62
+#: lib/gnutls_alert.c:64
 msgid "Insufficient security"
 msgstr "Недостатній захист"
 
-#: gnutls_alert.c:63
+#: lib/gnutls_alert.c:65
 msgid "User canceled"
 msgstr "Скасовано користувачем"
 
-#: gnutls_alert.c:64
+#: lib/gnutls_alert.c:66
+msgid "No certificate (SSL 3.0)"
+msgstr "Немає сертифіката (SSL 3.0)"
+
+#: lib/gnutls_alert.c:67
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: gnutls_alert.c:65
+#: lib/gnutls_alert.c:68
 msgid "No renegotiation is allowed"
 msgstr "Повторне узгодження заборонено"
 
-#: gnutls_alert.c:67
+#: lib/gnutls_alert.c:70
 msgid "Could not retrieve the specified certificate"
 msgstr "Не вдалося отримати вказаний сертифікат"
 
-#: gnutls_alert.c:68
+#: lib/gnutls_alert.c:71
 msgid "An unsupported extension was sent"
 msgstr "Надіслано непідтримуване розширення"
 
-#: gnutls_alert.c:70
+#: lib/gnutls_alert.c:73
 msgid "The server name sent was not recognized"
 msgstr "Не вдалося розпізнати назву сервера"
 
-#: gnutls_alert.c:72
+#: lib/gnutls_alert.c:75
 msgid "The SRP/PSK username is missing or not known"
 msgstr "Не вказано імені користувача SRP/PSK або вказано невідоме ім’я"
 
-#: gnutls_alert.c:74
-msgid "Inner application negotiation failed"
-msgstr "Помилка під час спроби встановлення зв’язку з внутрішньою програмою"
-
-#: gnutls_alert.c:76
-msgid "Inner application verification failed"
-msgstr "Спроба перевірки внутрішньої програми зазнала невдачі"
-
-#: x509/output.c:157
+#: lib/x509/output.c:155
 #, c-format
 msgid "\t\t\tPath Length Constraint: %d\n"
 msgstr "\t\t\tОбмеження довжини шляху: %d\n"
 
-#: x509/output.c:158
+#: lib/x509/output.c:156
 #, c-format
 msgid "\t\t\tPolicy Language: %s"
 msgstr "\t\t\tМова правил: %s"
 
-#: x509/output.c:167
+#: lib/x509/output.c:165
 msgid ""
 "\t\t\tPolicy:\n"
 "\t\t\t\tASCII: "
@@ -673,7 +697,7 @@ msgstr ""
 "\t\t\tПравила:\n"
 "\t\t\t\tASCII: "
 
-#: x509/output.c:169
+#: lib/x509/output.c:167
 msgid ""
 "\n"
 "\t\t\t\tHexdump: "
@@ -681,130 +705,130 @@ msgstr ""
 "\n"
 "\t\t\t\tШіст. дамп: "
 
-#: x509/output.c:302
+#: lib/x509/output.c:300
 #, c-format
 msgid "%s\t\t\tDigital signature.\n"
 msgstr "%s\t\t\tЦифровий підпис.\n"
 
-#: x509/output.c:304
+#: lib/x509/output.c:302
 #, c-format
 msgid "%s\t\t\tNon repudiation.\n"
 msgstr "%s\t\t\tБез анулювання.\n"
 
-#: x509/output.c:306
+#: lib/x509/output.c:304
 #, c-format
 msgid "%s\t\t\tKey encipherment.\n"
 msgstr "%s\t\t\tШифрування ключа.\n"
 
-#: x509/output.c:308
+#: lib/x509/output.c:306
 #, c-format
 msgid "%s\t\t\tData encipherment.\n"
 msgstr "%s\t\t\tШифрування даних.\n"
 
-#: x509/output.c:310
+#: lib/x509/output.c:308
 #, c-format
 msgid "%s\t\t\tKey agreement.\n"
 msgstr "%s\t\t\tУзгодження ключів.\n"
 
-#: x509/output.c:312
+#: lib/x509/output.c:310
 #, c-format
 msgid "%s\t\t\tCertificate signing.\n"
 msgstr "%s\t\t\tПідписування сертифікатом.\n"
 
-#: x509/output.c:314
+#: lib/x509/output.c:312
 #, c-format
 msgid "%s\t\t\tCRL signing.\n"
 msgstr "%s\t\t\tПідписування CRL.\n"
 
-#: x509/output.c:316
+#: lib/x509/output.c:314
 #, c-format
 msgid "%s\t\t\tKey encipher only.\n"
 msgstr "%s\t\t\tЛише шифрування ключа.\n"
 
-#: x509/output.c:318
+#: lib/x509/output.c:316
 #, c-format
 msgid "%s\t\t\tKey decipher only.\n"
 msgstr "%s\t\t\tЛише розшифрування ключа.\n"
 
-#: x509/output.c:369
+#: lib/x509/output.c:367
 msgid "warning: distributionPoint contains an embedded NUL, replacing with '!'\n"
 msgstr "попередження: distributionPoint містить вбудоване порожнє значення, замінюємо на '!'\n"
 
-#: x509/output.c:462
+#: lib/x509/output.c:460
 #, c-format
 msgid "%s\t\t\tTLS WWW Server.\n"
 msgstr "%s\t\t\tІнтернет-сервер TLS.\n"
 
-#: x509/output.c:464
+#: lib/x509/output.c:462
 #, c-format
 msgid "%s\t\t\tTLS WWW Client.\n"
 msgstr "%s\t\t\tІнтернет-клієнт TLS.\n"
 
-#: x509/output.c:466
+#: lib/x509/output.c:464
 #, c-format
 msgid "%s\t\t\tCode signing.\n"
 msgstr "%s\t\t\tПідписування коду.\n"
 
-#: x509/output.c:468
+#: lib/x509/output.c:466
 #, c-format
 msgid "%s\t\t\tEmail protection.\n"
 msgstr "%s\t\t\tЗахист електронної пошти.\n"
 
-#: x509/output.c:470
+#: lib/x509/output.c:468
 #, c-format
 msgid "%s\t\t\tTime stamping.\n"
 msgstr "%s\t\t\tЧасова позначка.\n"
 
-#: x509/output.c:472
+#: lib/x509/output.c:470
 #, c-format
 msgid "%s\t\t\tOCSP signing.\n"
 msgstr "%s\t\t\tПідписування OCSP.\n"
 
-#: x509/output.c:474
+#: lib/x509/output.c:472
 #, c-format
 msgid "%s\t\t\tIpsec IKE.\n"
 msgstr "%s\t\t\tIpsec IKE.\n"
 
-#: x509/output.c:476
+#: lib/x509/output.c:474
 #, c-format
 msgid "%s\t\t\tAny purpose.\n"
 msgstr "%s\t\t\tДовільне призначення.\n"
 
-#: x509/output.c:509
+#: lib/x509/output.c:507
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): FALSE\n"
 msgstr "%s\t\t\tСлужба сертифікації (CA): НІ\n"
 
-#: x509/output.c:511
+#: lib/x509/output.c:509
 #, c-format
 msgid "%s\t\t\tCertificate Authority (CA): TRUE\n"
 msgstr "%s\t\t\tСлужба сертифікації (CA): ТАК\n"
 
-#: x509/output.c:514
+#: lib/x509/output.c:512
 #, c-format
 msgid "%s\t\t\tPath Length Constraint: %d\n"
 msgstr "%s\t\t\tОбмеження довжини шляху: %d\n"
 
-#: x509/output.c:588 x509/output.c:678
+#: lib/x509/output.c:586 lib/x509/output.c:676
 msgid "warning: altname contains an embedded NUL, replacing with '!'\n"
 msgstr "попередження: altname містить вбудоване порожнє значення, замінюємо на '!'\n"
 
-#: x509/output.c:684
+#: lib/x509/output.c:682
 #, c-format
 msgid "%s\t\t\tXMPP Address: %.*s\n"
 msgstr "%s\t\t\tАдреса XMPP: %.*s\n"
 
-#: x509/output.c:689
+#: lib/x509/output.c:687
 #, c-format
 msgid "%s\t\t\totherName OID: %.*s\n"
 msgstr "%s\t\t\tOID іншого імені: %.*s\n"
 
-#: x509/output.c:691
+#: lib/x509/output.c:689
 #, c-format
 msgid "%s\t\t\totherName DER: "
 msgstr "%s\t\t\tінше ім’я, DER: "
 
-#: x509/output.c:693
+#: lib/x509/output.c:691
 #, c-format
 msgid ""
 "\n"
@@ -813,175 +837,190 @@ msgstr ""
 "\n"
 "%s\t\t\tінше ім’я, ASCII: "
 
-#: x509/output.c:817
+#: lib/x509/output.c:815
 #, c-format
 msgid "%s\tExtensions:\n"
 msgstr "%s\tРозширення:\n"
 
-#: x509/output.c:827
+#: lib/x509/output.c:825
 #, c-format
 msgid "%s\t\tBasic Constraints (%s):\n"
 msgstr "%s\t\tОсновні обмеження (%s):\n"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "critical"
 msgstr "критична"
 
-#: x509/output.c:828 x509/output.c:843 x509/output.c:860 x509/output.c:876
-#: x509/output.c:891 x509/output.c:908 x509/output.c:923 x509/output.c:938
-#: x509/output.c:956 x509/output.c:969 x509/output.c:1696 x509/output.c:1719
-#: x509/output.c:1732
+#: lib/x509/output.c:826 lib/x509/output.c:841 lib/x509/output.c:858
+#: lib/x509/output.c:874 lib/x509/output.c:889 lib/x509/output.c:906
+#: lib/x509/output.c:921 lib/x509/output.c:936 lib/x509/output.c:954
+#: lib/x509/output.c:967 lib/x509/output.c:1735 lib/x509/output.c:1758
+#: lib/x509/output.c:1771
 msgid "not critical"
 msgstr "не критична"
 
-#: x509/output.c:842
+#: lib/x509/output.c:840
 #, c-format
 msgid "%s\t\tSubject Key Identifier (%s):\n"
 msgstr "%s\t\tІдентифікатор ключа призначення (%s):\n"
 
-#: x509/output.c:859
+#: lib/x509/output.c:857
 #, c-format
 msgid "%s\t\tAuthority Key Identifier (%s):\n"
 msgstr "%s\t\tІдентифікатор ключа служби (%s):\n"
 
-#: x509/output.c:875
+#: lib/x509/output.c:873
 #, c-format
 msgid "%s\t\tKey Usage (%s):\n"
 msgstr "%s\t\tВикористання ключа (%s):\n"
 
-#: x509/output.c:890
+#: lib/x509/output.c:888
 #, c-format
 msgid "%s\t\tKey Purpose (%s):\n"
 msgstr "%s\t\tПризначення ключа (%s):\n"
 
-#: x509/output.c:907
+#: lib/x509/output.c:905
 #, c-format
 msgid "%s\t\tSubject Alternative Name (%s):\n"
 msgstr "%s\t\tІнше ім’я (назва) призначення (%s):\n"
 
-#: x509/output.c:922
+#: lib/x509/output.c:920
 #, c-format
 msgid "%s\t\tIssuer Alternative Name (%s):\n"
 msgstr "%s\t\tІнше ім’я (назва) видавця (%s):\n"
 
-#: x509/output.c:937
+#: lib/x509/output.c:935
 #, c-format
 msgid "%s\t\tCRL Distribution points (%s):\n"
 msgstr "%s\t\tТочки розповсюдження CRL (%s):\n"
 
-#: x509/output.c:955
+#: lib/x509/output.c:953
 #, c-format
 msgid "%s\t\tProxy Certificate Information (%s):\n"
 msgstr "%s\t\tДані щодо проміжних сертифікатів (%s):\n"
 
-#: x509/output.c:968
+#: lib/x509/output.c:966
 #, c-format
 msgid "%s\t\tUnknown extension %s (%s):\n"
 msgstr "%s\t\tНевідоме розширення %s (%s):\n"
 
-#: x509/output.c:1015
+#: lib/x509/output.c:1013
 #, c-format
 msgid "%s\t\t\tASCII: "
 msgstr "%s\t\t\tASCII: "
 
-#: x509/output.c:1019
+#: lib/x509/output.c:1017
 #, c-format
 msgid "%s\t\t\tHexdump: "
 msgstr "%s\t\t\tШіст. дамп: "
 
-#: x509/output.c:1037 x509/output.c:1584 x509/output.c:1914
-#: openpgp/output.c:326
+#: lib/x509/output.c:1035 lib/x509/output.c:1623 lib/x509/output.c:1953
+#: lib/openpgp/output.c:324
 #, c-format
 msgid "\tVersion: %d\n"
 msgstr "\tВерсія: %d\n"
 
-#: x509/output.c:1051
+#: lib/x509/output.c:1049
 msgid "\tSerial Number (hex): "
 msgstr "\tСерійний номер (шіст.): "
 
-#: x509/output.c:1080 x509/output.c:1610
+#: lib/x509/output.c:1078 lib/x509/output.c:1649
 #, c-format
 msgid "\tIssuer: %s\n"
 msgstr "\tВидавець: %s\n"
 
-#: x509/output.c:1090
+#: lib/x509/output.c:1088
 msgid "\tValidity:\n"
 msgstr "\tЧинність:\n"
 
-#: x509/output.c:1103
+#: lib/x509/output.c:1101
 #, c-format
 msgid "\t\tNot Before: %s\n"
 msgstr "\t\tНе раніше: %s\n"
 
-#: x509/output.c:1117
+#: lib/x509/output.c:1115
 #, c-format
 msgid "\t\tNot After: %s\n"
 msgstr "\t\tНе пізніше: %s\n"
 
-#: x509/output.c:1142 x509/output.c:1938
+#: lib/x509/output.c:1140 lib/x509/output.c:1977
 #, c-format
 msgid "\tSubject: %s\n"
 msgstr "\tПризначення: %s\n"
 
-#: x509/output.c:1160 x509/output.c:1253 x509/output.c:1423 x509/output.c:1831
-#: x509/output.c:1956 openpgp/output.c:238
+#: lib/x509/output.c:1159 lib/x509/output.c:1292 lib/x509/output.c:1462
+#: lib/x509/output.c:1870 lib/x509/output.c:1995 lib/openpgp/output.c:236
 msgid "unknown"
 msgstr "невідомий"
 
-#: x509/output.c:1162 x509/output.c:1958
+#: lib/x509/output.c:1163 lib/x509/output.c:1997
 #, c-format
 msgid "\tSubject Public Key Algorithm: %s\n"
 msgstr "\tАлгоритм відкритого ключа призначення: %s\n"
 
-#: x509/output.c:1163
+#: lib/x509/output.c:1164
 #, c-format
-msgid "\tCertificate Security Level: %s\n"
-msgstr "\tРівень захисту сертифіката: %s\n"
+msgid "\tCertificate Security Level: %s (%d bits)\n"
+msgstr "\tРівень захисту сертифіката: %s (%d-бітовий)\n"
 
-#: x509/output.c:1180 x509/output.c:1971 openpgp/output.c:262
+#: lib/x509/output.c:1194 lib/x509/output.c:2010 lib/openpgp/output.c:260
 #, c-format
 msgid "\t\tModulus (bits %d):\n"
 msgstr "\t\tОснова (%d-бітова):\n"
 
-#: x509/output.c:1182
+#: lib/x509/output.c:1196
 #, c-format
 msgid "\t\tExponent (bits %d):\n"
 msgstr "\t\tПоказник (%d-бітовий):\n"
 
-#: x509/output.c:1202 x509/output.c:1993 openpgp/output.c:289
+#: lib/x509/output.c:1217
+#, c-format
+msgid "\t\tCurve:\t%s\n"
+msgstr "\t\tКрива:\t%s\n"
+
+#: lib/x509/output.c:1218
+msgid "\t\tX:\n"
+msgstr "\t\tX:\n"
+
+#: lib/x509/output.c:1220
+msgid "\t\tY:\n"
+msgstr "\t\tY:\n"
+
+#: lib/x509/output.c:1239 lib/x509/output.c:2032 lib/openpgp/output.c:287
 #, c-format
 msgid "\t\tPublic key (bits %d):\n"
 msgstr "\t\tВідкритий ключ (%d-бітовий):\n"
 
-#: x509/output.c:1204 x509/output.c:1995 openpgp/output.c:291
+#: lib/x509/output.c:1241 lib/x509/output.c:2034 lib/openpgp/output.c:289
 msgid "\t\tP:\n"
 msgstr "\t\tP:\n"
 
-#: x509/output.c:1206 x509/output.c:1997 openpgp/output.c:293
+#: lib/x509/output.c:1243 lib/x509/output.c:2036 lib/openpgp/output.c:291
 msgid "\t\tQ:\n"
 msgstr "\t\tQ:\n"
 
-#: x509/output.c:1208 x509/output.c:1999 openpgp/output.c:295
+#: lib/x509/output.c:1245 lib/x509/output.c:2038 lib/openpgp/output.c:293
 msgid "\t\tG:\n"
 msgstr "\t\tG:\n"
 
-#: x509/output.c:1254 x509/output.c:1832
+#: lib/x509/output.c:1293 lib/x509/output.c:1871
 #, c-format
 msgid "\tSignature Algorithm: %s\n"
 msgstr "\tАлгоритм підписування: %s\n"
 
-#: x509/output.c:1258 x509/output.c:1836
+#: lib/x509/output.c:1297 lib/x509/output.c:1875
 msgid "warning: signed using a broken signature algorithm that can be forged.\n"
 msgstr "попередження: signed використовує слабкий алгоритм підписування, який можна зламати.\n"
 
-#: x509/output.c:1285 x509/output.c:1863
+#: lib/x509/output.c:1324 lib/x509/output.c:1902
 msgid "\tSignature:\n"
 msgstr "\tПідпис:\n"
 
-#: x509/output.c:1308
+#: lib/x509/output.c:1347
 msgid ""
 "\tMD5 fingerprint:\n"
 "\t\t"
@@ -989,7 +1028,7 @@ msgstr ""
 "\tКонтрольна сума MD5:\n"
 "\t\t"
 
-#: x509/output.c:1310
+#: lib/x509/output.c:1349
 msgid ""
 "\tSHA-1 fingerprint:\n"
 "\t\t"
@@ -997,7 +1036,7 @@ msgstr ""
 "\tКонтрольна сума SHA-1:\n"
 "\t\t"
 
-#: x509/output.c:1329 x509/output.c:2175
+#: lib/x509/output.c:1368 lib/x509/output.c:2214
 msgid ""
 "\tPublic Key Id:\n"
 "\t\t"
@@ -1005,197 +1044,197 @@ msgstr ""
 "\tІдент. відкритого ключа:\n"
 "\t\t"
 
-#: x509/output.c:1425
+#: lib/x509/output.c:1464
 #, c-format
 msgid "signed using %s (broken!), "
 msgstr "підписано за допомогою %s (слабкий!), "
 
-#: x509/output.c:1427
+#: lib/x509/output.c:1466
 #, c-format
 msgid "signed using %s, "
 msgstr "підписано за допомогою %s, "
 
-#: x509/output.c:1540
+#: lib/x509/output.c:1579
 msgid "X.509 Certificate Information:\n"
 msgstr "Дані щодо сертифікації X.509:\n"
 
-#: x509/output.c:1544 x509/output.c:2212
+#: lib/x509/output.c:1583 lib/x509/output.c:2251
 msgid "Other Information:\n"
 msgstr "Інші дані:\n"
 
-#: x509/output.c:1580
+#: lib/x509/output.c:1619
 msgid "\tVersion: 1 (default)\n"
 msgstr "\tВерсія: 1 (типова)\n"
 
-#: x509/output.c:1620
+#: lib/x509/output.c:1659
 msgid "\tUpdate dates:\n"
 msgstr "\tДати оновлення:\n"
 
-#: x509/output.c:1633
+#: lib/x509/output.c:1672
 #, c-format
 msgid "\t\tIssued: %s\n"
 msgstr "\t\tВидано: %s\n"
 
-#: x509/output.c:1649
+#: lib/x509/output.c:1688
 #, c-format
 msgid "\t\tNext at: %s\n"
 msgstr "\t\tНаступна: %s\n"
 
-#: x509/output.c:1680
+#: lib/x509/output.c:1719
 msgid "\tExtensions:\n"
 msgstr "\tРозширення:\n"
 
-#: x509/output.c:1695
+#: lib/x509/output.c:1734
 #, c-format
 msgid "\t\tCRL Number (%s): "
 msgstr "\t\tНомер CRL (%s): "
 
-#: x509/output.c:1718
+#: lib/x509/output.c:1757
 #, c-format
 msgid "\t\tAuthority Key Identifier (%s):\n"
 msgstr "\t\tІдентифікатор ключа служби (%s):\n"
 
-#: x509/output.c:1731
+#: lib/x509/output.c:1770
 #, c-format
 msgid "\t\tUnknown extension %s (%s):\n"
 msgstr "\t\tНевідоме розширення %s (%s):\n"
 
-#: x509/output.c:1761 x509/output.c:2131
+#: lib/x509/output.c:1800 lib/x509/output.c:2170
 msgid "\t\t\tASCII: "
 msgstr "\t\t\tASCII: "
 
-#: x509/output.c:1765 x509/output.c:2135
+#: lib/x509/output.c:1804 lib/x509/output.c:2174
 msgid "\t\t\tHexdump: "
 msgstr "\t\t\tШіст. дамп: "
 
-#: x509/output.c:1781
+#: lib/x509/output.c:1820
 #, c-format
 msgid "\tRevoked certificates (%d):\n"
 msgstr "\tВідкликані сертифікати (%d):\n"
 
-#: x509/output.c:1783
+#: lib/x509/output.c:1822
 msgid "\tNo revoked certificates.\n"
 msgstr "\tНемає відкликаних сертифікатів.\n"
 
-#: x509/output.c:1802
+#: lib/x509/output.c:1841
 msgid "\t\tSerial Number (hex): "
 msgstr "\t\tСерійний номер (шіст.): "
 
-#: x509/output.c:1811
+#: lib/x509/output.c:1850
 #, c-format
 msgid "\t\tRevoked at: %s\n"
 msgstr "\t\tВідкликано: %s\n"
 
-#: x509/output.c:1894
+#: lib/x509/output.c:1933
 msgid "X.509 Certificate Revocation List Information:\n"
 msgstr "Дані щодо списку відкликань сертифікатів X.509:\n"
 
-#: x509/output.c:1973 openpgp/output.c:264
+#: lib/x509/output.c:2012 lib/openpgp/output.c:262
 msgid "\t\tExponent:\n"
 msgstr "\t\tПоказник:\n"
 
-#: x509/output.c:2040
+#: lib/x509/output.c:2079
 msgid "\tAttributes:\n"
 msgstr "\tАтрибути:\n"
 
-#: x509/output.c:2092
+#: lib/x509/output.c:2131
 #, c-format
 msgid "\t\tChallenge password: %s\n"
 msgstr "\t\tПароль виклику: %s\n"
 
-#: x509/output.c:2103
+#: lib/x509/output.c:2142
 #, c-format
 msgid "\t\tUnknown attribute %s:\n"
 msgstr "\t\tНевідомий атрибут %s:\n"
 
-#: x509/output.c:2208
+#: lib/x509/output.c:2247
 msgid "PKCS #10 Certificate Request Information:\n"
 msgstr "Дані щодо запиту сертифіката PKCS #10:\n"
 
-#: openpgp/output.c:85
+#: lib/openpgp/output.c:83
 msgid "\t\tKey Usage:\n"
 msgstr "\t\tВикористання ключа:\n"
 
-#: openpgp/output.c:94
+#: lib/openpgp/output.c:92
 #, c-format
 msgid "error: get_key_usage: %s\n"
 msgstr "помилка: get_key_usage: %s\n"
 
-#: openpgp/output.c:99
+#: lib/openpgp/output.c:97
 msgid "\t\t\tDigital signatures.\n"
 msgstr "\t\t\tЦифрові підписи.\n"
 
-#: openpgp/output.c:101
+#: lib/openpgp/output.c:99
 msgid "\t\t\tCommunications encipherment.\n"
 msgstr "\t\t\tШифрування обміну даними.\n"
 
-#: openpgp/output.c:103
+#: lib/openpgp/output.c:101
 msgid "\t\t\tStorage data encipherment.\n"
 msgstr "\t\t\tШифрування даних у сховищах.\n"
 
-#: openpgp/output.c:105
+#: lib/openpgp/output.c:103
 msgid "\t\t\tAuthentication.\n"
 msgstr "\t\t\tРозпізнавання.\n"
 
-#: openpgp/output.c:107
+#: lib/openpgp/output.c:105
 msgid "\t\t\tCertificate signing.\n"
 msgstr "\t\t\tПідписування сертифікатів.\n"
 
-#: openpgp/output.c:128
+#: lib/openpgp/output.c:126
 msgid "\tID (hex): "
 msgstr "\tІд. (шіст.): "
 
-#: openpgp/output.c:149
+#: lib/openpgp/output.c:147
 msgid "\tFingerprint (hex): "
 msgstr "\tВідбиток (шіст.): "
 
-#: openpgp/output.c:166
+#: lib/openpgp/output.c:164
 msgid "\tRevoked: True\n"
 msgstr "\tВідкликано: так\n"
 
-#: openpgp/output.c:168
+#: lib/openpgp/output.c:166
 msgid "\tRevoked: False\n"
 msgstr "\tВідкликано: ні\n"
 
-#: openpgp/output.c:176
+#: lib/openpgp/output.c:174
 msgid "\tTime stamps:\n"
 msgstr "\tЧасові позначки:\n"
 
-#: openpgp/output.c:193
+#: lib/openpgp/output.c:191
 #, c-format
 msgid "\t\tCreation: %s\n"
 msgstr "\t\tСтворення: %s\n"
 
-#: openpgp/output.c:207
+#: lib/openpgp/output.c:205
 msgid "\t\tExpiration: Never\n"
 msgstr "\t\tСтрок дії: не обмежено\n"
 
-#: openpgp/output.c:216
+#: lib/openpgp/output.c:214
 #, c-format
 msgid "\t\tExpiration: %s\n"
 msgstr "\t\tСтрок дії: до %s\n"
 
-#: openpgp/output.c:240
+#: lib/openpgp/output.c:238
 #, c-format
 msgid "\tPublic Key Algorithm: %s\n"
 msgstr "\tАлгоритм відкритого ключа: %s\n"
 
-#: openpgp/output.c:241
+#: lib/openpgp/output.c:239
 #, c-format
 msgid "\tKey Security Level: %s\n"
 msgstr "\tРівень захисту ключа: %s\n"
 
-#: openpgp/output.c:359
+#: lib/openpgp/output.c:357
 #, c-format
 msgid "\tName[%d]: %s\n"
 msgstr "\tІм’я[%d]: %s\n"
 
-#: openpgp/output.c:361
+#: lib/openpgp/output.c:359
 #, c-format
 msgid "\tRevoked Name[%d]: %s\n"
 msgstr "\tВідкликане ім’я[%d]: %s\n"
 
-#: openpgp/output.c:382
+#: lib/openpgp/output.c:380
 #, c-format
 msgid ""
 "\n"
@@ -1204,44 +1243,56 @@ msgstr ""
 "\n"
 "\tПідключ[%d]:\n"
 
-#: openpgp/output.c:422
+#: lib/openpgp/output.c:420
 #, c-format
 msgid "name[%d]: %s, "
 msgstr "ім’я[%d]: %s, "
 
-#: openpgp/output.c:424
+#: lib/openpgp/output.c:422
 #, c-format
 msgid "revoked name[%d]: %s, "
 msgstr "відкликане ім’я[%d]: %s, "
 
-#: openpgp/output.c:444
+#: lib/openpgp/output.c:442
 msgid "fingerprint: "
 msgstr "відбиток: "
 
-#: openpgp/output.c:464
+#: lib/openpgp/output.c:462
 #, c-format
 msgid "created: %s, "
 msgstr "створено: %s, "
 
-#: openpgp/output.c:474
+#: lib/openpgp/output.c:472
 msgid "never expires, "
 msgstr "строк дії не обмежено, "
 
-#: openpgp/output.c:482
+#: lib/openpgp/output.c:480
 #, c-format
 msgid "expires: %s, "
 msgstr "строк дії: до %s, "
 
-#: openpgp/output.c:494
+#: lib/openpgp/output.c:492
 #, c-format
 msgid "key algorithm %s (%d bits)"
 msgstr "алгоритм ключа %s (%d-бітовий)"
 
-#: openpgp/output.c:496
+#: lib/openpgp/output.c:494
 #, c-format
 msgid "unknown key algorithm (%d)"
 msgstr "невідомий алгоритм ключа (%d)"
 
-#: openpgp/output.c:529
+#: lib/openpgp/output.c:527
 msgid "OpenPGP Certificate Information:\n"
 msgstr "Дані щодо сертифіката OpenPGP:\n"
+
+#~ msgid "The initialization of LZO has failed."
+#~ msgstr "Не вдалося ініціалізувати LZO."
+
+#~ msgid "The handshake data size is too large (DoS?), check gnutls_handshake_set_max_packet_length()."
+#~ msgstr "Розмір даних встановлення з’єднання є занадто великим (спроба атаки?), перевірте значення gnutls_handshake_set_max_packet_length()."
+
+#~ msgid "Inner application negotiation failed"
+#~ msgstr "Помилка під час спроби встановлення зв’язку з внутрішньою програмою"
+
+#~ msgid "Inner application verification failed"
+#~ msgstr "Спроба перевірки внутрішньої програми зазнала невдачі"