diff --git a/lang/sk.po b/lang/sk.po
index bd0768fa..040745fe 100644
--- a/lang/sk.po
+++ b/lang/sk.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: X Certificate and Key management 2..6.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-16 18:14+0200\n"
-"PO-Revision-Date: 2024-08-24 12:21+0200\n"
+"PO-Revision-Date: 2024-10-01 14:52+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: slovenčina <linux@slavino.sk>\n"
 "Language: sk\n"
@@ -32,7 +32,7 @@ msgctxt "CaProperties|"
 msgid "Default template"
 msgstr "Predvolená šablóna"
 
-#: ../ui/CertDetail.ui:30 ../widgets/CertDetail.cpp:106
+#: ../widgets/CertDetail.cpp:139 ../ui/CertDetail.ui:30
 msgctxt "CertDetail|"
 msgid "Details of the Certificate"
 msgstr "Podrobnosti certifikátu"
@@ -112,93 +112,113 @@ msgctxt "CertDetail|"
 msgid "Validity"
 msgstr "Platnosť"
 
-#: ../ui/CertDetail.ui:287
+#: ../ui/CertDetail.ui:296
 msgctxt "CertDetail|"
 msgid "The time since the certificate is valid"
 msgstr "Čas odkedy je certifikát platný"
 
-#: ../ui/CertDetail.ui:294
+#: ../ui/CertDetail.ui:303
 msgctxt "CertDetail|"
 msgid "The time until the certificate is valid"
 msgstr "Čas dokedy je certifikát platný"
 
-#: ../ui/CertDetail.ui:328
+#: ../ui/CertDetail.ui:337
 msgctxt "CertDetail|"
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../ui/CertDetail.ui:341
+#: ../ui/CertDetail.ui:359
 msgctxt "CertDetail|"
 msgid "Issuer"
 msgstr "Vydavateľ"
 
-#: ../ui/CertDetail.ui:364
+#: ../ui/CertDetail.ui:391
 msgctxt "CertDetail|"
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: ../ui/CertDetail.ui:385
+#: ../ui/CertDetail.ui:412
+msgctxt "CertDetail|"
+msgid "Validation"
+msgstr "Overenie"
+
+#: ../ui/CertDetail.ui:418
+msgctxt "CertDetail|"
+msgid "Purposes"
+msgstr "Účely"
+
+#: ../ui/CertDetail.ui:430
+msgctxt "CertDetail|"
+msgid "Strict RFC 5280 validation"
+msgstr "Striktné overenie RFC 5280"
+
+#: ../ui/CertDetail.ui:443
 msgctxt "CertDetail|"
 msgid "Comment"
 msgstr "Komentár"
 
-#: ../ui/CertDetail.ui:354
+#: ../ui/CertDetail.ui:381
 msgctxt "CertDetail|"
 msgid "Attributes"
 msgstr "Atribúty"
 
-#: ../ui/CertDetail.ui:377 ../widgets/CertDetail.cpp:33
+#: ../widgets/CertDetail.cpp:35 ../ui/CertDetail.ui:404
 msgctxt "CertDetail|"
 msgid "Show config"
 msgstr "Zobraziť konfiguráciu"
 
-#: ../widgets/CertDetail.cpp:37
+#: ../widgets/CertDetail.cpp:39
 msgctxt "CertDetail|"
 msgid "Show extensions"
 msgstr "Zobraziť rozšírenia"
 
-#: ../widgets/CertDetail.cpp:60
+#: ../widgets/CertDetail.cpp:71
 msgctxt "CertDetail|"
 msgid "Show public key"
 msgstr "Zobraziť verejný kľúč"
 
-#: ../widgets/CertDetail.cpp:63
+#: ../widgets/CertDetail.cpp:74
 msgctxt "CertDetail|"
 msgid "This key is not in the database."
 msgstr "Tento kľúč nie je v databáze."
 
-#: ../widgets/CertDetail.cpp:67
+#: ../widgets/CertDetail.cpp:78
 msgctxt "CertDetail|"
 msgid "Not available"
 msgstr "Nedostupné"
 
-#: ../widgets/CertDetail.cpp:113
+#: ../widgets/CertDetail.cpp:127
+msgctxt "CertDetail|"
+msgid "No verification errors found."
+msgstr "Neboli nájdené žiadne chyby overenia."
+
+#: ../widgets/CertDetail.cpp:152
 msgctxt "CertDetail|"
 msgid "Signer unknown"
 msgstr "Neznámy podpis"
 
-#: ../widgets/CertDetail.cpp:117
+#: ../widgets/CertDetail.cpp:156
 msgctxt "CertDetail|"
 msgid "Self signed"
 msgstr "Sebou podpísaný"
 
-#: ../widgets/CertDetail.cpp:147
+#: ../widgets/CertDetail.cpp:186
 #, qt-format
 msgctxt "CertDetail|"
 msgid "Revoked at %1"
 msgstr "Odvolaný %1"
 
-#: ../widgets/CertDetail.cpp:152
+#: ../widgets/CertDetail.cpp:191
 msgctxt "CertDetail|"
 msgid "Not valid"
 msgstr "Neplatný"
 
-#: ../widgets/CertDetail.cpp:156
+#: ../widgets/CertDetail.cpp:195
 msgctxt "CertDetail|"
 msgid "Valid"
 msgstr "Platný"
 
-#: ../widgets/CertDetail.cpp:177
+#: ../widgets/CertDetail.cpp:216
 msgctxt "CertDetail|"
 msgid "Details of the certificate signing request"
 msgstr "Podrobnosti žiadosti o podpísanie certifikátu"
@@ -326,128 +346,133 @@ msgstr ""
 
 #: ../widgets/CertTreeView.cpp:34
 msgctxt "CertTreeView|"
+msgid "Hide unusable certificates"
+msgstr "Skryť nepoužiteľné certifikáty"
+
+#: ../widgets/CertTreeView.cpp:41
+msgctxt "CertTreeView|"
 msgid "Import PKCS#12"
 msgstr "Import PKCS#12"
 
-#: ../widgets/CertTreeView.cpp:35
+#: ../widgets/CertTreeView.cpp:42
 msgctxt "CertTreeView|"
 msgid "Import from PKCS#7"
 msgstr "Importovať z PKCS#7"
 
-#: ../widgets/CertTreeView.cpp:63
+#: ../widgets/CertTreeView.cpp:70
 msgctxt "CertTreeView|"
 msgid "Request"
 msgstr "Žiadosť"
 
-#: ../widgets/CertTreeView.cpp:65
+#: ../widgets/CertTreeView.cpp:72
 msgctxt "CertTreeView|"
 msgid "Security token"
 msgstr "Bezpečnostný token"
 
-#: ../widgets/CertTreeView.cpp:67
+#: ../widgets/CertTreeView.cpp:74
 msgctxt "CertTreeView|"
 msgid "Other token"
 msgstr "Iný token"
 
-#: ../widgets/CertTreeView.cpp:71
+#: ../widgets/CertTreeView.cpp:78
 msgctxt "CertTreeView|"
 msgid "Similar Certificate"
 msgstr "Podobný certifikát"
 
-#: ../widgets/CertTreeView.cpp:74
+#: ../widgets/CertTreeView.cpp:81
 msgctxt "CertTreeView|"
 msgid "Delete from Security token"
 msgstr "Odstrániť z Bezpečnostného tokenu"
 
-#: ../widgets/CertTreeView.cpp:77
+#: ../widgets/CertTreeView.cpp:84
 msgctxt "CertTreeView|"
 msgid "CA"
 msgstr "CA"
 
-#: ../widgets/CertTreeView.cpp:78
+#: ../widgets/CertTreeView.cpp:85
 msgctxt "CertTreeView|"
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../widgets/CertTreeView.cpp:79
+#: ../widgets/CertTreeView.cpp:86
 msgctxt "CertTreeView|"
 msgid "Generate CRL"
 msgstr "Generovať CRL"
 
-#: ../widgets/CertTreeView.cpp:80
+#: ../widgets/CertTreeView.cpp:87
 msgctxt "CertTreeView|"
 msgid "Manage revocations"
 msgstr "Spravovať odvolania"
 
-#: ../widgets/CertTreeView.cpp:84
+#: ../widgets/CertTreeView.cpp:91
 msgctxt "CertTreeView|"
 msgid "Import OpenVPN tls-auth key"
-msgstr "Importovať kľúč OpenVPN tls-auth"
+msgstr "Importovať OpenVPN tls-auth"
 
-#: ../widgets/CertTreeView.cpp:88 ../widgets/CertTreeView.cpp:91
+#: ../widgets/CertTreeView.cpp:95 ../widgets/CertTreeView.cpp:98
 msgctxt "CertTreeView|"
 msgid "Renewal"
 msgstr "Obnoviť"
 
-#: ../widgets/CertTreeView.cpp:93
+#: ../widgets/CertTreeView.cpp:100
 msgctxt "CertTreeView|"
 msgid "Revoke"
 msgstr "Odvolať"
 
-#: ../widgets/CertTreeView.cpp:95
+#: ../widgets/CertTreeView.cpp:102
 msgctxt "CertTreeView|"
 msgid "Unrevoke"
 msgstr "Zrušiť odvolanie"
 
-#: ../widgets/CertTreeView.cpp:175
+#: ../widgets/CertTreeView.cpp:182
 msgctxt "CertTreeView|"
 msgid "Plain View"
 msgstr "Prosté zobrazenie"
 
-#: ../widgets/CertTreeView.cpp:175
+#: ../widgets/CertTreeView.cpp:182
 msgctxt "CertTreeView|"
 msgid "Tree View"
 msgstr "Stromové zobrazenie"
 
-#: ../widgets/CertTreeView.cpp:204
+#: ../widgets/CertTreeView.cpp:211
 msgctxt "CertTreeView|"
 msgid "days"
 msgstr "dní"
 
-#: ../widgets/CertTreeView.cpp:212
+#: ../widgets/CertTreeView.cpp:219
 msgctxt "CertTreeView|"
 msgid "No template"
 msgstr "Bez šablóny"
 
-#: ../widgets/CertTreeView.cpp:217
+#: ../widgets/CertTreeView.cpp:224
 msgctxt "CertTreeView|"
 msgid "CA Properties"
 msgstr "Vlastnosti CA"
 
-#: ../widgets/CertTreeView.cpp:259
+#: ../widgets/CertTreeView.cpp:266
 msgctxt "CertTreeView|"
 msgid "Certificate export"
 msgstr "Export certifikátu"
 
-#: ../widgets/CertTreeView.cpp:260
+#: ../widgets/CertTreeView.cpp:267
 msgctxt "CertTreeView|"
 msgid "X509 Certificates ( *.pem *.cer *.crt *.p12 *.pfx *.p7b )"
 msgstr "Certifikáty X509 ( *.pem *.cer *.crt *.p12 *.pfx *.p7b )"
 
-#: ../widgets/CertTreeView.cpp:261
+#: ../widgets/CertTreeView.cpp:268
 msgctxt "CertTreeView|"
 msgid "vCalendar entry ( *.ics )"
 msgstr "Položka vCalendar ( *.ics )"
 
-#: ../widgets/CertTreeView.cpp:262
+#: ../widgets/CertTreeView.cpp:269
 msgctxt "CertTreeView|"
 msgid "OpenVPN file ( *.ovpn )"
 msgstr "Súbor OpenVPN ( *.ovpn )"
 
-#: ../widgets/CertTreeView.cpp:263
+#: ../widgets/CertTreeView.cpp:270
 msgctxt "CertTreeView|"
 msgid "OpenVPN tls-auth key ( *.key )"
-msgstr "Kľúč OpenVPN tls-auth ( *.key )"
+msgstr "OpenVPN tls-auth ( *.key )"
 
 #: ../widgets/clicklabel.cpp:37
 msgctxt "ClickLabel|"
@@ -564,57 +589,110 @@ msgctxt "CrlTreeView|"
 msgid "vCalendar entry ( *.ics )"
 msgstr "Položka vCalendar ( *.ics )"
 
-#: ../ui/ExportDialog.ui:75
+#: ../ui/ExportDialog.ui:76
 msgctxt "ExportDialog|"
 msgid "Name"
 msgstr "Názov"
 
-#: ../ui/ExportDialog.ui:82
+#: ../ui/ExportDialog.ui:83
 msgctxt "ExportDialog|"
 msgid "The internal name of the CRL in the database"
 msgstr "Interný názov CRL v databáze"
 
-#: ../ui/ExportDialog.ui:111
+#: ../ui/ExportDialog.ui:112
 msgctxt "ExportDialog|"
 msgid "..."
 msgstr "…"
 
-#: ../ui/ExportDialog.ui:95
+#: ../ui/ExportDialog.ui:96
 msgctxt "ExportDialog|"
 msgid "Filename"
 msgstr "Meno súboru"
 
-#: ../ui/ExportDialog.ui:164
+#: ../ui/ExportDialog.ui:127
+msgctxt "ExportDialog|"
+msgid "Each Item in a separate file"
+msgstr "Každá položka v samostatnom súbore"
+
+#: ../ui/ExportDialog.ui:134
+msgctxt "ExportDialog|"
+msgid "Same encryption password for all items"
+msgstr "Rovnaké heslo šifrovania pre všetky položky"
+
+#: ../ui/ExportDialog.ui:141
 msgctxt "ExportDialog|"
 msgid "Export comment into PEM file"
 msgstr "Exportovať komentáre do súboru PEM"
 
-#: ../ui/ExportDialog.ui:120
+#: ../ui/ExportDialog.ui:121
 msgctxt "ExportDialog|"
 msgid "Export Format"
 msgstr "Formát exportu"
 
-#: ../widgets/ExportDialog.cpp:48
+#: ../widgets/ExportDialog.cpp:43
+#, qt-format
+msgctxt "ExportDialog|"
+msgid "%n selected item(s)"
+msgid_plural "%n selected item(s)"
+msgstr[0] "%n zvolená položka"
+msgstr[1] "%n zvolené položky"
+msgstr[2] "%n zvolených položiek"
+
+#: ../widgets/ExportDialog.cpp:53
 msgctxt "ExportDialog|"
 msgid "All files ( * )"
 msgstr "Všetky súbory ( * )"
 
-#: ../widgets/ExportDialog.cpp:104
+#: ../widgets/ExportDialog.cpp:126
 #, qt-format
 msgctxt "ExportDialog|"
 msgid "The file: '%1' already exists!"
 msgstr "Súbor: „%1” už existuje!"
 
-#: ../widgets/ExportDialog.cpp:105
+#: ../widgets/ExportDialog.cpp:127
 msgctxt "ExportDialog|"
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: ../widgets/ExportDialog.cpp:106
+#: ../widgets/ExportDialog.cpp:128
 msgctxt "ExportDialog|"
 msgid "Do not overwrite"
 msgstr "Neprepísať"
 
+#: ../widgets/ExportDialog.cpp:132
+#, qt-format
+msgctxt "ExportDialog|"
+msgid "The path: '%1' exist, but is not a file"
+msgstr "Cesta: „%1” existuje, ale nie je to súbor"
+
+#: ../widgets/ExportDialog.cpp:145
+#, qt-format
+msgctxt "ExportDialog|"
+msgid "The path: '%1' exist, but is not a directory"
+msgstr "Cesta: „%1” existuje, ale nie je to adresár"
+
+#: ../widgets/ExportDialog.cpp:150
+#, qt-format
+msgctxt "ExportDialog|"
+msgid "The directory: '%1' does not exist. Should it be created?"
+msgstr "Adresár: „%1” neexistuje. Má byť vytvorený?"
+
+#: ../widgets/ExportDialog.cpp:152
+msgctxt "ExportDialog|"
+msgid "Create"
+msgstr "Vytvoriť"
+
+#: ../widgets/ExportDialog.cpp:158
+#, qt-format
+msgctxt "ExportDialog|"
+msgid "Failed to create directory '%1'"
+msgstr "Vytvorenie adresára „%1” zlyhalo"
+
+#: ../widgets/ExportDialog.cpp:206
+msgctxt "ExportDialog|"
+msgid "Directory"
+msgstr "Adresár"
+
 #: ../ui/TimeInput.ui:32
 msgctxt "Form|"
 msgid "last update"
@@ -1015,7 +1093,7 @@ msgctxt "MainWindow|"
 msgid "&New Request"
 msgstr "&Nová žiadosť"
 
-#: ../ui/MainWindow.ui:216 ../widgets/MW_menu.cpp:146
+#: ../widgets/MW_menu.cpp:146 ../ui/MainWindow.ui:216
 msgctxt "MainWindow|"
 msgid "Certificates"
 msgstr "Certifikáty"
@@ -1119,17 +1197,22 @@ msgctxt "MainWindow|"
 msgid "Japanese"
 msgstr "Japončina"
 
-#: ../widgets/MW_help.cpp:50
+#: ../widgets/MW_help.cpp:46
+msgctxt "MainWindow|"
+msgid "Korean"
+msgstr "Kórejčina"
+
+#: ../widgets/MW_help.cpp:52
 msgctxt "MainWindow|"
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../widgets/MW_help.cpp:51
+#: ../widgets/MW_help.cpp:53
 msgctxt "MainWindow|"
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../widgets/MW_help.cpp:53
+#: ../widgets/MW_help.cpp:55
 msgctxt "MainWindow|"
 msgid "Spanish"
 msgstr "Španielčina"
@@ -1144,7 +1227,7 @@ msgctxt "MainWindow|"
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../widgets/MW_help.cpp:46
+#: ../widgets/MW_help.cpp:48
 msgctxt "MainWindow|"
 msgid "Polish"
 msgstr "Poľština"
@@ -1164,7 +1247,7 @@ msgctxt "MainWindow|"
 msgid "Dutch"
 msgstr "Holandčina"
 
-#: ../widgets/MW_help.cpp:48
+#: ../widgets/MW_help.cpp:50
 msgctxt "MainWindow|"
 msgid "Portuguese in Brazil"
 msgstr "Brazílska portugalčina"
@@ -1174,7 +1257,7 @@ msgctxt "MainWindow|"
 msgid "Indonesian"
 msgstr "Indonézština"
 
-#: ../widgets/MW_help.cpp:55
+#: ../widgets/MW_help.cpp:57
 msgctxt "MainWindow|"
 msgid "Turkish"
 msgstr "Turečtina"
@@ -1616,283 +1699,284 @@ msgctxt "NewX509|"
 msgid "Signing request"
 msgstr "Žiadosť o podpísanie"
 
-#: ../ui/NewX509.ui:112
+#: ../ui/NewX509.ui:121
 msgctxt "NewX509|"
 msgid "Show request"
 msgstr "Zobraziť žiadosť"
 
-#: ../ui/NewX509.ui:119
+#: ../ui/NewX509.ui:128
 msgctxt "NewX509|"
 msgid "Sign this Certificate signing &request"
 msgstr "Podpísať túto Žiadosť o certifikát"
 
-#: ../ui/NewX509.ui:126
+#: ../ui/NewX509.ui:135
 msgctxt "NewX509|"
 msgid "Copy extensions from the request"
 msgstr "Kopírovať rozšírenia zo žiadosti"
 
-#: ../ui/NewX509.ui:136
+#: ../ui/NewX509.ui:145
 msgctxt "NewX509|"
 msgid "Modify subject of the request"
 msgstr "Zmeniť predmet žiadosti"
 
-#: ../ui/NewX509.ui:169
+#: ../ui/NewX509.ui:177
 msgctxt "NewX509|"
 msgid "Signing"
 msgstr "Podpísanie"
 
-#: ../ui/NewX509.ui:177
+#: ../ui/NewX509.ui:185
 msgctxt "NewX509|"
 msgid "Create a &self signed certificate"
 msgstr "Vytvoriť &sebou podpísaný certifikát"
 
-#: ../ui/NewX509.ui:191
+#: ../ui/NewX509.ui:199
 msgctxt "NewX509|"
 msgid "Use &this Certificate for signing"
 msgstr "Podpísať &týmto certifikátom"
 
-#: ../ui/NewX509.ui:198
+#: ../ui/NewX509.ui:206
 msgctxt "NewX509|"
 msgid "All certificates in your database that can create valid signatures"
 msgstr "Všetky certifikáty v databáze, ktoré môžu vytvoriť platný podpis"
 
-#: ../ui/NewX509.ui:225
+#: ../ui/NewX509.ui:233
 msgctxt "NewX509|"
 msgid "Signature algorithm"
 msgstr "Algoritmus podpisu"
 
-#: ../ui/NewX509.ui:253
+#: ../ui/NewX509.ui:261
 msgctxt "NewX509|"
 msgid "Template for the new certificate"
 msgstr "Šablóna nového certifikátu"
 
-#: ../ui/NewX509.ui:265
+#: ../ui/NewX509.ui:273
 msgctxt "NewX509|"
 msgid "All available templates"
 msgstr "Všetky dostupné šablóny"
 
-#: ../ui/NewX509.ui:287
+#: ../ui/NewX509.ui:295
 msgctxt "NewX509|"
 msgid "Apply extensions"
 msgstr "Pridať rozšírenia"
 
-#: ../ui/NewX509.ui:294
+#: ../ui/NewX509.ui:302
 msgctxt "NewX509|"
 msgid "Apply subject"
 msgstr "Pridať predmet"
 
-#: ../ui/NewX509.ui:307
+#: ../ui/NewX509.ui:315
 msgctxt "NewX509|"
 msgid "Apply all"
 msgstr "Pridať všetko"
 
-#: ../ui/NewX509.ui:336 ../widgets/NewX509.cpp:605
+#: ../widgets/NewX509.cpp:611 ../ui/NewX509.ui:344
 msgctxt "NewX509|"
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../ui/NewX509.ui:344
+#: ../ui/NewX509.ui:352
 msgctxt "NewX509|"
 msgid "Internal Name"
 msgstr "Interný názov"
 
-#: ../ui/NewX509.ui:360
+#: ../ui/NewX509.ui:368
 msgctxt "NewX509|"
 msgid "Distinguished name"
 msgstr "Rozlišovací názov"
 
-#: ../ui/NewX509.ui:386
+#: ../ui/NewX509.ui:394
 msgctxt "NewX509|"
 msgid "Add"
 msgstr "Pridať"
 
-#: ../ui/NewX509.ui:393
+#: ../ui/NewX509.ui:401
 msgctxt "NewX509|"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../ui/NewX509.ui:430
+#: ../ui/NewX509.ui:438
 msgctxt "NewX509|"
 msgid "Private key"
 msgstr "Súkromný kľúč"
 
-#: ../ui/NewX509.ui:442
+#: ../ui/NewX509.ui:450
 msgctxt "NewX509|"
 msgid "This list only contains unused keys"
 msgstr "Tento zoznam obsahuje len nepoužité kľúče"
 
-#: ../ui/NewX509.ui:449
+#: ../ui/NewX509.ui:457
 msgctxt "NewX509|"
 msgid "Used keys too"
 msgstr "Aj použité kľúče"
 
-#: ../ui/NewX509.ui:456
+#: ../ui/NewX509.ui:464
 msgctxt "NewX509|"
 msgid "&Generate a new key"
 msgstr "&Generovať nový kľúč"
 
-#: ../ui/NewX509.ui:467
+#: ../ui/NewX509.ui:475
 msgctxt "NewX509|"
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: ../ui/NewX509.ui:478
+#: ../ui/NewX509.ui:486
 msgctxt "NewX509|"
 msgid "Type"
 msgstr "Typ"
 
-#: ../ui/NewX509.ui:485
+#: ../ui/NewX509.ui:493
 msgctxt "NewX509|"
 msgid "If this will become a CA certificate or not"
 msgstr "Či to bude certifikát CA alebo nie"
 
-#: ../ui/NewX509.ui:489
+#: ../ui/NewX509.ui:497
 msgctxt "NewX509|"
 msgid "Not defined"
 msgstr "Nedefinované"
 
-#: ../ui/NewX509.ui:494
+#: ../ui/NewX509.ui:502
 msgctxt "NewX509|"
 msgid "Certification Authority"
 msgstr "Certifikačná autorita"
 
-#: ../ui/NewX509.ui:499
+#: ../ui/NewX509.ui:507
 msgctxt "NewX509|"
 msgid "End Entity"
 msgstr "Koncový certifikát"
 
-#: ../ui/NewX509.ui:507
+#: ../ui/NewX509.ui:515
 msgctxt "NewX509|"
 msgid "Path length"
 msgstr "Dĺžka cesty"
 
-#: ../ui/NewX509.ui:514
+#: ../ui/NewX509.ui:522
 msgctxt "NewX509|"
 msgid "How much CAs may be below this."
 msgstr "Koľko CA môže byť pod týmto."
 
-#: ../ui/NewX509.ui:521
+#: ../ui/NewX509.ui:529
 msgctxt "NewX509|"
 msgid "The basic constraints should always be critical"
 msgstr "Základné obmedzenia by mali byť vždy kritické"
 
-#: ../ui/NewX509.ui:534
+#: ../ui/NewX509.ui:542
 msgctxt "NewX509|"
 msgid "Key identifier"
 msgstr "Identifikátor kľúča"
 
-#: ../ui/NewX509.ui:546
+#: ../ui/NewX509.ui:563
 msgctxt "NewX509|"
 msgid "Creates a hash of the key following the PKIX guidelines"
 msgstr "Vytvorí odtlačok kľúča v súlade s odporúčaním PKIX"
 
-#: ../ui/NewX509.ui:556
+#: ../ui/NewX509.ui:573
 msgctxt "NewX509|"
 msgid "Copy the Subject Key Identifier from the issuer"
 msgstr "Kopírovať Identifikátor kľúča predmetu vydavateľa"
 
-#: ../ui/NewX509.ui:593
+#: ../ui/NewX509.ui:619
 msgctxt "NewX509|"
 msgid "Validity"
 msgstr "Platnosť"
 
-#: ../ui/NewX509.ui:599
+#: ../ui/NewX509.ui:625
 msgctxt "NewX509|"
 msgid "Not before"
 msgstr "Nie pred"
 
-#: ../ui/NewX509.ui:613
+#: ../ui/NewX509.ui:639
 msgctxt "NewX509|"
 msgid "Not after"
 msgstr "Nie po"
 
-#: ../ui/NewX509.ui:630
+#: ../ui/NewX509.ui:656
 msgctxt "NewX509|"
 msgid "Time range"
 msgstr "Časový rozsah"
 
-#: ../ui/NewX509.ui:640
+#: ../ui/NewX509.ui:666
 msgctxt "NewX509|"
 msgid "Days"
 msgstr "Dni"
 
-#: ../ui/NewX509.ui:645
+#: ../ui/NewX509.ui:671
 msgctxt "NewX509|"
 msgid "Months"
 msgstr "Mesiace"
 
-#: ../ui/NewX509.ui:650
+#: ../ui/NewX509.ui:676
 msgctxt "NewX509|"
 msgid "Years"
 msgstr "Roky"
 
-#: ../ui/NewX509.ui:664
+#: ../ui/NewX509.ui:704
 msgctxt "NewX509|"
 msgid "Apply"
 msgstr "Použiť"
 
-#: ../ui/NewX509.ui:671
+#: ../ui/NewX509.ui:711
 msgctxt "NewX509|"
 msgid "Set the time to 00:00:00 and 23:59:59 respectively"
 msgstr "Nastavuje čas na 00:00:00 a 23:59:59"
 
-#: ../ui/NewX509.ui:674
+#: ../ui/NewX509.ui:714
 msgctxt "NewX509|"
 msgid "Midnight"
 msgstr "Polnoc"
 
-#: ../ui/NewX509.ui:681
+#: ../ui/NewX509.ui:684
 msgctxt "NewX509|"
 msgid "Local time"
 msgstr "Lokálny čas"
 
-#: ../ui/NewX509.ui:688
+#: ../ui/NewX509.ui:691
 msgctxt "NewX509|"
 msgid "No well-defined expiration"
 msgstr "Bez vypršania"
 
-#: ../ui/NewX509.ui:738 ../ui/NewX509.ui:755 ../ui/NewX509.ui:824
+#: ../ui/NewX509.ui:768 ../ui/NewX509.ui:811 ../ui/NewX509.ui:834
+#: ../ui/NewX509.ui:863
 msgctxt "NewX509|"
 msgid "DNS: IP: URI: email: RID:"
 msgstr "DNS:, IP:, URI:, email:, RID:"
 
-#: ../ui/NewX509.ui:745 ../ui/NewX509.ui:762 ../ui/NewX509.ui:795
-#: ../ui/NewX509.ui:831 ../widgets/NewX509.cpp:1013
+#: ../widgets/NewX509.cpp:1029 ../ui/NewX509.ui:775 ../ui/NewX509.ui:801
+#: ../ui/NewX509.ui:827 ../ui/NewX509.ui:870 ../ui/NewX509.ui:896
 msgctxt "NewX509|"
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../ui/NewX509.ui:788
+#: ../ui/NewX509.ui:922
 msgctxt "NewX509|"
 msgid "URI:"
 msgstr "URI:"
 
-#: ../ui/NewX509.ui:870
+#: ../ui/NewX509.ui:932
 msgctxt "NewX509|"
 msgid "Key usage"
 msgstr "Použitie kľúča"
 
-#: ../ui/NewX509.ui:981
+#: ../ui/NewX509.ui:1070
 msgctxt "NewX509|"
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../ui/NewX509.ui:1139
+#: ../ui/NewX509.ui:1228
 msgctxt "NewX509|"
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../ui/NewX509.ui:1163 ../widgets/NewX509.cpp:1023
+#: ../widgets/NewX509.cpp:1039 ../ui/NewX509.ui:1252
 msgctxt "NewX509|"
 msgid "Validate"
 msgstr "Overiť"
 
-#: ../ui/NewX509.ui:1186
+#: ../ui/NewX509.ui:1275
 msgctxt "NewX509|"
 msgid "Comment"
 msgstr "Komentár"
 
-#: ../ui/NewX509.ui:351
+#: ../ui/NewX509.ui:359
 msgctxt "NewX509|"
 msgid ""
 "This name is only used internally and does not appear in the resulting "
@@ -1900,151 +1984,157 @@ msgid ""
 msgstr ""
 "Tento názov je použitý len interne a neobjaví sa vo výslednom certifikáte"
 
-#: ../widgets/NewX509.cpp:272
+#: ../widgets/NewX509.cpp:276
 msgctxt "NewX509|"
 msgid "Critical"
 msgstr "Kritické"
 
-#: ../widgets/NewX509.cpp:312
+#: ../widgets/NewX509.cpp:317
 msgctxt "NewX509|"
 msgid "Create Certificate signing request"
 msgstr "Vytvoriť Žiadosť o podpísanie certifikátu"
 
-#: ../widgets/NewX509.cpp:338
+#: ../widgets/NewX509.cpp:343
 #, qt-format
 msgctxt "NewX509|"
 msgid "minimum size: %1"
 msgstr "minimálna veľkosť: %1"
 
-#: ../widgets/NewX509.cpp:340
+#: ../widgets/NewX509.cpp:345
 #, qt-format
 msgctxt "NewX509|"
 msgid "maximum size: %1"
 msgstr "maximálna veľkosť: %1"
 
-#: ../widgets/NewX509.cpp:342
+#: ../widgets/NewX509.cpp:347
 msgctxt "NewX509|"
 msgid "only a-z A-Z 0-9 '()+,-./:=?"
 msgstr "len a-z A-Z 0-9 '()+,-./:=?"
 
-#: ../widgets/NewX509.cpp:346
+#: ../widgets/NewX509.cpp:351
 msgctxt "NewX509|"
 msgid "only 7-bit clean characters"
 msgstr "len prosté 7-b znaky"
 
-#: ../widgets/NewX509.cpp:371
+#: ../widgets/NewX509.cpp:376
 msgctxt "NewX509|"
 msgid "Edit XCA template"
 msgstr "Upraviť šablónu XCA"
 
-#: ../widgets/NewX509.cpp:395
+#: ../widgets/NewX509.cpp:391
 msgctxt "NewX509|"
 msgid "Create x509 Certificate"
 msgstr "Vytvoriť certifikát x509"
 
-#: ../widgets/NewX509.cpp:773
+#: ../widgets/NewX509.cpp:779
 #, qt-format
 msgctxt "NewX509|"
 msgid "Template '%1' applied"
 msgstr "Šablóna „%1” aplikovaná"
 
-#: ../widgets/NewX509.cpp:780
+#: ../widgets/NewX509.cpp:786
 #, qt-format
 msgctxt "NewX509|"
 msgid "Subject applied from template '%1'"
 msgstr "Predmet nastavený zo šablóny „%1”"
 
-#: ../widgets/NewX509.cpp:788
+#: ../widgets/NewX509.cpp:794
 #, qt-format
 msgctxt "NewX509|"
 msgid "Extensions applied from template '%1'"
 msgstr "Rozšírenia nastavené zo šablóny „%1”"
 
-#: ../widgets/NewX509.cpp:803
+#: ../widgets/NewX509.cpp:809
 #, qt-format
 msgctxt "NewX509|"
 msgid "New key '%1' created"
 msgstr "Vytvorený nový kľúč „%1”"
 
-#: ../widgets/NewX509.cpp:1045
+#: ../widgets/NewX509.cpp:1061
 msgctxt "NewX509|"
 msgid "Other Tabs"
 msgstr "Záložka Iné"
 
-#: ../widgets/NewX509.cpp:1061
+#: ../widgets/NewX509.cpp:1077
 msgctxt "NewX509|"
 msgid "Advanced Tab"
 msgstr "Záložka Pokročilé"
 
-#: ../widgets/NewX509.cpp:1068
+#: ../widgets/NewX509.cpp:1084
 msgctxt "NewX509|"
 msgid "Errors"
 msgstr "Chyby"
 
-#: ../widgets/NewX509.cpp:1087
+#: ../widgets/NewX509.cpp:1103
 msgctxt "NewX509|"
 msgid "From PKCS#10 request"
 msgstr "Zo žiadosti PKCS#10"
 
-#: ../widgets/NewX509.cpp:1097
+#: ../widgets/NewX509.cpp:1113
 msgctxt "NewX509|"
 msgid "Error"
 msgstr "Chyba"
 
-#: ../widgets/NewX509.cpp:1097
+#: ../widgets/NewX509.cpp:1113
 msgctxt "NewX509|"
 msgid "duplicate extensions"
 msgstr "duplicitné rozšírenie"
 
-#: ../widgets/NewX509.cpp:1106
+#: ../widgets/NewX509.cpp:1122
+msgctxt "NewX509|"
+msgid "The Name Constraints are invalid"
+msgstr "Obmedzenia mena sú neplatné"
+
+#: ../widgets/NewX509.cpp:1124
 msgctxt "NewX509|"
 msgid "The Subject Alternative Name is invalid"
 msgstr "Alternatívne meno predmetu (SAN) je neplatné"
 
-#: ../widgets/NewX509.cpp:1108
+#: ../widgets/NewX509.cpp:1126
 msgctxt "NewX509|"
 msgid "The Issuer Alternative Name is invalid"
-msgstr "Alternatívny názov vydavateľa (IAN) je neplatné"
+msgstr "Alternatívny názov vydavateľa (IAN) je neplatný"
 
-#: ../widgets/NewX509.cpp:1110
+#: ../widgets/NewX509.cpp:1128
 msgctxt "NewX509|"
 msgid "The CRL Distribution Point is invalid"
 msgstr "Distribučné bod CRL je neplatný"
 
-#: ../widgets/NewX509.cpp:1112
+#: ../widgets/NewX509.cpp:1130
 msgctxt "NewX509|"
 msgid "The Authority Information Access is invalid"
 msgstr "Prístup k informácii CA (AIA) je neplatný"
 
-#: ../widgets/NewX509.cpp:1212 ../widgets/NewX509.cpp:1225
-#: ../widgets/NewX509.cpp:1244 ../widgets/NewX509.cpp:1256
-#: ../widgets/NewX509.cpp:1272 ../widgets/NewX509.cpp:1286
-#: ../widgets/NewX509.cpp:1320 ../widgets/NewX509.cpp:1339
-#: ../widgets/NewX509.cpp:1362 ../widgets/NewX509.cpp:1385
-#: ../widgets/NewX509.cpp:1420 ../widgets/NewX509.cpp:1440
+#: ../widgets/NewX509.cpp:1241 ../widgets/NewX509.cpp:1254
+#: ../widgets/NewX509.cpp:1273 ../widgets/NewX509.cpp:1285
+#: ../widgets/NewX509.cpp:1301 ../widgets/NewX509.cpp:1315
+#: ../widgets/NewX509.cpp:1349 ../widgets/NewX509.cpp:1368
+#: ../widgets/NewX509.cpp:1391 ../widgets/NewX509.cpp:1414
+#: ../widgets/NewX509.cpp:1449 ../widgets/NewX509.cpp:1469
+#: ../widgets/NewX509.cpp:1502
 msgctxt "NewX509|"
 msgid "Abort rollout"
 msgstr "Prerušiť operáciu"
 
-#: ../widgets/NewX509.cpp:1221
+#: ../widgets/NewX509.cpp:1250
 msgctxt "NewX509|"
 msgid "The following length restrictions of RFC3280 are violated:"
 msgstr "Nie sú splnené Nasledujúce obmedzenia veľkosti z RFC3280:"
 
-#: ../widgets/NewX509.cpp:1224 ../widgets/NewX509.cpp:1285
+#: ../widgets/NewX509.cpp:1253 ../widgets/NewX509.cpp:1314
 msgctxt "NewX509|"
 msgid "Edit subject"
 msgstr "Upraviť predmet"
 
-#: ../widgets/NewX509.cpp:1226 ../widgets/NewX509.cpp:1287
-#: ../widgets/NewX509.cpp:1340 ../widgets/NewX509.cpp:1363
-#: ../widgets/NewX509.cpp:1386 ../widgets/NewX509.cpp:1421
-#: ../widgets/NewX509.cpp:1441
+#: ../widgets/NewX509.cpp:1255 ../widgets/NewX509.cpp:1316
+#: ../widgets/NewX509.cpp:1369 ../widgets/NewX509.cpp:1392
+#: ../widgets/NewX509.cpp:1415 ../widgets/NewX509.cpp:1450
+#: ../widgets/NewX509.cpp:1470 ../widgets/NewX509.cpp:1503
 msgctxt "NewX509|"
 msgid "Continue rollout"
 msgstr "Pokračovať v operácii"
 
-#: ../widgets/NewX509.cpp:1242
+#: ../widgets/NewX509.cpp:1271
 msgctxt "NewX509|"
 msgid ""
 "The verification of the Certificate request failed.\n"
@@ -2053,12 +2143,12 @@ msgstr ""
 "Overenie žiadosti o certifikát zlyhalo.\n"
 "Operácia by mala byť prerušená."
 
-#: ../widgets/NewX509.cpp:1243
+#: ../widgets/NewX509.cpp:1272
 msgctxt "NewX509|"
 msgid "Continue anyway"
 msgstr "Pokračovať i tak"
 
-#: ../widgets/NewX509.cpp:1254
+#: ../widgets/NewX509.cpp:1283
 msgctxt "NewX509|"
 msgid ""
 "The internal name and the common name are empty.\n"
@@ -2067,22 +2157,22 @@ msgstr ""
 "Interný názov a bežný názov sú prázdne.\n"
 "Prosím, zadajte aspoň interný názov."
 
-#: ../widgets/NewX509.cpp:1255
+#: ../widgets/NewX509.cpp:1284
 msgctxt "NewX509|"
 msgid "Edit name"
 msgstr "Upraviť názov"
 
-#: ../widgets/NewX509.cpp:1270
+#: ../widgets/NewX509.cpp:1299
 msgctxt "NewX509|"
 msgid "There is no Key selected for signing."
 msgstr "Nebol zvolený kľúč na podpísanie."
 
-#: ../widgets/NewX509.cpp:1271
+#: ../widgets/NewX509.cpp:1300
 msgctxt "NewX509|"
 msgid "Select key"
 msgstr "Vybrať kľúč"
 
-#: ../widgets/NewX509.cpp:1283
+#: ../widgets/NewX509.cpp:1312
 #, qt-format
 msgctxt "NewX509|"
 msgid ""
@@ -2094,22 +2184,22 @@ msgstr ""
 "%1\n"
 "hoci ste ich v nastavení definovali ako povinné."
 
-#: ../widgets/NewX509.cpp:1317
+#: ../widgets/NewX509.cpp:1346
 msgctxt "NewX509|"
 msgid "The key you selected for signing is not a private one."
 msgstr "Kľúč, zvolený na podpísanie, nie je súkromný."
 
-#: ../widgets/NewX509.cpp:1318
+#: ../widgets/NewX509.cpp:1347
 msgctxt "NewX509|"
 msgid "Select other signer"
 msgstr "Zvoliť iného vydavateľa"
 
-#: ../widgets/NewX509.cpp:1318
+#: ../widgets/NewX509.cpp:1347
 msgctxt "NewX509|"
 msgid "Select other key"
 msgstr "Zvoliť iný kľúč"
 
-#: ../widgets/NewX509.cpp:1328
+#: ../widgets/NewX509.cpp:1357
 #, qt-format
 msgctxt "NewX509|"
 msgid ""
@@ -2119,17 +2209,17 @@ msgstr ""
 "Aktuálne zvolený algoritmus odtlačku „%1” nie je bezpečný a nemá byť "
 "používaný."
 
-#: ../widgets/NewX509.cpp:1329
+#: ../widgets/NewX509.cpp:1358
 msgctxt "NewX509|"
 msgid "Select other algorithm"
 msgstr "Zvoľte iný algoritmus"
 
-#: ../widgets/NewX509.cpp:1330
+#: ../widgets/NewX509.cpp:1359
 msgctxt "NewX509|"
 msgid "Use algorithm anyway"
 msgstr "Použiť algoritmus aj tak"
 
-#: ../widgets/NewX509.cpp:1336
+#: ../widgets/NewX509.cpp:1365
 msgctxt "NewX509|"
 msgid ""
 "The certificate will be earlier valid than the signer. This is probably not "
@@ -2137,18 +2227,18 @@ msgid ""
 msgstr ""
 "Certifikát bude platný skôr ako jeho vydavateľ. To asi nie je to, čo chcete."
 
-#: ../widgets/NewX509.cpp:1338 ../widgets/NewX509.cpp:1361
-#: ../widgets/NewX509.cpp:1384
+#: ../widgets/NewX509.cpp:1367 ../widgets/NewX509.cpp:1390
+#: ../widgets/NewX509.cpp:1413
 msgctxt "NewX509|"
 msgid "Edit dates"
 msgstr "Upraviť dátumy"
 
-#: ../widgets/NewX509.cpp:1341 ../widgets/NewX509.cpp:1364
+#: ../widgets/NewX509.cpp:1370 ../widgets/NewX509.cpp:1393
 msgctxt "NewX509|"
 msgid "Adjust date and continue"
 msgstr "Opraviť dátum a pokračovať"
 
-#: ../widgets/NewX509.cpp:1359
+#: ../widgets/NewX509.cpp:1388
 msgctxt "NewX509|"
 msgid ""
 "The certificate will be longer valid than the signer. This is probably not "
@@ -2157,7 +2247,7 @@ msgstr ""
 "Certifikát bude platný dlhšie ako jeho vydavateľ. To asi nie je to, čo "
 "chcete."
 
-#: ../widgets/NewX509.cpp:1382
+#: ../widgets/NewX509.cpp:1411
 msgctxt "NewX509|"
 msgid ""
 "The certificate will be out of date before it becomes valid. You most "
@@ -2166,7 +2256,7 @@ msgstr ""
 "Certifikát vyprší ešte pred nadobudnutím platnosti. Pravdepodobne ste "
 "zamenili oba dátumy."
 
-#: ../widgets/NewX509.cpp:1404
+#: ../widgets/NewX509.cpp:1433
 msgctxt "NewX509|"
 msgid ""
 "The certificate contains invalid or duplicate extensions. Check the "
@@ -2175,7 +2265,7 @@ msgstr ""
 "Certifikát obsahuje neplatné alebo duplicitné rozšírenia. Skontrolujte "
 "platnosť na záložke Pokročilé."
 
-#: ../widgets/NewX509.cpp:1408
+#: ../widgets/NewX509.cpp:1437
 msgctxt "NewX509|"
 msgid ""
 "The certificate contains no extensions. You may apply the extensions of one "
@@ -2184,17 +2274,18 @@ msgstr ""
 "Certifikát neobsahuje rozšírenia. Na definovanie určenia certifikátu môžete "
 "pridať rozšírenia jednej zo šablón."
 
-#: ../widgets/NewX509.cpp:1412
+#: ../widgets/NewX509.cpp:1441
 msgctxt "NewX509|"
 msgid "The certificate contains invalid extensions."
 msgstr "Certifikát obsahuje neplatné rozšírenie."
 
-#: ../widgets/NewX509.cpp:1419 ../widgets/NewX509.cpp:1439
+#: ../widgets/NewX509.cpp:1448 ../widgets/NewX509.cpp:1468
+#: ../widgets/NewX509.cpp:1501
 msgctxt "NewX509|"
 msgid "Edit extensions"
 msgstr "Upraviť rozšírenia"
 
-#: ../widgets/NewX509.cpp:1438
+#: ../widgets/NewX509.cpp:1467
 msgctxt "NewX509|"
 msgid ""
 "The subject alternative name shall contain a copy of the common name. "
@@ -2203,7 +2294,13 @@ msgstr ""
 "Alternatívne meno predmetu má obsahovať kópiu bežného mena. Avšak, bežné "
 "meno je prázdne."
 
-#: ../widgets/NewX509_ext.cpp:169
+#: ../widgets/NewX509.cpp:1498
+#, qt-format
+msgctxt "NewX509|"
+msgid "A name constraint of the issuer '%1' is violated: %2"
+msgstr "Obmedzenie mena vydavateľa „%1” je porušené: %2"
+
+#: ../widgets/NewX509_ext.cpp:173
 #, qt-format
 msgctxt "NewX509|"
 msgid "Configfile error on line %1\n"
@@ -2274,7 +2371,7 @@ msgctxt "OpenDb|"
 msgid "Password"
 msgstr "Heslo"
 
-#: ../ui/OpenDb.ui:142 ../widgets/OpenDb.cpp:57
+#: ../widgets/OpenDb.cpp:57 ../ui/OpenDb.ui:142
 msgctxt "OpenDb|"
 msgid "Database name"
 msgstr "Názov databázy"
@@ -2428,37 +2525,37 @@ msgctxt "Options|"
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../widgets/Options.cpp:35
+#: ../widgets/Options.cpp:36
 msgctxt "Options|"
 msgid "Printable string or UTF8 (default)"
 msgstr "Tlačiteľné znaky alebo UTF-8 (predvolené)"
 
-#: ../widgets/Options.cpp:36
+#: ../widgets/Options.cpp:37
 msgctxt "Options|"
 msgid "PKIX recommendation in RFC2459"
 msgstr "Odporúčania PKIX v RFC2459"
 
-#: ../widgets/Options.cpp:37
+#: ../widgets/Options.cpp:38
 msgctxt "Options|"
 msgid "No BMP strings, only printable and T61"
 msgstr "Nie reťazce BMP, len tlačiteľné a T61"
 
-#: ../widgets/Options.cpp:38
+#: ../widgets/Options.cpp:39
 msgctxt "Options|"
 msgid "UTF8 strings only (RFC2459)"
 msgstr "Len reťazce UTF-8 (RFC2459)"
 
-#: ../widgets/Options.cpp:39
+#: ../widgets/Options.cpp:40
 msgctxt "Options|"
 msgid "All strings"
 msgstr "Všetky reťazce"
 
-#: ../widgets/Options.cpp:61
+#: ../widgets/Options.cpp:62
 msgctxt "Options|"
 msgid "Days"
 msgstr "Dni"
 
-#: ../widgets/Options.cpp:61
+#: ../widgets/Options.cpp:62
 msgctxt "Options|"
 msgid "Weeks"
 msgstr "Týždne"
@@ -2788,19 +2885,19 @@ msgctxt "QObject|"
 msgid "%1 is longer than %2 bytes: '%3'"
 msgstr "%1 je dlhšie ako %2 B: „%3”"
 
-#: ../lib/x509v3ext.cpp:103
+#: ../lib/x509v3ext.cpp:112
 #, qt-format
 msgctxt "QObject|"
 msgid "String '%1' for '%2' contains invalid characters"
 msgstr "Reťazec „%1” pre „%2” obsahuje neplatné znaky"
 
-#: ../lib/oid.cpp:48
+#: ../lib/oid.cpp:58
 #, qt-format
 msgctxt "QObject|"
 msgid "Error reading config file %1 at line %2"
 msgstr "Chyba čítania konfiguračného súboru %1 na riadku %2"
 
-#: ../lib/oid.cpp:86
+#: ../lib/oid.cpp:96
 #, qt-format
 msgctxt "QObject|"
 msgid ""
@@ -2810,7 +2907,7 @@ msgstr ""
 "Objekt „%1” zo súboru %2 riadok %3 je už známy ako „%4:%5:%6” a mal by byť "
 "odstránený."
 
-#: ../lib/oid.cpp:95
+#: ../lib/oid.cpp:105
 #, qt-format
 msgctxt "QObject|"
 msgid ""
@@ -2820,7 +2917,7 @@ msgstr ""
 "Identifikátor „%1” pre OID %2 zo súboru %3 riadok %4 je už použitý pre iné "
 "OID ako „%5:%6:%7” a treba ho zmeniť, aby ste predišli konfliktom."
 
-#: ../lib/oid.cpp:160
+#: ../lib/oid.cpp:170
 #, qt-format
 msgctxt "QObject|"
 msgid "Unknown object '%1' in file %2 line %3"
@@ -2831,214 +2928,225 @@ msgctxt "QObject|"
 msgid "Failed to start a database transaction"
 msgstr "Zlyhala inicializácia DB transakcie"
 
-#: ../lib/func_base.cpp:224
+#: ../lib/func_base.cpp:244
 msgctxt "QObject|"
 msgid "Country code"
 msgstr "Kód krajiny"
 
-#: ../lib/func_base.cpp:225
+#: ../lib/func_base.cpp:245
 msgctxt "QObject|"
 msgid "State or Province"
 msgstr "Štát alebo provincia"
 
-#: ../lib/func_base.cpp:226
+#: ../lib/func_base.cpp:246
 msgctxt "QObject|"
 msgid "Locality"
 msgstr "Lokalita"
 
-#: ../lib/func_base.cpp:227
+#: ../lib/func_base.cpp:247
 msgctxt "QObject|"
 msgid "Organisation"
 msgstr "Organizácia"
 
-#: ../lib/func_base.cpp:228
+#: ../lib/func_base.cpp:248
 msgctxt "QObject|"
 msgid "Organisational unit"
 msgstr "Organizačná jednotka"
 
-#: ../lib/func_base.cpp:229
+#: ../lib/func_base.cpp:249
 msgctxt "QObject|"
 msgid "Common name"
 msgstr "Bežný názov"
 
-#: ../lib/func_base.cpp:230
+#: ../lib/func_base.cpp:250
 msgctxt "QObject|"
 msgid "E-Mail address"
 msgstr "Emailová adresa"
 
-#: ../lib/func_base.cpp:231
+#: ../lib/func_base.cpp:251
 msgctxt "QObject|"
 msgid "Serial number"
 msgstr "Sériové číslo"
 
-#: ../lib/func_base.cpp:232
+#: ../lib/func_base.cpp:252
 msgctxt "QObject|"
 msgid "Given name"
 msgstr "Rodné meno"
 
-#: ../lib/func_base.cpp:233
+#: ../lib/func_base.cpp:253
 msgctxt "QObject|"
 msgid "Surname"
 msgstr "Priezvisko"
 
-#: ../lib/func_base.cpp:234
+#: ../lib/func_base.cpp:254
 msgctxt "QObject|"
 msgid "Title"
 msgstr "Titul"
 
-#: ../lib/func_base.cpp:235
+#: ../lib/func_base.cpp:255
 msgctxt "QObject|"
 msgid "Initials"
 msgstr "Iniciály"
 
-#: ../lib/func_base.cpp:236
+#: ../lib/func_base.cpp:256
 msgctxt "QObject|"
 msgid "Description"
 msgstr "Popis"
 
-#: ../lib/func_base.cpp:237
+#: ../lib/func_base.cpp:257
 msgctxt "QObject|"
 msgid "Role"
 msgstr "Rola"
 
-#: ../lib/func_base.cpp:238
+#: ../lib/func_base.cpp:258
 msgctxt "QObject|"
 msgid "Pseudonym"
 msgstr "Pseudonym"
 
-#: ../lib/func_base.cpp:239
+#: ../lib/func_base.cpp:259
 msgctxt "QObject|"
 msgid "Generation Qualifier"
 msgstr "Prívlastok generácie"
 
-#: ../lib/func_base.cpp:240
+#: ../lib/func_base.cpp:260
 msgctxt "QObject|"
 msgid "x500 Unique Identifier"
 msgstr "Jedinečný identifikátor x500"
 
-#: ../lib/func_base.cpp:241
+#: ../lib/func_base.cpp:261
 msgctxt "QObject|"
 msgid "Name"
 msgstr "Názov"
 
-#: ../lib/func_base.cpp:242
+#: ../lib/func_base.cpp:262
 msgctxt "QObject|"
 msgid "DN Qualifier"
 msgstr "Prívlastok DN"
 
-#: ../lib/func_base.cpp:243
+#: ../lib/func_base.cpp:263
 msgctxt "QObject|"
 msgid "Unstructured name"
 msgstr "Neštruktúrovaný názov"
 
-#: ../lib/func_base.cpp:244
+#: ../lib/func_base.cpp:264
 msgctxt "QObject|"
 msgid "Challenge password"
 msgstr "Heslo výzvy"
 
-#: ../lib/func_base.cpp:246
+#: ../lib/func_base.cpp:266
 msgctxt "QObject|"
 msgid "Basic Constraints"
 msgstr "Základné obmedzenia"
 
-#: ../lib/func_base.cpp:247
+#: ../lib/func_base.cpp:267
+msgctxt "QObject|"
+msgid "Name Constraints"
+msgstr "Obmedzenia mena"
+
+#: ../lib/func_base.cpp:268
 msgctxt "QObject|"
 msgid "Subject alternative name"
 msgstr "Alternatívne meno predmetu"
 
-#: ../lib/func_base.cpp:248
+#: ../lib/func_base.cpp:269
 msgctxt "QObject|"
 msgid "issuer alternative name"
 msgstr "Alternatívny názov vydavateľa"
 
-#: ../lib/func_base.cpp:249
+#: ../lib/func_base.cpp:270
 msgctxt "QObject|"
 msgid "Subject key identifier"
 msgstr "Identifikátor kľúča predmetu"
 
-#: ../lib/func_base.cpp:250
+#: ../lib/func_base.cpp:271
 msgctxt "QObject|"
 msgid "Authority key identifier"
 msgstr "Identifikátor kľúča autority"
 
-#: ../lib/func_base.cpp:251
+#: ../lib/func_base.cpp:272
 msgctxt "QObject|"
 msgid "Key usage"
 msgstr "Použitie kľúča"
 
-#: ../lib/func_base.cpp:252
+#: ../lib/func_base.cpp:273
 msgctxt "QObject|"
 msgid "Extended key usage"
 msgstr "Rozšírené použitie kľúča"
 
-#: ../lib/func_base.cpp:253
+#: ../lib/func_base.cpp:274
 msgctxt "QObject|"
 msgid "CRL distribution points"
 msgstr "Distribučné body CRL"
 
-#: ../lib/func_base.cpp:254
+#: ../lib/func_base.cpp:275
 msgctxt "QObject|"
 msgid "Authority information access"
 msgstr "Prístup k informácii CA (AIA)"
 
-#: ../lib/func_base.cpp:255
+#: ../lib/func_base.cpp:276
 msgctxt "QObject|"
 msgid "Certificate type"
 msgstr "Typ certifikátu"
 
-#: ../lib/func_base.cpp:256
+#: ../lib/func_base.cpp:277
 msgctxt "QObject|"
 msgid "Base URL"
 msgstr "Základná URL"
 
-#: ../lib/func_base.cpp:257
+#: ../lib/func_base.cpp:278
 msgctxt "QObject|"
 msgid "Revocation URL"
 msgstr "URL odvolaní"
 
-#: ../lib/func_base.cpp:258
+#: ../lib/func_base.cpp:279
 msgctxt "QObject|"
 msgid "CA Revocation URL"
 msgstr "URL odvolaní CA"
 
-#: ../lib/func_base.cpp:259
+#: ../lib/func_base.cpp:280
 msgctxt "QObject|"
 msgid "Certificate renewal URL"
 msgstr "URL obnovenia CRL"
 
-#: ../lib/func_base.cpp:260
+#: ../lib/func_base.cpp:281
 msgctxt "QObject|"
 msgid "CA policy URL"
 msgstr "URL politiky CA"
 
-#: ../lib/func_base.cpp:261
+#: ../lib/func_base.cpp:282
 msgctxt "QObject|"
 msgid "SSL server name"
 msgstr "Meno servera SSL"
 
-#: ../lib/func_base.cpp:262
+#: ../lib/func_base.cpp:283
 msgctxt "QObject|"
 msgid "Comment"
 msgstr "Komentár"
 
-#: ../lib/cmdline.cpp:163
+#: ../lib/cmdline.cpp:166
 #, qt-format
 msgctxt "QObject|"
 msgid "Index file written to '%1'"
 msgstr "Súbor index zapísaný do „%1”"
 
-#: ../lib/cmdline.cpp:170
+#: ../lib/cmdline.cpp:173
 #, qt-format
 msgctxt "QObject|"
 msgid "Index hierarchy written to '%1'"
 msgstr "Hierarchia indexu zapísaná do „%1”"
 
-#: ../lib/cmdline.cpp:183
+#: ../lib/cmdline.cpp:186
 #, qt-format
 msgctxt "QObject|"
 msgid "Unknown key type %1"
 msgstr "Neznámy typ kľúča %1"
 
+#: ../lib/cmdline.cpp:273
+#, qt-format
+msgctxt "QObject|"
+msgid "Failed to write PEM data to '%1'"
+msgstr "Zlyhal zápis dát PEM do „%1”"
+
 #: ../lib/XcaWarningCore.h:23
 msgctxt "QObject|"
 msgid "Password verify error, please try again"
@@ -3059,7 +3167,7 @@ msgctxt "QObject|"
 msgid "Password"
 msgstr "Heslo"
 
-#: ../lib/pki_pkcs12.cpp:214
+#: ../lib/pki_pkcs12.cpp:217
 msgctxt "QObject|"
 msgid "insecure"
 msgstr "nie bezpečné"
@@ -3194,7 +3302,7 @@ msgctxt "SearchPkcs11|"
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../widgets/SearchPkcs11.cpp:75
+#: ../widgets/SearchPkcs11.cpp:76
 msgctxt "SearchPkcs11|"
 msgid "The following files are possible PKCS#11 libraries"
 msgstr "nasledujúce súbory sú možné knižnice PKCS#11"
@@ -3244,31 +3352,6 @@ msgctxt "TempTreeView|"
 msgid "XCA Templates ( *.xca )"
 msgstr "Šablóny XCA ( *.xca )"
 
-#: ../ui/TrustState.ui:33
-msgctxt "TrustState|"
-msgid "Certificate trust"
-msgstr "D§veryhodnosť o certifikátu"
-
-#: ../ui/TrustState.ui:93
-msgctxt "TrustState|"
-msgid "Trustment"
-msgstr "Dôveryhodnosť"
-
-#: ../ui/TrustState.ui:102
-msgctxt "TrustState|"
-msgid "&Never trust this certificate"
-msgstr "Tomuto certifikátu &nikdy nedôverovať"
-
-#: ../ui/TrustState.ui:109
-msgctxt "TrustState|"
-msgid "Only &trust this certificate, if we trust the signer"
-msgstr "Tomuto certifikátu &dôverovať, ak dôverujem vydavateľovi"
-
-#: ../ui/TrustState.ui:116
-msgctxt "TrustState|"
-msgid "&Always trust this certificate"
-msgstr "Tomuto certifikátu &vždy dôverovať"
-
 #: ../widgets/validity.cpp:91
 msgctxt "Validity|"
 msgid "yyyy-MM-dd hh:mm"
@@ -3306,97 +3389,123 @@ msgctxt "XcaDetail|"
 msgid "Import"
 msgstr "Import"
 
-#: ../widgets/XcaTreeView.cpp:336
+#: ../widgets/XcaTreeView.cpp:332
 msgctxt "XcaTreeView|"
 msgid "Item properties"
 msgstr "Vlastnosti položky"
 
-#: ../widgets/XcaTreeView.cpp:406
+#: ../widgets/XcaTreeView.cpp:402
 msgctxt "XcaTreeView|"
 msgid "Subject entries"
 msgstr "Položky predmetu"
 
-#: ../widgets/XcaTreeView.cpp:407
+#: ../widgets/XcaTreeView.cpp:403
 msgctxt "XcaTreeView|"
 msgid "X509v3 Extensions"
 msgstr "Rozšírenia X509v3"
 
-#: ../widgets/XcaTreeView.cpp:408
+#: ../widgets/XcaTreeView.cpp:404
 msgctxt "XcaTreeView|"
 msgid "Netscape extensions"
 msgstr "Rozšírenia Netscape"
 
-#: ../widgets/XcaTreeView.cpp:409
+#: ../widgets/XcaTreeView.cpp:405
 msgctxt "XcaTreeView|"
 msgid "Key properties"
 msgstr "Vlastnosti kľúča"
 
-#: ../widgets/XcaTreeView.cpp:410
+#: ../widgets/XcaTreeView.cpp:406
 msgctxt "XcaTreeView|"
 msgid "Reset"
 msgstr "Vymazať"
 
-#: ../widgets/XcaTreeView.cpp:413
+#: ../widgets/XcaTreeView.cpp:409
 msgctxt "XcaTreeView|"
 msgid "Hide Column"
 msgstr "Odstrániť stĺpec"
 
-#: ../widgets/XcaTreeView.cpp:415
+#: ../widgets/XcaTreeView.cpp:411
 msgctxt "XcaTreeView|"
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../widgets/XcaTreeView.cpp:456
+#: ../widgets/XcaTreeView.cpp:452
 msgctxt "XcaTreeView|"
 msgid "Columns"
 msgstr "Stĺpce"
 
-#: ../widgets/XcaTreeView.cpp:522
+#: ../widgets/XcaTreeView.cpp:509
+msgctxt "XcaTreeView|"
+msgid "Export Password"
+msgstr "Heslo exportu"
+
+#: ../widgets/XcaTreeView.cpp:510
+#, qt-format
+msgctxt ""
+"XcaTreeView|Singular form for 0 or 1 item can be ignored. Will always be "
+"called with n >= 2"
+msgid ""
+"Please enter the password to encrypt all %n exported private key(s) in:\n"
+"%1"
+msgid_plural ""
+"Please enter the password to encrypt all %n exported private key(s) in:\n"
+"%1"
+msgstr[0] ""
+"Prosím, zadajte heslo na šifrovanie exportovaného súkromného kľúča v:\n"
+"%1"
+msgstr[1] ""
+"Prosím, zadajte heslo na šifrovanie %n exportovaných súkromných kľúčov v:\n"
+"%1"
+msgstr[2] ""
+"Prosím, zadajte heslo na šifrovanie %n exportovaných súkromných kľúčov v:\n"
+"%1"
+
+#: ../widgets/XcaTreeView.cpp:553
 msgctxt "XcaTreeView|"
 msgid "New"
 msgstr "Nový"
 
-#: ../widgets/XcaTreeView.cpp:523
+#: ../widgets/XcaTreeView.cpp:554
 msgctxt "XcaTreeView|"
 msgid "Import"
 msgstr "Importovať"
 
-#: ../widgets/XcaTreeView.cpp:524
+#: ../widgets/XcaTreeView.cpp:555
 msgctxt "XcaTreeView|"
 msgid "Paste PEM data"
 msgstr "Vložiť dáta PEM"
 
-#: ../widgets/XcaTreeView.cpp:528
+#: ../widgets/XcaTreeView.cpp:559
 msgctxt "XcaTreeView|"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: ../widgets/XcaTreeView.cpp:529
+#: ../widgets/XcaTreeView.cpp:560
 msgctxt "XcaTreeView|"
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../widgets/XcaTreeView.cpp:532
+#: ../widgets/XcaTreeView.cpp:563
 msgctxt "XcaTreeView|"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../widgets/XcaTreeView.cpp:534
+#: ../widgets/XcaTreeView.cpp:565
 msgctxt "XcaTreeView|"
 msgid "Export"
 msgstr "Exportovať"
 
-#: ../widgets/XcaTreeView.cpp:538
+#: ../widgets/XcaTreeView.cpp:567
 msgctxt "XcaTreeView|"
 msgid "Clipboard"
 msgstr "Schránka"
 
-#: ../widgets/XcaTreeView.cpp:540
+#: ../widgets/XcaTreeView.cpp:573
 msgctxt "XcaTreeView|"
 msgid "File"
 msgstr "Súbor"
 
-#: ../widgets/XcaTreeView.cpp:602
+#: ../widgets/XcaTreeView.cpp:635
 msgctxt "XcaTreeView|"
 msgid "Clipboard format"
 msgstr "Formát schránky"
@@ -3523,7 +3632,7 @@ msgstr "Importovať z: %1"
 #, qt-format
 msgctxt "db_base|"
 msgid "Could not create directory %1"
-msgstr "Nemožno vytvoriť zložku %1"
+msgstr "Nemožno vytvoriť adresár %1"
 
 #: ../lib/db_crl.cpp:26
 msgctxt "db_crl|"
@@ -3649,12 +3758,7 @@ msgctxt "db_key|"
 msgid "You are sure to create a key of the size: %1 ?"
 msgstr "Naozaj chcete vytvoriť kľúč s veľkosťou: %1?"
 
-#: ../lib/db_key.cpp:242
-msgctxt "db_key|"
-msgid "Internal error"
-msgstr "Interná chyba"
-
-#: ../lib/db_key.cpp:282
+#: ../lib/db_key.cpp:284
 #, qt-format
 msgctxt "db_key|"
 msgid ""
@@ -3664,7 +3768,7 @@ msgstr ""
 "Interná aktualizácia kľúča: Kľúče: %1 musia byť pri zmene a aktualizácii ich "
 "hesla aktualizované"
 
-#: ../lib/db_key.cpp:296
+#: ../lib/db_key.cpp:298
 msgctxt "db_key|"
 msgid "Tried to change password of a token"
 msgstr "Vyskúšaná zmena hesla tokenu"
@@ -3753,7 +3857,7 @@ msgid ""
 "'%1'\n"
 "and so it was not imported"
 msgstr ""
-"Certifikát v databáze už existuje ako:\n"
+"Certifikát už v databáze existuje ako:\n"
 "„%1”,\n"
 "a tak nebol importovaný"
 
@@ -3782,7 +3886,7 @@ msgstr "Kľúč, zvolený na podpísanie, nie je súkromný."
 #, qt-format
 msgctxt "db_x509|"
 msgid "Failed to create directory '%1'"
-msgstr "Nemožno vytvoriť zložku „%1”"
+msgstr "Vytvorenie adresára „%1” zlyhalo"
 
 #: ../lib/db_x509.cpp:521
 #, qt-format
@@ -3790,19 +3894,19 @@ msgctxt "db_x509|"
 msgid "Store the certificate to the key on the token '%1 (#%2)' ?"
 msgstr "Uložiť certifikát do kľúča na tokene „%1 (#%2)”?"
 
-#: ../lib/db_x509.cpp:627 ../lib/db_x509.cpp:681
+#: ../lib/db_x509.cpp:617 ../lib/db_x509.cpp:703
 #, qt-format
 msgctxt "db_x509|"
 msgid "There was no key found for the Certificate: '%1'"
 msgstr "Nebol nájdený kľúč certifikátu: „%1”"
 
-#: ../lib/db_x509.cpp:630
+#: ../lib/db_x509.cpp:620
 #, qt-format
 msgctxt "db_x509|"
 msgid "Not possible for a token key: '%1'"
 msgstr "Nie je možné pre kľúč tokenu: „%1”"
 
-#: ../lib/db_x509.cpp:685
+#: ../lib/db_x509.cpp:707
 #, qt-format
 msgctxt "db_x509|"
 msgid "Not possible for the token-key Certificate '%1'"
@@ -4014,25 +4118,22 @@ msgctxt "pki_crl|"
 msgid "Successfully imported the revocation list '%1'"
 msgstr "Úspešne importovaný Zoznam odvolaní „%1”"
 
-#: ../lib/pki_crl.cpp:60
-#, qt-format
-msgctxt "pki_crl|"
-msgid "Delete the revocation list '%1'?"
-msgstr "Odstrániť Zoznam odvolaní „%1”?"
-
 #: ../lib/pki_crl.cpp:61
 #, qt-format
 msgctxt "pki_crl|"
 msgid "Successfully created the revocation list '%1'"
 msgstr "Úspešne vytvorený Zoznam odvolaní „%1”"
 
-#: ../lib/pki_crl.cpp:63
+#: ../lib/pki_crl.cpp:60
 #, qt-format
 msgctxt "pki_crl|"
-msgid "Delete the %1 revocation lists: %2?"
-msgstr "Odstrániť %1 uoznamov odvolaní: %2?"
+msgid "Delete the %n revocation list(s): '%1'?"
+msgid_plural "Delete the %n revocation list(s): '%1'?"
+msgstr[0] "Odstrániť zoznam odvolaní: '%1'?"
+msgstr[1] "Odstrániť %n zoznamy odvolaní: '%1'?"
+msgstr[2] "Odstrániť %n zoznamov odvolaní: '%1'?"
 
-#: ../lib/pki_crl.cpp:147
+#: ../lib/pki_crl.cpp:145
 #, qt-format
 msgctxt "pki_crl|"
 msgid ""
@@ -4041,18 +4142,18 @@ msgid ""
 msgstr ""
 "Nemožno načítať zoznam odvolaní zo súboru %1. Vyskúšaný formát CRL PEM a DER."
 
-#: ../lib/pki_crl.cpp:162
+#: ../lib/pki_crl.cpp:160
 msgctxt "pki_crl|"
 msgid "No issuer given"
 msgstr "Nebol zadaný vydavateľ"
 
-#: ../lib/pki_crl.cpp:423
+#: ../lib/pki_crl.cpp:421
 #, qt-format
 msgctxt "pki_crl|"
 msgid "CRL Renewal of CA '%1' due"
 msgstr "Termín obnovenia CRL CA „%1”"
 
-#: ../lib/pki_crl.cpp:424
+#: ../lib/pki_crl.cpp:422
 #, qt-format
 msgctxt "pki_crl|"
 msgid ""
@@ -4062,13 +4163,13 @@ msgstr ""
 "Posledné CRL vydané CA „%1” vyprší %2.\n"
 "Je uložené v databáze XCA „%3”"
 
-#: ../lib/pki_crl.cpp:432
+#: ../lib/pki_crl.cpp:430
 #, qt-format
 msgctxt "pki_crl|"
 msgid "Renew CRL: %1"
 msgstr "Obnoviť CRL: %1"
 
-#: ../lib/pki_crl.cpp:433
+#: ../lib/pki_crl.cpp:431
 #, qt-format
 msgctxt "pki_crl|"
 msgid ""
@@ -4078,19 +4179,19 @@ msgstr ""
 "XCA CRL „%1”, vydané %3 vyprší %4.\n"
 "Je uložené v databáze XCA „%5”"
 
-#: ../lib/pki_evp.cpp:239
+#: ../lib/pki_evp.cpp:240
 #, qt-format
 msgctxt "pki_evp|"
 msgid "Please enter the password to decrypt the private key %1."
 msgstr "Prosím, zadajte heslo na dešifrovanie súkromného kľúča %1."
 
-#: ../lib/pki_evp.cpp:307
+#: ../lib/pki_evp.cpp:308
 #, qt-format
 msgctxt "pki_evp|"
 msgid "The key from file '%1' is incomplete or inconsistent."
 msgstr "Kľúč zo súboru „%1” je nekompletný ale nekonzistentný."
 
-#: ../lib/pki_evp.cpp:396
+#: ../lib/pki_evp.cpp:397
 #, qt-format
 msgctxt "pki_evp|"
 msgid ""
@@ -4100,7 +4201,7 @@ msgstr ""
 "Prosím, zadajte heslo na dešifrovanie súkromného kľúča zo súboru:\n"
 "%1"
 
-#: ../lib/pki_evp.cpp:463
+#: ../lib/pki_evp.cpp:464
 #, qt-format
 msgctxt "pki_evp|"
 msgid ""
@@ -4110,67 +4211,74 @@ msgstr ""
 "Nemožno načítať súkromný kľúč zo súboru %1. Vyskúšaný PEM a DER súkromný, "
 "verejný, typy kľúčov PKCS#8 a formát SSH2."
 
-#: ../lib/pki_evp.cpp:486
+#: ../lib/pki_evp.cpp:487
 #, qt-format
 msgctxt "pki_evp|"
 msgid "Please enter the password to decrypt the private key: '%1'"
 msgstr "Prosím, zadajte heslo na dešifrovanie súkromného kľúča: „%1”"
 
-#: ../lib/pki_evp.cpp:489 ../lib/pki_evp.cpp:500
+#: ../lib/pki_evp.cpp:490 ../lib/pki_evp.cpp:501
 msgctxt "pki_evp|"
 msgid "Password input aborted"
 msgstr "Zadávanie hesla zrušené"
 
-#: ../lib/pki_evp.cpp:496
+#: ../lib/pki_evp.cpp:497
 #, qt-format
 msgctxt "pki_evp|"
 msgid "Please enter the database password for decrypting the key '%1'"
 msgstr "Prosím, zadajte heslo databázy na dešifrovanie kľúča „%1”"
 
-#: ../lib/pki_evp.cpp:520
+#: ../lib/pki_evp.cpp:521
 #, qt-format
 msgctxt "pki_evp|"
 msgid "Decryption of private key '%1' failed"
 msgstr "Dešifrovanie súkromného kľúča „%1” zlyhalo"
 
-#: ../lib/pki_evp.cpp:648
+#: ../lib/pki_evp.cpp:649
 #, qt-format
 msgctxt "pki_evp|"
 msgid "Please enter the password to protect the private key: '%1'"
 msgstr "Prosím, zadajte heslo na ochranu súkromného kľúča: „%1”"
 
-#: ../lib/pki_evp.cpp:666
+#: ../lib/pki_evp.cpp:667
 msgctxt "pki_evp|"
 msgid "Please enter the database password for encrypting the key"
 msgstr "Prosím, zadajte heslo databázy na zašifrovanie kľúča"
 
-#: ../lib/pki_evp.cpp:823
-#, qt-format
-msgctxt "pki_evp|"
-msgid "Please enter the password protecting the PKCS#8 key '%1'"
-msgstr "Prosím, zadajte heslo na ochranu kľúča PKCS#8 „%1”"
-
-#: ../lib/pki_evp.cpp:843
+#: ../lib/pki_evp.cpp:849
 #, qt-format
 msgctxt "pki_evp|"
-msgid "Please enter the password protecting the Microsoft PVK key '%1'"
-msgstr "Prosím, zadajte heslo na ochranu kľúča Microsoft PVK „%1”"
+msgid ""
+"Please enter the password to protect the PKCS#8 key '%1' in file:\n"
+"%2"
+msgstr ""
+"Prosím, zadajte heslo na ochranu kľúča PKCS#8 „%1” v súbore:\n"
+"%2"
 
-#: ../lib/pki_evp.cpp:895
+#: ../lib/pki_evp.cpp:906
 #, qt-format
 msgctxt "pki_evp|"
-msgid "Please enter the export password for the private key '%1'"
-msgstr "Prosím, zadajte heslo exportu súkromného kľúča „%1”"
+msgid ""
+"Please enter the password to protect the private key '%1' in file:\n"
+"%2"
+msgstr ""
+"Prosím, zadajte heslo na ochranu súkromného kľúča: „%1” v súbore:\n"
+"%2"
 
-#: ../lib/pki_export.cpp:64 ../lib/pki_export.cpp:93 ../lib/pki_export.cpp:97
+#: ../lib/pki_export.cpp:64 ../lib/pki_export.cpp:99 ../lib/pki_export.cpp:103
 msgctxt "pki_export|"
 msgid "PEM Text format with headers"
 msgstr "Textový formát PEM s hlavičkami"
 
 #: ../lib/pki_export.cpp:65
 msgctxt "pki_export|"
-msgid "Concatenated list of all selected items in one PEM text file"
-msgstr "Zlúčený zoznam zvolených položiek v jednom textovom súbore PEM"
+msgid "PEM selected"
+msgstr "PEM zvolený"
+
+#: ../lib/pki_export.cpp:65
+msgctxt "pki_export|"
+msgid "Concatenated list of all selected certificates in one PEM text file"
+msgstr "Zlúčený zoznam zvolených certifikátov v jednom textovom súbore PEM"
 
 #: ../lib/pki_export.cpp:66
 msgctxt "pki_export|"
@@ -4216,56 +4324,79 @@ msgstr ""
 
 #: ../lib/pki_export.cpp:70
 msgctxt "pki_export|"
+msgid "All unusable"
+msgstr "Všetky nepoužiteľné"
+
+#: ../lib/pki_export.cpp:70
+msgctxt "pki_export|"
+msgid "Concatenation of all expired or revoked certificates in one PEM file"
+msgstr ""
+"Zlúčenie všetkých vypršaných alebo odvolaných certifikátov v jednom súbore "
+"PEM"
+
+#: ../lib/pki_export.cpp:71
+msgctxt "pki_export|"
 msgid "PKCS#7 encoded single certificate"
 msgstr "Jeden certifikát, kódovaný PKCS#7"
 
-#: ../lib/pki_export.cpp:71
+#: ../lib/pki_export.cpp:72
 msgctxt "pki_export|"
 msgid "All selected certificates encoded in one PKCS#7 file"
 msgstr "Všetky zvolené certifikáty kódované v jednom súbore PKCS#7"
 
-#: ../lib/pki_export.cpp:72
+#: ../lib/pki_export.cpp:73
 msgctxt "pki_export|"
 msgid "PKCS #7 chain"
 msgstr "Reťaz PKCS #7"
 
-#: ../lib/pki_export.cpp:72
+#: ../lib/pki_export.cpp:73
 msgctxt "pki_export|"
 msgid "PKCS#7 encoded complete certificate chain"
 msgstr "Úplná reťaz certifikátov kódovaná v PKCS#7"
 
-#: ../lib/pki_export.cpp:73
+#: ../lib/pki_export.cpp:74
+msgctxt "pki_export|"
+msgid "PKCS #7 unusable"
+msgstr "PKCS#7 nepoužiteľné"
+
+#: ../lib/pki_export.cpp:74
+msgctxt "pki_export|"
+msgid "PKCS#7 encoded collection of all expired or revoked certificates"
+msgstr ""
+"Kódovaná kolekcia PKCS#7 všetkých vypršaných alebo odvolaných certifikátov"
+
+#: ../lib/pki_export.cpp:75
 msgctxt "pki_export|"
 msgid "Binary DER encoded certificate"
 msgstr "Binárne kódovaný certifikát DER"
 
-#: ../lib/pki_export.cpp:74
+#: ../lib/pki_export.cpp:76
 msgctxt "pki_export|"
 msgid "PKCS #12 chain"
 msgstr "Reťaz PKCS #12"
 
-#: ../lib/pki_export.cpp:74
+#: ../lib/pki_export.cpp:76
 msgctxt "pki_export|"
 msgid ""
 "The complete certificate chain and the private key as encrypted PKCS#12 file"
 msgstr "Úplná reťaz certifikátu a súkromný kľúč ako šifrovaný súbor PKCS#12"
 
-#: ../lib/pki_export.cpp:75
+#: ../lib/pki_export.cpp:77
 msgctxt "pki_export|"
 msgid "PKCS #12"
 msgstr "PKCS #12"
 
-#: ../lib/pki_export.cpp:75
+#: ../lib/pki_export.cpp:77
 msgctxt "pki_export|"
 msgid "The certificate and the private key as encrypted PKCS#12 file"
 msgstr "Certifikát a súkromný kľúč ako šifrovaný súbor PKCS#12"
 
-#: ../lib/pki_export.cpp:76
+#: ../lib/pki_export.cpp:78
 msgctxt "pki_export|"
 msgid "Certificate Index file"
 msgstr "Súbor indexu certifikátov"
 
-#: ../lib/pki_export.cpp:76
+#: ../lib/pki_export.cpp:78
 msgctxt "pki_export|"
 msgid ""
 "OpenSSL specific Certificate Index file as created by the 'ca' command and "
@@ -4274,22 +4405,22 @@ msgstr ""
 "Súbor indexu certifikátov, špecifický pre OpenSSL, vytvorený ako príkazom "
 "„ca” a vyžadovaný nástrojom OCSP"
 
-#: ../lib/pki_export.cpp:77 ../lib/pki_export.cpp:99
+#: ../lib/pki_export.cpp:79 ../lib/pki_export.cpp:105
 msgctxt "pki_export|"
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: ../lib/pki_export.cpp:77
+#: ../lib/pki_export.cpp:79
 msgctxt "pki_export|"
 msgid "vCalendar expiry reminder for the selected items"
 msgstr "Pripomienka vCalendar vypršania platnosti zvolených položiek"
 
-#: ../lib/pki_export.cpp:78
+#: ../lib/pki_export.cpp:80
 msgctxt "pki_export|"
 msgid "CA vCalendar"
 msgstr "CA vCalendar"
 
-#: ../lib/pki_export.cpp:78
+#: ../lib/pki_export.cpp:80
 msgctxt "pki_export|"
 msgid ""
 "vCalendar expiry reminder containing all issued, valid certificates, the CA "
@@ -4298,12 +4429,12 @@ msgstr ""
 "Pripomienka vCalendar vypršania platnosti všetkých vydaných, platných "
 "certifikátov, samotnej CA i posledného CRL"
 
-#: ../lib/pki_export.cpp:79 ../lib/pki_export.cpp:95
+#: ../lib/pki_export.cpp:81 ../lib/pki_export.cpp:101
 msgctxt "pki_export|"
 msgid "OpenSSL config"
 msgstr "Konfigurácia OpenSSL"
 
-#: ../lib/pki_export.cpp:79 ../lib/pki_export.cpp:95
+#: ../lib/pki_export.cpp:81 ../lib/pki_export.cpp:101
 msgctxt "pki_export|"
 msgid ""
 "OpenSSL configuration file to create a certificate or request with the "
@@ -4312,214 +4443,279 @@ msgstr ""
 "Konfiguračný súbor OpenSSL na vytvorenie certifikátu alebo žiadosti pomocou "
 "nástroja príkazového riadka openssl"
 
-#: ../lib/pki_export.cpp:80
+#: ../lib/pki_export.cpp:82
 msgctxt "pki_export|"
 msgid "OpenVPN tls-auth key"
 msgstr "Kľúč OpenVPN tls-auth"
 
-#: ../lib/pki_export.cpp:80
+#: ../lib/pki_export.cpp:82
 msgctxt "pki_export|"
 msgid "The OpenVPN tls-auth key is a secret key shared between endpoints"
 msgstr "Kľúč OpenVPN tls-auth je tajný kľúč zdieľaný medzi koncovými bodmi"
 
-#: ../lib/pki_export.cpp:82
+#: ../lib/pki_export.cpp:83
+msgctxt "pki_export|"
+msgid "JSON Web Kit"
+msgstr "JSON Web Kit"
+
+#: ../lib/pki_export.cpp:83
+msgctxt "pki_export|"
+msgid ""
+"The public key of the certificate in JSON Web Kit format with X.509 "
+"Certificate Thumbprint (x5t)"
+msgstr ""
+"Verejný kľúč certifikátu vo formáte JSON Web Kit s X.509 Certificate "
+"Thumbprint (x5t)"
+
+#: ../lib/pki_export.cpp:84
+msgctxt "pki_export|"
+msgid "JSON Web Kit chain"
+msgstr "Reťaz JSON Web Kit"
+
+#: ../lib/pki_export.cpp:84
+msgctxt "pki_export|"
+msgid ""
+"The public key of the certificate in JSON Web Kit format with X.509 "
+"Certificate Thumbprint (x5t) and certificate chain (x5c)"
+msgstr ""
+"Verejný kľúč certifikátu vo formáte JSON Web Kit s X.509 Certificate "
+"Thumbprint (x5t) a reťazou certifikátu (x5c)"
+
+#: ../lib/pki_export.cpp:86
 msgctxt "pki_export|"
 msgid "PEM public"
 msgstr "PEM verejný"
 
-#: ../lib/pki_export.cpp:82
+#: ../lib/pki_export.cpp:86
 msgctxt "pki_export|"
 msgid "Text format of the public key in one PEM file"
 msgstr "Textový formát verejného kľúča v súbore PEM"
 
-#: ../lib/pki_export.cpp:83
+#: ../lib/pki_export.cpp:87
 msgctxt "pki_export|"
 msgid "PEM private"
 msgstr "PEM súkromný"
 
-#: ../lib/pki_export.cpp:83 ../lib/pki_export.cpp:85
+#: ../lib/pki_export.cpp:87 ../lib/pki_export.cpp:89
 msgctxt "pki_export|"
 msgid "Unencrypted private key in text format"
 msgstr "Nešifrovaný súkromný kľúč v textovom formáte"
 
-#: ../lib/pki_export.cpp:84
+#: ../lib/pki_export.cpp:88
 msgctxt "pki_export|"
 msgid "PEM encrypted"
 msgstr "PEM šifrovaný"
 
-#: ../lib/pki_export.cpp:84
+#: ../lib/pki_export.cpp:88
 msgctxt "pki_export|"
 msgid "OpenSSL specific encrypted private key in text format"
 msgstr "Šifrovaný súkromný kľúč v textovom formáte špecifickom pre OpenSSL"
 
-#: ../lib/pki_export.cpp:85
+#: ../lib/pki_export.cpp:89
 msgctxt "pki_export|"
 msgid "SSH2 private"
 msgstr "SSH2 súkromný"
 
-#: ../lib/pki_export.cpp:86
+#: ../lib/pki_export.cpp:90
 msgctxt "pki_export|"
 msgid "SSH2 public"
 msgstr "SSH2 verejný"
 
-#: ../lib/pki_export.cpp:86
+#: ../lib/pki_export.cpp:90
 msgctxt "pki_export|"
 msgid "The public key encoded in SSH2 format"
 msgstr "Verejný kľúč kódovaný vo formáte SSH2"
 
-#: ../lib/pki_export.cpp:87
+#: ../lib/pki_export.cpp:91
 msgctxt "pki_export|"
 msgid "DER public"
 msgstr "DER verejný"
 
-#: ../lib/pki_export.cpp:87
+#: ../lib/pki_export.cpp:91
 msgctxt "pki_export|"
 msgid "Binary DER format of the public key"
 msgstr "Binárny formát DER verejného kľúča"
 
-#: ../lib/pki_export.cpp:88
+#: ../lib/pki_export.cpp:92
 msgctxt "pki_export|"
 msgid "DER private"
 msgstr "DER súkromný"
 
-#: ../lib/pki_export.cpp:88
+#: ../lib/pki_export.cpp:92
 msgctxt "pki_export|"
 msgid "Unencrypted private key in binary DER format"
 msgstr "Nešifrovaný súkromný kľúč v binárnom formáte DER"
 
-#: ../lib/pki_export.cpp:89
+#: ../lib/pki_export.cpp:93
 msgctxt "pki_export|"
 msgid "PVK private"
 msgstr "PVK súkromný"
 
-#: ../lib/pki_export.cpp:89
+#: ../lib/pki_export.cpp:93
 msgctxt "pki_export|"
 msgid "Private key in Microsoft PVK format not encrypted"
 msgstr "Nešifrovaný súkromný kľúč vo formáte Microsoft PVK"
 
-#: ../lib/pki_export.cpp:90
+#: ../lib/pki_export.cpp:94
 msgctxt "pki_export|"
 msgid "PKCS #8 encrypted"
 msgstr "PKCS #8 šifrovaný"
 
-#: ../lib/pki_export.cpp:90
+#: ../lib/pki_export.cpp:94
 msgctxt "pki_export|"
 msgid "Encrypted private key in PKCS#8 text format"
 msgstr "Šifrovaný súkromný kľúč v textovom formáte PKCS#8"
 
-#: ../lib/pki_export.cpp:91
+#: ../lib/pki_export.cpp:95
 msgctxt "pki_export|"
 msgid "PKCS #8"
 msgstr "PKCS #8"
 
-#: ../lib/pki_export.cpp:91
+#: ../lib/pki_export.cpp:95
 msgctxt "pki_export|"
 msgid "Unencrypted private key in PKCS#8 text format"
 msgstr "Nešifrovaný súkromný kľúč v textovom formáte PKCS#8"
 
-#: ../lib/pki_export.cpp:94
+#: ../lib/pki_export.cpp:96
+msgctxt "pki_export|"
+msgid "JSON Web Key private"
+msgstr "Súkromný kľúč JSON Web Key"
+
+#: ../lib/pki_export.cpp:96
+msgctxt "pki_export|"
+msgid "Unencrypted private key in JSON Web Key format"
+msgstr "Nešifrovaný súkromný kľúč vo formáte JSON Web Key"
+
+#: ../lib/pki_export.cpp:97
+msgctxt "pki_export|"
+msgid "JSON Web Key public"
+msgstr "Verejný kľúč JSON Web Key"
+
+#: ../lib/pki_export.cpp:97
+msgctxt "pki_export|"
+msgid "Public key in JSON Web Key format"
+msgstr "Verejný kľúč vo formáte JSON Web Key"
+
+#: ../lib/pki_export.cpp:100
 msgctxt "pki_export|"
 msgid "Binary DER format of the certificate request"
 msgstr "Binárny formát DER žiadosti o certifikát"
 
-#: ../lib/pki_export.cpp:98
+#: ../lib/pki_export.cpp:104
 msgctxt "pki_export|"
 msgid "Binary DER format of the revocation list"
 msgstr "Binárny formát DER zoznamu odvolaní"
 
-#: ../lib/pki_export.cpp:99
+#: ../lib/pki_export.cpp:105
 msgctxt "pki_export|"
 msgid "vCalendar reminder for the CRL expiry date"
 msgstr "Pripomienka vCalendar vypršania platnosti CRL"
 
-#: ../lib/pki_export.cpp:101
+#: ../lib/pki_export.cpp:107
 msgctxt "pki_export|"
-msgid "XCA template in PEM-like format"
-msgstr "Šablóna XCA vo formáte podobnom PEM"
+msgid ""
+"XCA template in PEM-like format. Templates include the internal name and "
+"comment"
+msgstr ""
+"Šablóna XCA vo formáte podobnom PEM. Šablóna zahŕňa interné meno a komentár"
 
-#: ../lib/pki_export.cpp:102
+#: ../lib/pki_export.cpp:108
 msgctxt "pki_export|"
-msgid "All selected XCA templates in PEM-like format"
-msgstr "Všetky šablóny XCA vo formáte podobnom PEM"
+msgid ""
+"All selected XCA templates in PEM-like format. Templates include the "
+"internal name and comment"
+msgstr ""
+"Všetky zvolené šablóny XCA vo formáte podobnom PEM. Šablóny zahŕňajú interné "
+"meno a komentár"
 
-#: ../lib/pki_key.cpp:202
-#, qt-format
+#: ../lib/pki_key.cpp:59 ../lib/pki_key.cpp:236 ../lib/pki_key.cpp:856
 msgctxt "pki_key|"
+msgid "Public key"
+msgstr "Verejný kľúč"
+
+#: ../lib/pki_key.cpp:212
+#, qt-format
+msgctxt ""
+"pki_key|%1 will be replaced by 'RSA', 'DSA', 'EC'. %2 is the internal name "
+"of the key"
 msgid "Successfully imported the %1 public key '%2'"
 msgstr "Úspešne importovaný %1 verejný kľúč „%2”"
 
-#: ../lib/pki_key.cpp:203
+#: ../lib/pki_key.cpp:214
 #, qt-format
-msgctxt "pki_key|"
-msgid "Delete the %1 public key '%2'?"
-msgstr "Odstrániť %1 verejný kľúč „%2”?"
+msgctxt ""
+"pki_key|%1 will be replaced by 'RSA', 'DSA', 'EC'. %2 is/are the internal "
+"name(s) of the key(s)"
+msgid "Delete the %n %1 public key(s) '%2'?"
+msgid_plural "Delete the %n %1 public key(s) '%2'?"
+msgstr[0] "Odstrániť %1 verejný kľúč „%2”?"
+msgstr[1] "Odstrániť %1 verejné kľúče „%2”?"
+msgstr[2] "Odstrániť %1 verejných kľúčov „%2”?"
 
-#: ../lib/pki_key.cpp:208
+#: ../lib/pki_key.cpp:220
 #, qt-format
-msgctxt "pki_key|"
+msgctxt ""
+"pki_key|%1 will be replaced by 'RSA', 'DSA', 'EC'. %2 is the internal name "
+"of the key"
 msgid "Successfully imported the %1 private key '%2'"
 msgstr "Úspešne importovaný %1 súkromný kľúč „%2”"
 
-#: ../lib/pki_key.cpp:209
+#: ../lib/pki_key.cpp:222
 #, qt-format
-msgctxt "pki_key|"
-msgid "Delete the %1 private key '%2'?"
-msgstr "Odstrániť %1 súkromný kľúč „%2”?"
+msgctxt ""
+"pki_key|%1 will be replaced by 'RSA', 'DSA', 'EC'. %2 is/are the internal "
+"name(s) of the key(s)"
+msgid "Delete the %n %1 private key(s) '%2'?"
+msgid_plural "Delete the %n %1 private key(s) '%2'?"
+msgstr[0] "Odstrániť %1 súkromný kľúč „%2”?"
+msgstr[1] "Odstrániť %1 súkromné kľúče „%2”?"
+msgstr[2] "Odstrániť %1 súkromných kľúčov „%2”?"
 
-#: ../lib/pki_key.cpp:210
+#: ../lib/pki_key.cpp:224
 #, qt-format
-msgctxt "pki_key|"
+msgctxt ""
+"pki_key|%1 will be replaced by 'RSA', 'DSA', 'EC'. %2 is the internal name "
+"of the key"
 msgid "Successfully created the %1 private key '%2'"
 msgstr "Úspešne vytvorený %1 súkromný kľúč „%2”"
 
-#: ../lib/pki_key.cpp:216
-#, qt-format
-msgctxt "pki_key|"
-msgid "Delete the %1 keys: %2?"
-msgstr "Odstrániť %1 kľúčov: %2?"
-
-#: ../lib/pki_key.cpp:58 ../lib/pki_key.cpp:225 ../lib/pki_key.cpp:874
-msgctxt "pki_key|"
-msgid "Public key"
-msgstr "Verejný kľúč"
-
-#: ../lib/pki_key.cpp:466
+#: ../lib/pki_key.cpp:454
 msgctxt "pki_key|"
 msgid "Common"
 msgstr "Spoločný"
 
-#: ../lib/pki_key.cpp:466
+#: ../lib/pki_key.cpp:454
 msgctxt "pki_key|"
 msgid "Private"
 msgstr "Súkromný"
 
-#: ../lib/pki_key.cpp:466
+#: ../lib/pki_key.cpp:454
 msgctxt "pki_key|"
 msgid "Bogus"
 msgstr "Pododný"
 
-#: ../lib/pki_key.cpp:466
+#: ../lib/pki_key.cpp:454
 msgctxt "pki_key|"
 msgid "PIN"
 msgstr "PIN"
 
-#: ../lib/pki_key.cpp:476
+#: ../lib/pki_key.cpp:464
 msgctxt "pki_key|"
 msgid "No password"
 msgstr "Bez hesla"
 
-#: ../lib/pki_key.cpp:573 ../lib/pki_key.cpp:678
+#: ../lib/pki_key.cpp:561 ../lib/pki_key.cpp:666
 #, qt-format
 msgctxt "pki_key|"
 msgid "Unexpected SSH2 content: '%1'"
 msgstr "Neočakávaný obsah SSH2: „%1”"
 
-#: ../lib/pki_key.cpp:593 ../lib/pki_key.cpp:599
+#: ../lib/pki_key.cpp:581 ../lib/pki_key.cpp:587
 msgctxt "pki_key|"
 msgid "Invalid SSH2 public key"
 msgstr "Neplatný verejný kľúč SSH2"
 
-#: ../lib/pki_key.cpp:796
+#: ../lib/pki_key.cpp:778
 #, qt-format
 msgctxt "pki_key|"
 msgid "Failed writing to %1"
@@ -4552,12 +4748,19 @@ msgctxt "pki_pkcs12|"
 msgid "The supplied password was wrong (%1)"
 msgstr "Zadané heslo je zlé (%1)"
 
-#: ../lib/pki_pkcs12.cpp:137
+#: ../lib/pki_pkcs12.cpp:141
+#, qt-format
 msgctxt "pki_pkcs12|"
-msgid "Please enter the password to encrypt the PKCS#12 file"
-msgstr "Prosím, zadajte heslo na zašifrovanie súboru PKCS#12"
+msgid ""
+"Please enter the password to encrypt the key of certificate '%1' in the "
+"PKCS#12 file:\n"
+"%2"
+msgstr ""
+"Prosím, zadajte heslo na zašifrovanie kľúča certifikátu „%1” v súbore "
+"PKCS#12:\n"
+"%2"
 
-#: ../lib/pki_pkcs12.cpp:140
+#: ../lib/pki_pkcs12.cpp:138
 msgctxt "pki_pkcs12|"
 msgid "No key or no Cert and no pkcs12"
 msgstr "Nie je to kľúč, ani Certifikát a ani PKCS#12"
@@ -4574,142 +4777,130 @@ msgctxt "pki_scard|"
 msgid "Successfully imported the token key '%1'"
 msgstr "Úspešne importovaný kľúč tokenu „%1”"
 
-#: ../lib/pki_scard.cpp:47
-#, qt-format
-msgctxt "pki_scard|"
-msgid "Delete the token key '%1'?"
-msgstr "Odstrániť kľúč tokenu „%1”?"
-
 #: ../lib/pki_scard.cpp:48
 #, qt-format
 msgctxt "pki_scard|"
 msgid "Successfully created the token key '%1'"
 msgstr "úspešne vytvorený kľúč tokenu „%1”"
 
-#: ../lib/pki_scard.cpp:50
+#: ../lib/pki_scard.cpp:47
 #, qt-format
 msgctxt "pki_scard|"
-msgid "Delete the %1 keys: %2?"
-msgstr "Odstrániť %1 kľúčov: %2?"
+msgid "Delete the %n token key(s): '%1'?"
+msgid_plural "Delete the %n token key(s): '%1'?"
+msgstr[0] "Odstrániť kľúč tokenu „%1”?"
+msgstr[1] "Odstrániť %n kľúče tokenu „%1”?"
+msgstr[2] "Odstrániť %n kľúčov tokenu „%1”?"
 
-#: ../lib/pki_scard.cpp:377
+#: ../lib/pki_scard.cpp:375
 #, qt-format
 msgctxt "pki_scard|"
 msgid "Delete the private key '%1' from the token '%2 (#%3)' ?"
 msgstr "Odstrániť súkromný kľúč „%1” z tokenu „%2 (#%3)”?"
 
-#: ../lib/pki_scard.cpp:450
+#: ../lib/pki_scard.cpp:448
 msgctxt "pki_scard|"
 msgid "This Key is already on the token"
 msgstr "Tento kľúč už je na tokene"
 
-#: ../lib/pki_scard.cpp:534
+#: ../lib/pki_scard.cpp:532
 msgctxt "pki_scard|"
 msgid "PIN input aborted"
 msgstr "Zadanie PIN zrušené"
 
-#: ../lib/pki_scard.cpp:550
+#: ../lib/pki_scard.cpp:548
 msgctxt "pki_scard|"
 msgid "Unable to find copied key on the token"
 msgstr "Nemožno nájsť kópiu kľúča na tokene"
 
-#: ../lib/pki_scard.cpp:638
+#: ../lib/pki_scard.cpp:636
 #, qt-format
 msgctxt "pki_scard|"
 msgid "Please insert card: %1 %2 [%3] with Serial: %4"
 msgstr "Prosím, vložte kartu: %1 %2 [%3] so sér. číslom: %4"
 
-#: ../lib/pki_scard.cpp:692
+#: ../lib/pki_scard.cpp:690
 #, qt-format
 msgctxt "pki_scard|"
 msgid "Select Slot of %1"
 msgstr "Zvoliť slot z %1"
 
-#: ../lib/pki_scard.cpp:730
+#: ../lib/pki_scard.cpp:728
 msgctxt "pki_scard|"
 msgid "Unable to find generated key on card"
 msgstr "Nemožno nájsť vygenerovaný kľúč na karte"
 
-#: ../lib/pki_scard.cpp:741
+#: ../lib/pki_scard.cpp:739
 #, qt-format
 msgctxt "pki_scard|"
 msgid "Token %1"
 msgstr "Token %1"
 
-#: ../lib/pki_scard.cpp:750 ../lib/pki_scard.cpp:762
+#: ../lib/pki_scard.cpp:748 ../lib/pki_scard.cpp:760
 msgctxt "pki_scard|"
 msgid "Failed to find the key on the token"
 msgstr "Zlyhalo nájdenie kľúča na tokene"
 
-#: ../lib/pki_scard.cpp:756
+#: ../lib/pki_scard.cpp:754
 msgctxt "pki_scard|"
 msgid "Invalid Pin for the token"
 msgstr "Neplatný PIN tokenu"
 
-#: ../lib/pki_scard.cpp:768
+#: ../lib/pki_scard.cpp:766
 msgctxt "pki_scard|"
 msgid "Failed to initialize the key on the token"
 msgstr "Zlyhal inicializácia kľúča na tokene"
 
-#: ../lib/pki_temp.cpp:158
+#: ../lib/pki_temp.cpp:159
 #, qt-format
 msgctxt "pki_temp|"
 msgid "Successfully imported the XCA template '%1'"
 msgstr "Úspešne importovaná šablóna XCA „%1”"
 
-#: ../lib/pki_temp.cpp:159
-#, qt-format
-msgctxt "pki_temp|"
-msgid "Delete the XCA template '%1'?"
-msgstr "Odstrániť šablónu XCA „%1”?"
-
-#: ../lib/pki_temp.cpp:160
+#: ../lib/pki_temp.cpp:161
 #, qt-format
 msgctxt "pki_temp|"
 msgid "Successfully created the XCA template '%1'"
 msgstr "Úspešne vytvorená šablóna XCA „%1”"
 
-#: ../lib/pki_temp.cpp:162
+#: ../lib/pki_temp.cpp:160
 #, qt-format
 msgctxt "pki_temp|"
-msgid "Delete the %1 XCA templates: %2?"
-msgstr "Odstrániť %1 šablón XCA: %2?"
+msgid "Delete the %n XCA template(s): '%1'?"
+msgid_plural "Delete the %n XCA template(s): '%1'?"
+msgstr[0] "Odstrániť šablónu XCA „%1”?"
+msgstr[1] "Odstrániť %n šablóny XCA „%1”?"
+msgstr[2] "Odstrániť %n šablón XCA „%1”?"
 
-#: ../lib/pki_temp.cpp:362
+#: ../lib/pki_temp.cpp:373
 #, qt-format
 msgctxt "pki_temp|"
 msgid "Wrong Size %1"
 msgstr "Zlá veľkosť %1"
 
-#: ../lib/pki_temp.cpp:449
+#: ../lib/pki_temp.cpp:471
 msgctxt "pki_temp|"
 msgid "Template file content error (too small)"
 msgstr "Chyba obsahu súboru šablóny (príliš malá)"
 
-#: ../lib/pki_temp.cpp:499
+#: ../lib/pki_temp.cpp:521
 msgctxt "pki_temp|"
 msgid "Not a PEM encoded XCA Template"
 msgstr "Šablóna XCA nie je vo formáte PEM"
 
-#: ../lib/pki_temp.cpp:507
+#: ../lib/pki_temp.cpp:528
 #, qt-format
 msgctxt "pki_temp|"
 msgid "Not an XCA Template, but '%1'"
 msgstr "Nie je šablóna XCA, ale „%1”"
 
-#: ../lib/pki_x509.cpp:62
+#: ../lib/pki_x509.cpp:65
 #, qt-format
 msgctxt "pki_x509|"
 msgid "Successfully imported the certificate '%1'"
 msgstr "Úspešne importovaný certifikát „%1”"
 
-#: ../lib/pki_x509.cpp:63
-#, qt-format
-msgctxt "pki_x509|"
-msgid "Delete the certificate '%1'?"
-msgstr "Odstrániť certifikát „%1”?"
-
-#: ../lib/pki_x509.cpp:64
+#: ../lib/pki_x509.cpp:67
 #, qt-format
 msgctxt "pki_x509|"
 msgid "Successfully created the certificate '%1'"
@@ -4718,10 +4909,13 @@ msgstr "Úspešne vytvorený certifikát „%1”"
 #: ../lib/pki_x509.cpp:66
 #, qt-format
 msgctxt "pki_x509|"
-msgid "Delete the %1 certificates: %2?"
-msgstr "Odstrániť %1 certifikátov: %2?"
+msgid "Delete the %n certificate(s): '%1'?"
+msgid_plural "Delete the %n certificate(s): '%1'?"
+msgstr[0] "Odstrániť certifikát „%1”?"
+msgstr[1] "Odstrániť %n certifikáty „%1”?"
+msgstr[2] "Odstrániť %n certifikátov „%1”?"
 
-#: ../lib/pki_x509.cpp:236
+#: ../lib/pki_x509.cpp:237
 #, qt-format
 msgctxt "pki_x509|"
 msgid ""
@@ -4729,64 +4923,64 @@ msgid ""
 msgstr ""
 "Nemožno načítať certifikát zo súboru %1. Vyskúšaný certifikát PEM a DER."
 
-#: ../lib/pki_x509.cpp:331
+#: ../lib/pki_x509.cpp:332
 msgctxt "pki_x509|"
 msgid "Invalid OpenVPN tls-auth key"
 msgstr "Neplatný kľúč OpenVPN tls-auth"
 
-#: ../lib/pki_x509.cpp:361
+#: ../lib/pki_x509.cpp:362
 msgctxt "pki_x509|"
 msgid "Failed to import tls-auth key"
 msgstr "Import kľúča tls-auth zlyhal"
 
-#: ../lib/pki_x509.cpp:364
+#: ../lib/pki_x509.cpp:365
 msgctxt "pki_x509|"
 msgid "Same tls-auth key already stored for this CA"
 msgstr "Táto CA už má nejaký kľúč tls-auth uložený"
 
-#: ../lib/pki_x509.cpp:366
+#: ../lib/pki_x509.cpp:367
 msgctxt "pki_x509|"
 msgid "New tls-auth key successfully imported"
 msgstr "Nový kľúč tls-auth úspešne importovaný"
 
-#: ../lib/pki_x509.cpp:368
+#: ../lib/pki_x509.cpp:369
 msgctxt "pki_x509|"
 msgid "Existing tls-auth key successfully replaced"
 msgstr "Existujúci kľúč tls-auth úspešne nahradený"
 
-#: ../lib/pki_x509.cpp:472
+#: ../lib/pki_x509.cpp:473
 msgctxt "pki_x509|"
 msgid "This certificate is already on the security token"
 msgstr "Tento certifikát už je na bezpečnostnom tokene"
 
-#: ../lib/pki_x509.cpp:535
+#: ../lib/pki_x509.cpp:536
 #, qt-format
 msgctxt "pki_x509|"
 msgid "Delete the certificate '%1' from the token '%2 (#%3)'?"
 msgstr "Odstrániť certifikát „%1” z tokenu „%2 (#%3)”?"
 
-#: ../lib/pki_x509.cpp:667
+#: ../lib/pki_x509.cpp:660
 msgctxt "pki_x509|"
 msgid "There is no key for signing !"
 msgstr "Chýba kľúč na podpísanie!"
 
-#: ../lib/pki_x509.cpp:971
+#: ../lib/pki_x509.cpp:972
 msgctxt "pki_x509|"
 msgid "No"
 msgstr "Nie"
 
-#: ../lib/pki_x509.cpp:973
+#: ../lib/pki_x509.cpp:974
 msgctxt "pki_x509|"
 msgid "Yes"
 msgstr "Áno"
 
-#: ../lib/pki_x509.cpp:1003
+#: ../lib/pki_x509.cpp:1004
 #, qt-format
 msgctxt "pki_x509|"
 msgid "Renew certificate: %1"
 msgstr "Obnoviť certifikát: %1"
 
-#: ../lib/pki_x509.cpp:1004
+#: ../lib/pki_x509.cpp:1005
 #, qt-format
 msgctxt "pki_x509|"
 msgid ""
@@ -4801,31 +4995,28 @@ msgctxt "pki_x509req|"
 msgid "Signing key not valid (public key)"
 msgstr "Podpisujúci kľúč neplatný (verejný kľúč)"
 
-#: ../lib/pki_x509req.cpp:150
+#: ../lib/pki_x509req.cpp:147
 #, qt-format
 msgctxt "pki_x509req|"
-msgid "Successfully imported the %1 certificate request '%2'"
-msgstr "úspešne importovaná %1 žiadosť o certifikát „%2”"
+msgid "Successfully imported the PKCS#10 certificate request '%1'"
+msgstr "Úspešne importovaná žiadosť o certifikát PKCS#10 „%1”"
 
-#: ../lib/pki_x509req.cpp:151
+#: ../lib/pki_x509req.cpp:148
 #, qt-format
 msgctxt "pki_x509req|"
-msgid "Delete the %1 certificate request '%2'?"
-msgstr "Odstrániť %1 žiadosť o certifikát „%2”?"
+msgid "Delete the %n PKCS#10 certificate request(s): '%1'?"
+msgid_plural "Delete the %n PKCS#10 certificate request(s): '%1'?"
+msgstr[0] "Odstrániť žiadosť o certifikát PKCS#10 „%1”?"
+msgstr[1] "Odstrániť %n žiadosti o certifikát PKCS#10 „%1”?"
+msgstr[2] "Odstrániť %n žiadostí o certifikát PKCS#10 „%1”?"
 
-#: ../lib/pki_x509req.cpp:152
+#: ../lib/pki_x509req.cpp:149
 #, qt-format
 msgctxt "pki_x509req|"
-msgid "Successfully created the %1 certificate request '%2'"
-msgstr "Úspešne vytvorená %1 žiadosť o certifikát „%2”"
+msgid "Successfully created the PKCS#10 certificate request '%1'"
+msgstr "Úspešne vytvorená žiadosť o certifikát PKCS#10 „%1”"
 
-#: ../lib/pki_x509req.cpp:154
-#, qt-format
-msgctxt "pki_x509req|"
-msgid "Delete the %1 certificate requests: %2?"
-msgstr "Odstrániť %1 žiadosť o certifikát: %2?"
-
-#: ../lib/pki_x509req.cpp:185
+#: ../lib/pki_x509req.cpp:180
 #, qt-format
 msgctxt "pki_x509req|"
 msgid ""
@@ -4835,12 +5026,12 @@ msgstr ""
 "Nemožno načítať žiadosť o certifikát zo súboru %1. Vyskúšané formáty PEM, "
 "DER a SPKAC."
 
-#: ../lib/pki_x509req.cpp:371
+#: ../lib/pki_x509req.cpp:366
 msgctxt "pki_x509req|"
 msgid "Signed"
 msgstr "Podpísaný"
 
-#: ../lib/pki_x509req.cpp:371
+#: ../lib/pki_x509req.cpp:366
 msgctxt "pki_x509req|"
 msgid "Unhandled"
 msgstr "Nespracované"
@@ -4947,6 +5138,78 @@ msgctxt "xcaWarningGui|"
 msgid "Copy to Clipboard"
 msgstr "Kopírovať do schránky"
 
+#~ msgctxt "TrustState|"
+#~ msgid "Certificate trust"
+#~ msgstr "D§veryhodnosť o certifikátu"
+
+#~ msgctxt "TrustState|"
+#~ msgid "Trustment"
+#~ msgstr "Dôveryhodnosť"
+
+#~ msgctxt "TrustState|"
+#~ msgid "&Never trust this certificate"
+#~ msgstr "Tomuto certifikátu &nikdy nedôverovať"
+
+#~ msgctxt "TrustState|"
+#~ msgid "Only &trust this certificate, if we trust the signer"
+#~ msgstr "Tomuto certifikátu &dôverovať, ak dôverujem vydavateľovi"
+
+#~ msgctxt "TrustState|"
+#~ msgid "&Always trust this certificate"
+#~ msgstr "Tomuto certifikátu &vždy dôverovať"
+
+#~ msgctxt "db_key|"
+#~ msgid "Internal error"
+#~ msgstr "Interná chyba"
+
+#, qt-format
+#~ msgctxt "pki_crl|"
+#~ msgid "Delete the %1 revocation lists: %2?"
+#~ msgstr "Odstrániť %1 uoznamov odvolaní: %2?"
+
+#, qt-format
+#~ msgctxt "pki_evp|"
+#~ msgid "Please enter the password protecting the Microsoft PVK key '%1'"
+#~ msgstr "Prosím, zadajte heslo na ochranu kľúča Microsoft PVK „%1”"
+
+#, qt-format
+#~ msgctxt "pki_evp|"
+#~ msgid "Please enter the export password for the private key '%1'"
+#~ msgstr "Prosím, zadajte heslo exportu súkromného kľúča „%1”"
+
+#~ msgctxt "pki_export|"
+#~ msgid "XCA template in PEM-like format"
+#~ msgstr "Šablóna XCA vo formáte podobnom PEM"
+
+#, qt-format
+#~ msgctxt "pki_key|"
+#~ msgid "Delete the %1 keys: %2?"
+#~ msgstr "Odstrániť %1 kľúčov: %2?"
+
+#~ msgctxt "pki_pkcs12|"
+#~ msgid "Please enter the password to encrypt the PKCS#12 file"
+#~ msgstr "Prosím, zadajte heslo na zašifrovanie súboru PKCS#12"
+
+#, qt-format
+#~ msgctxt "pki_scard|"
+#~ msgid "Delete the %1 keys: %2?"
+#~ msgstr "Odstrániť %1 kľúčov: %2?"
+
+#, qt-format
+#~ msgctxt "pki_temp|"
+#~ msgid "Delete the %1 XCA templates: %2?"
+#~ msgstr "Odstrániť %1 šablón XCA: %2?"
+
+#, qt-format
+#~ msgctxt "pki_x509|"
+#~ msgid "Delete the %1 certificates: %2?"
+#~ msgstr "Odstrániť %1 certifikátov: %2?"
+
+#, qt-format
+#~ msgctxt "pki_x509req|"
+#~ msgid "Delete the %1 certificate requests: %2?"
+#~ msgstr "Odstrániť %1 žiadosť o certifikát: %2?"
+
 #~ msgctxt "X509SuperTreeView|"
 #~ msgid "Save as OpenSSL config"
 #~ msgstr "Uložiť ako konfiguráciu OpenSSL"
@@ -4967,13 +5230,6 @@ msgstr "Kopírovať do schránky"
 #~ msgid "Concatenated text format of all certificates in one PEM file"
 #~ msgstr "Zlúčený textový formát všetkých certifikátov v jednom súbore PEM"
 
-#~ msgctxt "ExportDialog|"
-#~ msgid ""
-#~ "Concatenated text format of all unrevoked certificates in one PEM file"
-#~ msgstr ""
-#~ "Zlúčený textový formát všetkých dôveryhodných certifikátov v jednom "
-#~ "súbore PEM"
-
 #~ msgctxt "ExportDialog|"
 #~ msgid "All unrevoked certificates encoded in one PKCS#7 file"
 #~ msgstr "Všetky neodvolané certifikáty kódované v jednom súbore PKCS#7"
@@ -5048,10 +5304,6 @@ msgstr "Kopírovať do schránky"
 #~ msgid "All in one PEM file"
 #~ msgstr "Všetky v jednom súbore PEM"
 
-#~ msgctxt "db_base|"
-#~ msgid "Each item in one file"
-#~ msgstr "Každá položka v samostatnom súbore"
-
 #, qt-format
 #~ msgctxt "db_base|"
 #~ msgid "Save %1 items in one file as"
@@ -5095,10 +5347,6 @@ msgstr "Kopírovať do schránky"
 #~ msgid "PEM unrevoked"
 #~ msgstr "Neodvolané PEM"
 
-#~ msgctxt "db_x509|"
-#~ msgid "PKCS#7 all"
-#~ msgstr "PKCS#7 všetky"
-
 #~ msgctxt "db_x509|"
 #~ msgid "PEM all"
 #~ msgstr "PEM všetky"