[Winpt-commits] r280 - trunk/Po

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Jan 15 23:03:45 CET 2007


Author: twoaday
Date: 2007-01-15 23:03:31 +0100 (Mon, 15 Jan 2007)
New Revision: 280

Modified:
   trunk/Po/de.po
   trunk/Po/jp.po
   trunk/Po/pt_BR.po
   trunk/Po/sk.po
   trunk/Po/sv.po
Log:


Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2007-01-15 22:02:32 UTC (rev 279)
+++ trunk/Po/de.po	2007-01-15 22:03:31 UTC (rev 280)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 1.1.1\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-12-07 14:51+0100\n"
+"POT-Creation-Date: 2007-01-15 22:58+0100\n"
 "PO-Revision-Date: 2005-12-28 16:10+0100\n"
 "Last-Translator: Timo Schulz <ts at g10code.de>\n"
 "Language-Team: DE <twoaday at freakmail.de>\n"
@@ -24,7 +24,7 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:75
+#: Src/WinPT.cpp:71
 msgid ""
 "The gpg.conf contains at least one argument which points to a non-existing "
 "file."
@@ -32,67 +32,67 @@
 "Die gpg.conf Datei enthält mindestens ein Argument das auf einen ungültigen "
 "Dateinamen verweist."
 
-#: Src/WinPT.cpp:196
+#: Src/WinPT.cpp:192
 msgid "Could not create GPG home directory"
 msgstr "Konnte Heimatverzeichnis von GPG nicht erstellen"
 
-#: Src/WinPT.cpp:197 Src/WinPT.cpp:298 Src/WinPT.cpp:302 Src/WinPT.cpp:543
-#: Src/WinPT.cpp:552 Src/WinPT.cpp:559 Src/WinPT.cpp:582 Src/WinPT.cpp:592
-#: Src/WinPT.cpp:608 Src/WinPT.cpp:617 Src/WinPT.cpp:621 Src/WinPT.cpp:638
-#: Src/WinPT.cpp:707 Src/WinPT.cpp:720 Src/WinPT.cpp:767 Src/WinPT.cpp:810
-#: Src/WinPT.cpp:828 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:144
+#: Src/WinPT.cpp:193 Src/WinPT.cpp:294 Src/WinPT.cpp:298 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:555 Src/WinPT.cpp:578 Src/WinPT.cpp:588
+#: Src/WinPT.cpp:604 Src/WinPT.cpp:613 Src/WinPT.cpp:617 Src/WinPT.cpp:634
+#: Src/WinPT.cpp:703 Src/WinPT.cpp:716 Src/WinPT.cpp:763 Src/WinPT.cpp:806
+#: Src/WinPT.cpp:824 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:151
 #: Src/wptGPG.cpp:929 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951 Src/wptGPG.cpp:962
-#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:519
+#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:520
 msgid "WinPT Error"
 msgstr "WinPT Fehler"
 
-#: Src/WinPT.cpp:233
+#: Src/WinPT.cpp:229
 msgid "No useable secret key found."
 msgstr "Kein benutzbarer geheimer Schlüssel gefunden."
 
-#: Src/WinPT.cpp:234 Src/WinPT.cpp:245 Src/wptKeyPropsDlg.cpp:370
+#: Src/WinPT.cpp:230 Src/WinPT.cpp:241 Src/wptKeyPropsDlg.cpp:370
 msgid "WinPT Warning"
 msgstr "WinPT Warnung"
 
-#: Src/WinPT.cpp:244
+#: Src/WinPT.cpp:240
 msgid "Default secret key is unuseable"
 msgstr "Voreingestellter geheimer Schlüssel unbenutzbar"
 
-#: Src/WinPT.cpp:297
+#: Src/WinPT.cpp:293
 msgid "Could not read GnuPG version."
 msgstr "Konnte Version von GnuPG nicht auslesen."
 
-#: Src/WinPT.cpp:303
+#: Src/WinPT.cpp:299
 #, c-format
 msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
+"A newer GPG version is needed.\n"
+"Current GPG version %d.%d.%d, required "
 msgstr ""
-"Sorry, Sie benötigen eine neuere Version von GPG.\n"
+"Eine neuere Version von GPG wird benötigt.\n"
 "Aktuelle Version von GPG %d.%d.%d benötigte Version von GPG "
 
-#: Src/WinPT.cpp:337
+#: Src/WinPT.cpp:333
 msgid "Failed to create WinPT directory"
 msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
 
-#: Src/WinPT.cpp:338 Src/WinPT.cpp:355 Src/WinPT.cpp:366
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:642
+#: Src/WinPT.cpp:334 Src/WinPT.cpp:351 Src/WinPT.cpp:362
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:643
 #: Src/wptKeyserverDlg.cpp:71 Src/wptKeyserverDlg.cpp:73
 #: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
-#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:392
-#: Src/wptKeyserverDlg.cpp:398 Src/wptKeyserverDlg.cpp:500
-#: Src/wptKeyserverDlg.cpp:560 Src/wptKeyserverDlg.cpp:565
-#: Src/wptKeyserverDlg.cpp:759 Src/wptKeyserverDlg.cpp:784
-#: Src/wptKeyserverDlg.cpp:800 Src/wptKeyserverDlg.cpp:805
-#: Src/wptKeyserverDlg.cpp:811 Src/wptKeyserverDlg.cpp:817
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:394
+#: Src/wptKeyserverDlg.cpp:400 Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:567
+#: Src/wptKeyserverDlg.cpp:761 Src/wptKeyserverDlg.cpp:786
+#: Src/wptKeyserverDlg.cpp:802 Src/wptKeyserverDlg.cpp:807
+#: Src/wptKeyserverDlg.cpp:813 Src/wptKeyserverDlg.cpp:819
 msgid "Keyserver"
 msgstr "Schlüsselserver"
 
-#: Src/WinPT.cpp:354
+#: Src/WinPT.cpp:350
 msgid "Failed to copy the keyserver.conf"
 msgstr "Kopieren der keyserver.conf ist fehlgeschlagen"
 
-#: Src/WinPT.cpp:544
+#: Src/WinPT.cpp:540
 #, c-format
 msgid ""
 "The PTD.dll file has a different version than WinPT.exe\n"
@@ -102,16 +102,16 @@
 "Ein Update der PTD.dll auf Version %d.%d.%d ist nötig"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:245
-#: Src/WinPT.cpp:551
+#: Src/WinPT.cpp:547
 msgid "Cryptographic selftest failed."
 msgstr "Kryptographischer Selbsttest ist fehlgeschlagen."
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:252
-#: Src/WinPT.cpp:558
+#: Src/WinPT.cpp:554
 msgid "A newer GPGME version is needed; at least "
 msgstr "Eine neuere Version von GPGME wird benötigt; mindestens "
 
-#: Src/WinPT.cpp:579
+#: Src/WinPT.cpp:575
 msgid ""
 "The gpg.conf file contains the 'textmode' option\n"
 "which leads to broken binary output during decryption.\n"
@@ -121,7 +121,7 @@
 "welche zu verstümmelten binären Ausgabedateien führt.\n"
 "Sollte das keine Absicht sein, sollte die Option deaktiviert werden."
 
-#: Src/WinPT.cpp:593
+#: Src/WinPT.cpp:589
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -132,16 +132,16 @@
 "Bitte überprüfen Sie die Registryseinträge von GPG:\n"
 "%s."
 
-#: Src/WinPT.cpp:597
+#: Src/WinPT.cpp:593
 msgid "Select GPG Public Keyring"
 msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:607
+#: Src/WinPT.cpp:603
 msgid "GPG home directory could not be determined."
 msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
 
-#: Src/WinPT.cpp:615
+#: Src/WinPT.cpp:611
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -150,7 +150,7 @@
 "Möchten Sie die GPG-Einstellungen öffnen um das Problem zu beheben?"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:630
+#: Src/WinPT.cpp:626
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -165,20 +165,20 @@
 # c:\oss\winpt-gpgme\src\WinPT.cpp:376
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
-#: Src/WinPT.cpp:663 Src/wptFileManagerDlg.cpp:520
-#: Src/wptFileManagerDlg.cpp:861
+#: Src/WinPT.cpp:659 Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:856
 msgid "Wipe Free Space"
 msgstr "Freien Speicher Löschen"
 
-#: Src/WinPT.cpp:706
+#: Src/WinPT.cpp:702
 msgid "Could not register window class"
 msgstr "Konnte Fensterklasse nicht registrieren"
 
-#: Src/WinPT.cpp:720
+#: Src/WinPT.cpp:716
 msgid "Could not create window"
 msgstr "Konnte Fenster nicht erstellen"
 
-#: Src/WinPT.cpp:808
+#: Src/WinPT.cpp:804
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -186,7 +186,7 @@
 "Der Schlüsselcache wurde nicht initialisiert oder ist leer.\n"
 "Bitte überprüfen Sie die Konfiguration von GPG (Schlüsselbunde, Pfade)"
 
-#: Src/WinPT.cpp:811
+#: Src/WinPT.cpp:807
 msgid ""
 "It seems that GPG is not configured properly.\n"
 "Do you want to start the GPG preferences dialog?"
@@ -194,7 +194,7 @@
 "GPG ist nicht richtig konfiguriert.\n"
 "Den GPG-Einstellungsdialog starten?"
 
-#: Src/WinPT.cpp:829
+#: Src/WinPT.cpp:825
 #, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found or is unuseable.\n"
@@ -219,7 +219,7 @@
 msgstr "Über GnuPG"
 
 #: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptMainProc.cpp:568
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "Über WinPT"
 
@@ -273,123 +273,112 @@
 msgstr "Über &GPG..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2178
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2173
 #: Src/wptKeyManagerDlg.cpp:1002
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Src/wptCardDlg.cpp:149 Src/wptMainProc.cpp:395
+#: Src/wptCardDlg.cpp:146 Src/wptMainProc.cpp:396
 msgid "Card Manager"
 msgstr "Kartenmanager"
 
-#: Src/wptCardDlg.cpp:185
+#: Src/wptCardDlg.cpp:182
 msgid "No Fingerprint"
 msgstr "Kein Fingerabdruck"
 
-#: Src/wptCardDlg.cpp:216
+#: Src/wptCardDlg.cpp:213
 msgid "No OpenPGP smart card detected."
 msgstr "Keine OpenPGP-Smartcard gefunden."
 
-#: Src/wptCardDlg.cpp:340
+#: Src/wptCardDlg.cpp:337
 msgid "No PINs found."
 msgstr "Keine PINs gefunden."
 
-#: Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:356
-#: Src/wptCardDlg.cpp:362 Src/wptCardDlg.cpp:374 Src/wptCardDlg.cpp:388
-#: Src/wptCardDlg.cpp:523 Src/wptCardDlg.cpp:624 Src/wptCardDlg.cpp:629
-#: Src/wptCardDlg.cpp:635 Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:648
-#: Src/wptCardDlg.cpp:656 Src/wptCardDlg.cpp:677 Src/wptCardDlg.cpp:703
-#: Src/wptCardDlg.cpp:708 Src/wptCardDlg.cpp:711 Src/wptCardDlg.cpp:737
-#: Src/wptCardDlg.cpp:739 Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749
-#: Src/wptCardDlg.cpp:813 Src/wptCardDlg.cpp:826 Src/wptCardDlg.cpp:829
+#: Src/wptCardDlg.cpp:337 Src/wptCardDlg.cpp:348 Src/wptCardDlg.cpp:353
+#: Src/wptCardDlg.cpp:359 Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:385
+#: Src/wptCardDlg.cpp:511 Src/wptCardDlg.cpp:612 Src/wptCardDlg.cpp:617
+#: Src/wptCardDlg.cpp:623 Src/wptCardDlg.cpp:630 Src/wptCardDlg.cpp:636
+#: Src/wptCardDlg.cpp:644 Src/wptCardDlg.cpp:665 Src/wptCardDlg.cpp:691
+#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:725
+#: Src/wptCardDlg.cpp:727 Src/wptCardDlg.cpp:732 Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:801 Src/wptCardDlg.cpp:814 Src/wptCardDlg.cpp:817
 #: Src/wptMainProc.cpp:265
 msgid "Card Edit"
 msgstr "Karten-Editor"
 
-#: Src/wptCardDlg.cpp:350
+#: Src/wptCardDlg.cpp:347
 msgid "Only plain ASCII is currently allowed."
 msgstr "Aktuell ist nur 7bit-ASCII-Text erlaubt."
 
-#: Src/wptCardDlg.cpp:355
+#: Src/wptCardDlg.cpp:352
 msgid "Only alphabetic characters are allowed."
 msgstr "Nur alphanumerische sind Zeichen zulässig."
 
-#: Src/wptCardDlg.cpp:362
+#: Src/wptCardDlg.cpp:359
 msgid "Invalid URL."
 msgstr "Ungültige URL."
 
-#: Src/wptCardDlg.cpp:375
+#: Src/wptCardDlg.cpp:372
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "Konnte Attribute auf der Karte nicht ändern: %s"
 
-#: Src/wptCardDlg.cpp:388
+#: Src/wptCardDlg.cpp:385
 msgid "Card attribute changed."
 msgstr "Karteneinstellung geändert."
 
-#: Src/wptCardDlg.cpp:428
+#: Src/wptCardDlg.cpp:423
 msgid "Please enter the 'Admin PIN'"
 msgstr "Bitte 'Admin PIN' eingeben"
 
-#: Src/wptCardDlg.cpp:430
+#: Src/wptCardDlg.cpp:425
 msgid "Please enter the 'User PIN'"
 msgstr "Bitte 'Benutzer PIN' eingeben"
 
-#: Src/wptCardDlg.cpp:432 Src/wptPINDlg.cpp:51
+#: Src/wptCardDlg.cpp:427 Src/wptPINDlg.cpp:51
 msgid "Please enter the PIN"
 msgstr "Bitte PIN eingeben"
 
-#: Src/wptCardDlg.cpp:436
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-"%s\n"
-"Name: %s %s\n"
-"Serien-Nr: %s\n"
-
-#: Src/wptCardDlg.cpp:479 Src/wptCardDlg.cpp:595 Src/wptKeyEditDlgs.cpp:503
+#: Src/wptCardDlg.cpp:467 Src/wptCardDlg.cpp:583 Src/wptKeyEditDlgs.cpp:498
 msgid "&Name"
 msgstr "&Name"
 
-#: Src/wptCardDlg.cpp:480
+#: Src/wptCardDlg.cpp:468
 msgid "&Language"
 msgstr "&Sprache"
 
-#: Src/wptCardDlg.cpp:481
+#: Src/wptCardDlg.cpp:469
 msgid "&Key-URL"
 msgstr "&Schlüssel-URL"
 
-#: Src/wptCardDlg.cpp:482
+#: Src/wptCardDlg.cpp:470
 msgid "&Login"
 msgstr "&Login"
 
-#: Src/wptCardDlg.cpp:483
+#: Src/wptCardDlg.cpp:471
 msgid "&Sex"
 msgstr "&Geschlecht"
 
-#: Src/wptCardDlg.cpp:484 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2180
-#: Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
+#: Src/wptCardDlg.cpp:472 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2175
+#: Src/wptPassphraseDlg.cpp:96 Src/wptPINDlg.cpp:55
 msgid "&OK"
 msgstr "&OK"
 
-#: Src/wptCardDlg.cpp:485 Src/wptGPGOptDlg.cpp:51
+#: Src/wptCardDlg.cpp:473 Src/wptGPGOptDlg.cpp:51
 msgid "&Exit"
 msgstr "&Beenden"
 
-#: Src/wptCardDlg.cpp:486
+#: Src/wptCardDlg.cpp:474
 msgid "&New keys"
 msgstr "&Neue Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:766
-#: Src/wptCardDlg.cpp:487
+#: Src/wptCardDlg.cpp:475
 msgid "Change &PIN"
 msgstr "&PIN Ändern"
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:522
-#: Src/wptCardDlg.cpp:522
+#: Src/wptCardDlg.cpp:510
 msgid ""
 "This operation will override the keys on the card.\n"
 "Continue?"
@@ -397,73 +386,73 @@
 "Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptCardDlg.cpp:594
+#: Src/wptCardDlg.cpp:582
 msgid "Pubkey algorithm"
 msgstr "Pubkey Algorithmus"
 
-#: Src/wptCardDlg.cpp:596 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:584 Src/wptKeygenDlg.cpp:375
 msgid "&Comment (optional)"
 msgstr "&Kommentar (optional)"
 
-#: Src/wptCardDlg.cpp:597 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:377
 msgid "&Expire date"
 msgstr "&Ablaufdatum"
 
-#: Src/wptCardDlg.cpp:598
+#: Src/wptCardDlg.cpp:586
 msgid "Off-card passphrase"
 msgstr "\"Off-card\" Passwort"
 
-#: Src/wptCardDlg.cpp:599 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:587 Src/wptKeyEditDlgs.cpp:635 Src/wptKeygenDlg.cpp:379
 msgid "&Never"
 msgstr "&Niemals"
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:588 Src/wptKeygenDlg.cpp:376
 msgid "Email &address"
 msgstr "E-Mail-&Adresse"
 
-#: Src/wptCardDlg.cpp:601
+#: Src/wptCardDlg.cpp:589
 msgid "Overwrite old keys on the card"
 msgstr "Alte Schlüssel auf der Karte überschreiben?"
 
-#: Src/wptCardDlg.cpp:602
+#: Src/wptCardDlg.cpp:590
 msgid "Make off-card backup of encryption key"
 msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
 
-#: Src/wptCardDlg.cpp:603 Src/wptKeyManagerDlg.cpp:1833
+#: Src/wptCardDlg.cpp:591 Src/wptKeyManagerDlg.cpp:1833
 msgid "Card Key Generation"
 msgstr "Karten-Schlüsselerzeugung"
 
-#: Src/wptCardDlg.cpp:624
+#: Src/wptCardDlg.cpp:612
 msgid "Please enter your name."
 msgstr "Bitte Namen eingeben."
 
-#: Src/wptCardDlg.cpp:628
+#: Src/wptCardDlg.cpp:616
 msgid "Name must be at least 5 characters long."
 msgstr "Der Name muss mindestens 5 Zeichen lang sein."
 
-#: Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:622
 msgid "Please enter your e-mail address."
 msgstr "Bitte E-Mail-Adresse eingeben."
 
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:629
 msgid "Please enter a valid e-mail address."
 msgstr "Bitte gültige E-Mail-Adresse eingeben."
 
-#: Src/wptCardDlg.cpp:647
+#: Src/wptCardDlg.cpp:635
 msgid "Please enter an off-card passphrase."
 msgstr "Bitte ein Passwort eingeben für \"off-card\"."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:649
-#: Src/wptCardDlg.cpp:655
+#: Src/wptCardDlg.cpp:643
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
 
-#: Src/wptCardDlg.cpp:676 Src/wptKeyEditDlgs.cpp:1389 Src/wptKeygenDlg.cpp:457
+#: Src/wptCardDlg.cpp:664 Src/wptKeyEditDlgs.cpp:1384 Src/wptKeygenDlg.cpp:457
 msgid "The date you have chosen has already passed."
 msgstr "Das gewählte Datum liegt in der Vergangenheit."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:696
-#: Src/wptCardDlg.cpp:701
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -471,36 +460,36 @@
 "Operation wurde abgebrochen. Es scheinen noch Schlüssel\n"
 "auf der Karte zu existieren. Bitte 'Überschreiben' markieren."
 
-#: Src/wptCardDlg.cpp:710
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "Schlüssel erfolgreich erstellt."
 
-#: Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:725
 msgid "Please enter the old card PIN."
 msgstr "Bitte alte Karten-PIN eingeben."
 
-#: Src/wptCardDlg.cpp:739
+#: Src/wptCardDlg.cpp:727
 msgid "Please enter the new card PIN."
 msgstr "Bitte neue Karten-PIN eingeben."
 
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:732
 msgid "Admin PIN must be at least 8 characters."
 msgstr "Die 'Admin PIN' muss mindestens 8 Zeichen lang sein."
 
-#: Src/wptCardDlg.cpp:749
+#: Src/wptCardDlg.cpp:737
 msgid "PIN must be at least 6 characters."
 msgstr "Die 'Benutzer PIN' muss mindestens 6 Zeichen lang sein."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:766
-#: Src/wptCardDlg.cpp:772
+#: Src/wptCardDlg.cpp:760
 msgid "Change Card PIN"
 msgstr "Karten PIN Ändern"
 
-#: Src/wptCardDlg.cpp:812 Src/wptPassphraseDlg.cpp:256
+#: Src/wptCardDlg.cpp:800 Src/wptPassphraseDlg.cpp:247
 msgid "Passphrases do not match. Please try again."
 msgstr "Passwörter nicht identisch. Versuchen Sie es erneut."
 
-#: Src/wptCardDlg.cpp:828
+#: Src/wptCardDlg.cpp:816
 msgid "PIN successfully changed."
 msgstr "PIN erfolgreich geändert."
 
@@ -513,7 +502,7 @@
 msgid "GPG Card Status"
 msgstr "GPG Kartenstatus"
 
-#: Src/wptCardManager.cpp:53
+#: Src/wptCardManager.cpp:48
 msgid ""
 "Please insert the OpenPGP smart card\n"
 "Press OK to continue or Cancel"
@@ -521,32 +510,32 @@
 "Bitte die OpenPGP-SmartCard einlegen\n"
 "OK zum Fortfahren oder Abbrechen"
 
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:136
-#: Src/wptClipDecryptDlg.cpp:179 Src/wptKeyRevokersDlg.cpp:129
-#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:257
-#: Src/wptVerifyList.cpp:319
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:138
+#: Src/wptClipDecryptDlg.cpp:182 Src/wptKeyRevokersDlg.cpp:129
+#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:229
+#: Src/wptVerifyList.cpp:293
 msgid "user ID not found"
 msgstr "Benutzerkennung nicht gefunden"
 
-#: Src/wptClipDecryptDlg.cpp:105
+#: Src/wptClipDecryptDlg.cpp:106
 msgid "Signature status: created with a fully trusted key"
 msgstr "Signatur Status: erstellt mit einem vertraunswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:107
+#: Src/wptClipDecryptDlg.cpp:108
 msgid "Signature status: created with a marginal trusted key"
 msgstr ""
 "Signatur Status: erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:112
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "Signatur Status: erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:115
 msgid "Signature status: created with an undefined trusted key"
 msgstr ""
 "Signatur Status: erstellt mit einem Schlüssel ohne definiertes Vertrauen"
 
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:125
 #, c-format
 msgid ""
 "*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -564,7 +553,7 @@
 "*** Signatur:           %s\r\\n*** Unterzeichner: %s (0x%s)\r\n"
 "*** BEGINN PGP ENTSCHLÜSSELTER TEXT ***\r\n"
 
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:132
 msgid ""
 "\r\n"
 "*** END PGP DECRYPTED TEXT ***"
@@ -572,11 +561,11 @@
 "\r\n"
 "*** ENDE PGP ENTSCHLÜSSELTER TEXT ***"
 
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Decrypt Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:190
 #, c-format
 msgid ""
 "%s\n"
@@ -591,25 +580,25 @@
 "Von \"%s\" mit Schlüssel ID 0x%s%s %s\n"
 "%s"
 
-#: Src/wptClipDecryptDlg.cpp:218 Src/wptClipVerifyDlg.cpp:159
-#: Src/wptClipVerifyDlg.cpp:170 Src/wptClipVerifyDlg.cpp:186
-#: Src/wptClipVerifyDlg.cpp:203 Src/wptClipVerifyDlg.cpp:214
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipVerifyDlg.cpp:144
+#: Src/wptClipVerifyDlg.cpp:155 Src/wptClipVerifyDlg.cpp:171
+#: Src/wptClipVerifyDlg.cpp:188 Src/wptClipVerifyDlg.cpp:199
 #: Src/wptFileManager.cpp:1670 Src/wptFileManager.cpp:1735
-#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:597
-#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:276
-#: Src/wptKeyserverDlg.cpp:284 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
-#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:404
+#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:279
+#: Src/wptKeyserverDlg.cpp:286 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:405
 msgid "Verify"
 msgstr "Überprüfen"
 
-#: Src/wptClipDecryptDlg.cpp:225 Src/wptClipDecryptDlg.cpp:238
-#: Src/wptClipDecryptDlg.cpp:246 Src/wptClipDecryptDlg.cpp:253
-#: Src/wptClipDecryptDlg.cpp:255 Src/wptFileManager.cpp:1377
+#: Src/wptClipDecryptDlg.cpp:230 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptClipDecryptDlg.cpp:258
+#: Src/wptClipDecryptDlg.cpp:260 Src/wptFileManager.cpp:1377
 #: Src/wptFileManager.cpp:1428
 msgid "Decryption"
 msgstr "Entschlüsselung"
 
-#: Src/wptClipDecryptDlg.cpp:239 Src/wptFileManager.cpp:1429
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptFileManager.cpp:1429
 #, c-format
 msgid ""
 "Encrypted with %s key, ID 0x%s.%s\n"
@@ -618,18 +607,18 @@
 "Verschlüsselt mit %s Schlüssel, ID 0x%s.%s\n"
 "Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
 
-#: Src/wptClipDecryptDlg.cpp:246
+#: Src/wptClipDecryptDlg.cpp:251
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Unbekannter Algorithmus: %s"
 
 # c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:252
+#: Src/wptClipDecryptDlg.cpp:257
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Ungültige OpenPGP Nachricht  (vielleicht: \"quoted printable\" im Armorteil)."
 
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:267
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -642,23 +631,23 @@
 "Es ist möglich, dass die Daten beschädigt worden aber es ist ebenfalls "
 "möglich das dies ein Teil eines Attacke ist."
 
-#: Src/wptClipDecryptDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:272
 msgid "*** IMPORTANT ***"
 msgstr "*** WICHTIG ***"
 
-#: Src/wptClipDecryptDlg.cpp:271 Src/wptClipEncryptDlg.cpp:221
+#: Src/wptClipDecryptDlg.cpp:276 Src/wptClipEncryptDlg.cpp:216
 #: Src/wptClipSignDlg.cpp:118 Src/wptClipSignDlg.cpp:264
-#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:962 Src/wptSymEnc.cpp:94
+#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:296
+#: Src/wptKeyManager.cpp:762 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:88
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
 #: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
 #: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
 #: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
-#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:417
-#: Src/wptMainProc.cpp:500 Src/wptMainProc.cpp:505 Src/wptVerifyList.cpp:232
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:212
+#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:501 Src/wptMainProc.cpp:506 Src/wptVerifyList.cpp:202
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
@@ -694,7 +683,7 @@
 msgid "&Quote"
 msgstr "&Quote"
 
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:502
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:497
 msgid "&Open..."
 msgstr "Ö&ffnen.."
 
@@ -703,63 +692,63 @@
 msgstr "&Speichern..."
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:515
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:510
 msgid "&Paste"
 msgstr "&Einfügen"
 
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:503
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:498
 msgid "&Encrypt"
 msgstr "&Verschlüsseln"
 
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:505
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:500
 msgid "&Decrypt"
 msgstr "&Entschlüsseln"
 
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:562
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr "Zwischenablagen-Editor"
 
-#: Src/wptClipEncryptDlg.cpp:104
+#: Src/wptClipEncryptDlg.cpp:106
 msgid "key not found"
 msgstr "Schlüssel nicht gefunden"
 
 # c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:108
-#: Src/wptClipEncryptDlg.cpp:123
+#: Src/wptClipEncryptDlg.cpp:122
 msgid "Recipients unsuable for encryption:\n"
 msgstr "Empfänger nicht geeignet für Verschlüsselung:\n"
 
-#: Src/wptClipEncryptDlg.cpp:139 Src/wptClipEncryptDlg.cpp:161
-#: Src/wptClipEncryptDlg.cpp:211 Src/wptClipEncryptDlg.cpp:218
-#: Src/wptClipEncryptDlg.cpp:244 Src/wptMainProc.cpp:172
+#: Src/wptClipEncryptDlg.cpp:135 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:172
 msgid "Encryption"
 msgstr "Verschlüsseln"
 
-#: Src/wptClipEncryptDlg.cpp:162
+#: Src/wptClipEncryptDlg.cpp:157
 msgid "&Find"
 msgstr "&Suche"
 
-#: Src/wptClipEncryptDlg.cpp:163 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
 #: Src/wptCommonDlg.cpp:80 Src/wptCommonDlg.cpp:257
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
-#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:283 Src/wptFileSaveDlg.cpp:59
 #: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
-#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
-#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
+#: Src/wptKeyEditDlgs.cpp:354 Src/wptKeyEditDlgs.cpp:435
+#: Src/wptKeyEditDlgs.cpp:501 Src/wptKeyEditDlgs.cpp:636
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
 #: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:95
-#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
+#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:418 Src/wptPassphraseCB.cpp:89
+#: Src/wptPassphraseDlg.cpp:95 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:120 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
 msgstr "&Abbrechen"
 
-#: Src/wptClipEncryptDlg.cpp:210 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
 msgid "You must select at least one key."
 msgstr "Sie müssen mindestens einen Schlüssel auswählen."
 
 # c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:229
-#: Src/wptClipEncryptDlg.cpp:245
+#: Src/wptClipEncryptDlg.cpp:240
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr "Keine Empfaenger mit '%s' gefunden"
@@ -812,28 +801,28 @@
 msgid "Signing key:"
 msgstr "Signierer Schlüssel:"
 
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1225
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1198
 msgid "No key was selected."
 msgstr "Kein Schlüssel ausgewählt."
 
-#: Src/wptClipVerifyDlg.cpp:139
+#: Src/wptClipVerifyDlg.cpp:125
 msgid "Signature Information"
 msgstr "Signaturinformationen"
 
-#: Src/wptClipVerifyDlg.cpp:160 Src/wptFileVerifyDlg.cpp:52
+#: Src/wptClipVerifyDlg.cpp:145 Src/wptFileVerifyDlg.cpp:52
 #: Src/wptGPGOptDlg.cpp:49
 msgid "&Save"
 msgstr "&Speichern"
 
-#: Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:188
 msgid "Invalid signature state."
 msgstr "Ungültige Signatur."
 
-#: Src/wptClipVerifyDlg.cpp:213
+#: Src/wptClipVerifyDlg.cpp:198
 msgid "Error while adding signature information."
 msgstr "Fehler beim Hinzufügen der Signaturinformation."
 
-#: Src/wptClipVerifyDlg.cpp:251 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:236 Src/wptFileSaveDlg.cpp:58
 #: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
 #: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
 #: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -845,7 +834,7 @@
 msgid "Please enter a valid URL."
 msgstr "Bitte eine gültige URL eingeben."
 
-#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:516
+#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:508
 msgid "HTTP Key Import"
 msgstr "HTTP Schlüssel-Import"
 
@@ -853,34 +842,34 @@
 msgid "Enter URL to retrieve the public key"
 msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
 
-#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:758
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:867
-#: Src/wptKeyEditDlgs.cpp:881 Src/wptKeyEditDlgs.cpp:883
-#: Src/wptKeyEditDlgs.cpp:909 Src/wptKeyEditDlgs.cpp:939
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyEditDlgs.cpp:1017
-#: Src/wptKeyEditDlgs.cpp:1024 Src/wptKeyEditDlgs.cpp:1044
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1310 Src/wptKeyEditDlgs.cpp:1326
-#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1394 Src/wptKeyEditDlgs.cpp:1433
-#: Src/wptKeyEditDlgs.cpp:1438 Src/wptKeyEditDlgs.cpp:1445
-#: Src/wptKeyEditDlgs.cpp:1451 Src/wptKeyEditDlgs.cpp:1456
-#: Src/wptKeyEditDlgs.cpp:1499 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1518
-#: Src/wptKeyEditDlgs.cpp:1521 Src/wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:1569 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1734
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1807
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeyEditDlgs.cpp:1822
-#: Src/wptKeyEditDlgs.cpp:1927 Src/wptKeyEditDlgs.cpp:1929
-#: Src/wptKeyEditDlgs.cpp:1945 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1982 Src/wptKeyEditDlgs.cpp:1990
-#: Src/wptKeyEditDlgs.cpp:2006 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2024 Src/wptKeyEditDlgs.cpp:2091
-#: Src/wptKeyEditDlgs.cpp:2154 Src/wptKeyEditDlgs.cpp:2168
-#: Src/wptKeyEditDlgs.cpp:2183 Src/wptKeyEditDlgs.cpp:2223
-#: Src/wptKeyEditDlgs.cpp:2228 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:753
+#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:862
+#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1012
+#: Src/wptKeyEditDlgs.cpp:1019 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1305 Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1355 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389 Src/wptKeyEditDlgs.cpp:1428
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1506 Src/wptKeyEditDlgs.cpp:1513
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1556
+#: Src/wptKeyEditDlgs.cpp:1564 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1620 Src/wptKeyEditDlgs.cpp:1729
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1922 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:2001 Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2019 Src/wptKeyEditDlgs.cpp:2086
+#: Src/wptKeyEditDlgs.cpp:2149 Src/wptKeyEditDlgs.cpp:2163
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyEditDlgs.cpp:2218
+#: Src/wptKeyEditDlgs.cpp:2223 Src/wptKeyManagerDlg.cpp:1031
 #: Src/wptKeyManagerDlg.cpp:1972
 msgid "Key Edit"
 msgstr "Schlüssel bearbeiten"
@@ -890,7 +879,7 @@
 msgid "Enter preferred keyserver URL"
 msgstr "Bevorzugte Keyserver URL eingeben"
 
-#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:337
+#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:346
 msgid "Choose Locale Directory"
 msgstr "Verzeichnis für Sprachdateien auswählen"
 
@@ -906,12 +895,12 @@
 msgid "Please select a language"
 msgstr "Bitte eine Sprache auswählen"
 
-#: Src/wptErrors.cpp:47
+#: Src/wptErrors.cpp:51
 #, c-format
 msgid "Could not locate GPG.exe in %s."
 msgstr "Konnte GPG.EXE nicht in %s finden."
 
-#: Src/wptErrors.cpp:52
+#: Src/wptErrors.cpp:56
 #, c-format
 msgid ""
 "Could not find keyring entries in the config file in %s or the file does NOT "
@@ -920,147 +909,147 @@
 "Keine Eintragungen für Schlüsselbünde in der Optionendatei in %s gefunden "
 "oder Datei existiert nicht."
 
-#: Src/wptErrors.cpp:78
+#: Src/wptErrors.cpp:83
 msgid "General error occured"
 msgstr "Ein allgemeiner Fehler ist aufgetreten"
 
-#: Src/wptErrors.cpp:79
+#: Src/wptErrors.cpp:84
 msgid "Could not open file"
 msgstr "Konnte Datei nicht öffnen"
 
-#: Src/wptErrors.cpp:80
+#: Src/wptErrors.cpp:85
 msgid "Could not create file"
 msgstr "Konnte Datei nicht erstellen"
 
-#: Src/wptErrors.cpp:81
+#: Src/wptErrors.cpp:86
 msgid "Could not read file"
 msgstr "Konnte aus Datei nicht lesen"
 
-#: Src/wptErrors.cpp:82
+#: Src/wptErrors.cpp:87
 msgid "Could not write file"
 msgstr "Konnte in Datei nicht schreiben"
 
-#: Src/wptErrors.cpp:83
+#: Src/wptErrors.cpp:88
 msgid "Could not close file"
 msgstr "Konnte Datei nicht schließen"
 
-#: Src/wptErrors.cpp:84
+#: Src/wptErrors.cpp:89
 msgid "File does not exist"
 msgstr "Die Datei existiert nicht"
 
-#: Src/wptErrors.cpp:85
+#: Src/wptErrors.cpp:90
 msgid "Could not delete file"
 msgstr "Konnte Datei nicht löschen"
 
-#: Src/wptErrors.cpp:86
+#: Src/wptErrors.cpp:91
 msgid "Could not open Clipboard"
 msgstr "Konnte Zwischenablage nicht öffnen"
 
-#: Src/wptErrors.cpp:87
+#: Src/wptErrors.cpp:92
 msgid "Could not close Clipboard"
 msgstr "Konnte Zwischenablage nicht schließen"
 
-#: Src/wptErrors.cpp:88
+#: Src/wptErrors.cpp:93
 msgid "Could not empty Clipboard"
 msgstr "Konnte Zwischenablage nicht leeren"
 
-#: Src/wptErrors.cpp:89
+#: Src/wptErrors.cpp:94
 msgid "Could not set Clipboard data"
 msgstr "Konnte Daten nicht in die Zwischenablage schreiben"
 
-#: Src/wptErrors.cpp:90
+#: Src/wptErrors.cpp:95
 msgid "Could not get Clipboard data"
 msgstr "Konnte Daten aus der Zwischenablage nicht lesen"
 
-#: Src/wptErrors.cpp:91
+#: Src/wptErrors.cpp:96
 msgid "There is no text in the Clipboard"
 msgstr "Kein Text in Zwischenablage"
 
-#: Src/wptErrors.cpp:92
+#: Src/wptErrors.cpp:97
 msgid "The Clipboard already contains GPG data"
 msgstr "Die Zwischenablage enthält bereits GPG-Daten"
 
-#: Src/wptErrors.cpp:93
+#: Src/wptErrors.cpp:98
 msgid "General Clipboard error"
 msgstr "Allgemeiner Fehler in Zwischenablage"
 
-#: Src/wptErrors.cpp:94
+#: Src/wptErrors.cpp:99
 msgid "Registry error: "
 msgstr "Windowsregistrierungs Fehler: "
 
-#: Src/wptErrors.cpp:97
+#: Src/wptErrors.cpp:102
 msgid "Could not startup Winsock 2 interface"
 msgstr "Konnte Winsock 2 Schnittstelle nicht starten"
 
-#: Src/wptErrors.cpp:98
+#: Src/wptErrors.cpp:103
 msgid "Could not resolve hostname"
 msgstr "Konnte den Rechnernamen nicht auflösen"
 
-#: Src/wptErrors.cpp:99
+#: Src/wptErrors.cpp:104
 msgid "Could not create new socket"
 msgstr "Konnte keinen neuen Socket erstellen"
 
-#: Src/wptErrors.cpp:100
+#: Src/wptErrors.cpp:105
 msgid "Could not connect to the host"
 msgstr "Konnte keine Verbindung zum Host aufbauen"
 
-#: Src/wptErrors.cpp:101
+#: Src/wptErrors.cpp:106
 msgid "Could not send the key to the keyserver"
 msgstr "Konnte Schlüssel nicht zum Keyserver senden"
 
-#: Src/wptErrors.cpp:102
+#: Src/wptErrors.cpp:107
 msgid "Could not receive the key from the keyserver"
 msgstr "Konnte Schlüssel nicht vom Schlüsselserver empfangen"
 
-#: Src/wptErrors.cpp:103
+#: Src/wptErrors.cpp:108
 msgid "Socket timed out, no data"
 msgstr "Socket Time-Out, keine Daten"
 
-#: Src/wptErrors.cpp:104
+#: Src/wptErrors.cpp:109
 msgid "Could not forward request to proxy"
 msgstr "Konnte Request nicht an Proxy weiterreichen"
 
-#: Src/wptErrors.cpp:105
+#: Src/wptErrors.cpp:110
 msgid "Keyserver returned: no matching keys in database"
 msgstr "Schlüsselserverantwort: keine passenden Schlüssel in der Datenbank"
 
-#: Src/wptErrors.cpp:106
+#: Src/wptErrors.cpp:111
 msgid "Could not register hotkey: "
 msgstr "Konnte Tastenkürzel nicht registrieren: "
 
-#: Src/wptErrors.cpp:109
+#: Src/wptErrors.cpp:114
 msgid "Could not open directory"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: Src/wptErrors.cpp:110
+#: Src/wptErrors.cpp:115
 msgid "Could not create directory"
 msgstr "Konnte Verzeichnis nicht erstellen"
 
-#: Src/wptErrors.cpp:111
+#: Src/wptErrors.cpp:116
 msgid "Could not extract data from the current window"
 msgstr "Konnte keinen Text aus aktuellem Fenster lesen"
 
-#: Src/wptErrors.cpp:112
+#: Src/wptErrors.cpp:117
 msgid "Could not load config file"
 msgstr "Konnte Konfigurationsdatei nicht laden"
 
-#: Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:121
 msgid "No data available"
 msgstr "Keine Daten verfügbar"
 
-#: Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:122
 msgid "There is no card in the reader"
 msgstr "Keine Karte im Kartenleser"
 
-#: Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:123
 msgid "There was no reader found"
 msgstr "Es wurde kein Kartenleser gefunden"
 
-#: Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:124
 msgid "This is not an OpenPGP card"
 msgstr "Das ist keine OpenPGP-Karte"
 
-#: Src/wptErrors.cpp:128
+#: Src/wptErrors.cpp:134
 #, c-format
 msgid "Unknown error=%d"
 msgstr "Unbekannter Fehler=%d"
@@ -1071,9 +1060,9 @@
 #: Src/wptFileManager.cpp:915 Src/wptFileManager.cpp:1045
 #: Src/wptFileManager.cpp:1579 Src/wptFileManager.cpp:1606
 #: Src/wptFileManager.cpp:1625 Src/wptFileManager.cpp:1910
-#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:530
-#: Src/wptFileManagerDlg.cpp:640 Src/wptFileStatDlg.cpp:152
-#: Src/wptMainProc.cpp:393 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:525
+#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:394 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
 msgid "File Manager"
 msgstr "Dateimanager"
 
@@ -1113,14 +1102,14 @@
 "\n"
 "Möchten Sie die Kompression ausschalten?"
 
-#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1080
-#: Src/wptVerifyList.cpp:169
+#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptVerifyList.cpp:139
 msgid "Status"
 msgstr "Status"
 
-#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1156
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:168
+#: Src/wptVerifyList.cpp:138
 msgid "Name"
 msgstr "Name"
 
@@ -1160,22 +1149,22 @@
 msgstr "Konnte den geheimen Standardschlüssel nicht finden."
 
 #: Src/wptFileManager.cpp:1217 Src/wptFileManager.cpp:1529
-#: Src/wptFileManagerDlg.cpp:595 Src/wptMainProc.cpp:156
-#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:408
+#: Src/wptFileManagerDlg.cpp:590 Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:409
 msgid "Sign"
 msgstr "Signieren"
 
-#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:593
-#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:405
+#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:588
+#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:406
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:92
+#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:66 Src/wptSymEnc.cpp:86
 msgid "Symmetric Encryption"
 msgstr "Symmetrisch verschlüsseln"
 
 #: Src/wptFileManager.cpp:1290 Src/wptFileManager.cpp:1295
-#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:410
 msgid "Symmetric"
 msgstr "Symmetrisch"
 
@@ -1192,7 +1181,7 @@
 msgstr "Namen für die Klartext-Datei auswählen"
 
 #: Src/wptFileManager.cpp:1437 Src/wptFileManager.cpp:1457
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:589
 msgid "Decrypt"
 msgstr "Entschlüsseln"
 
@@ -1242,11 +1231,11 @@
 msgstr "Ungültiger Dateiname. Abbruch"
 
 #: Src/wptFileManager.cpp:1803 Src/wptFileManager.cpp:1814
-#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:406
-#: Src/wptImportList.cpp:413 Src/wptImportList.cpp:423
-#: Src/wptImportList.cpp:431 Src/wptImportList.cpp:440
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:469
-#: Src/wptKeyManager.cpp:567 Src/wptKeyManager.cpp:586
+#: Src/wptFileManagerDlg.cpp:240 Src/wptImportList.cpp:387
+#: Src/wptImportList.cpp:394 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:412 Src/wptImportList.cpp:421
+#: Src/wptKeyManager.cpp:450 Src/wptKeyManager.cpp:461
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:578
 #: Src/wptKeyserverDlg.cpp:220
 msgid "Import"
 msgstr "Importieren"
@@ -1263,8 +1252,8 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren!"
 
-#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:282
-#: Src/wptKeyManager.cpp:325 Src/wptKeyManager.cpp:360
+#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:317 Src/wptKeyManager.cpp:352
 msgid "No key was selected for export."
 msgstr "Kein Schlüssel zum Exportieren ausgewählt."
 
@@ -1278,8 +1267,8 @@
 msgid "Choose Name for Key File"
 msgstr "Den Namen der Schlüsseldatei wählen"
 
-#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1060
-#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1412
+#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1055
+#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1407
 #: Src/wptKeyserverDlg.cpp:105
 msgid "GnuPG status"
 msgstr "GnuPG-Status"
@@ -1318,55 +1307,55 @@
 msgid "Could not create zip archive."
 msgstr "Konnte ZIP-Datei nicht erstellen."
 
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
+#: Src/wptFileManagerDlg.cpp:86 Src/wptFileManagerDlg.cpp:148
 msgid "File Encrypt"
 msgstr "Datei verschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:87 Src/wptFileManagerDlg.cpp:277
 msgid "&Text Output"
 msgstr "&Textausgabe"
 
-#: Src/wptFileManagerDlg.cpp:93
+#: Src/wptFileManagerDlg.cpp:88
 msgid "&Wipe Original"
 msgstr "Original &löschen"
 
-#: Src/wptFileManagerDlg.cpp:94
+#: Src/wptFileManagerDlg.cpp:89
 msgid "Anonymize (throw keyid)"
 msgstr "Anonymize (throw keyid)"
 
-#: Src/wptFileManagerDlg.cpp:95
+#: Src/wptFileManagerDlg.cpp:90
 msgid "&Select Key for signing"
 msgstr "&Schlüssel zum Signieren"
 
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:282
 msgid "Options"
 msgstr "Optionen"
 
-#: Src/wptFileManagerDlg.cpp:152
+#: Src/wptFileManagerDlg.cpp:147
 msgid "Please select at least one recipient."
 msgstr "Bitte wählen Sie wenigstens einen Empfänger."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:426
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileStatDlg.cpp:281
+#: Src/wptKeyManager.cpp:418
 msgid "No valid OpenPGP data found."
 msgstr "Keine gültigen OpenPGP-Daten gefunden."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
-#: Src/wptKeyManager.cpp:451
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileManagerDlg.cpp:220
+#: Src/wptKeyManager.cpp:443
 msgid "Key Import"
 msgstr "Schlüsselimport"
 
-#: Src/wptFileManagerDlg.cpp:216
+#: Src/wptFileManagerDlg.cpp:211
 #, c-format
 msgid "%s contain(s) %d key(s)."
 msgstr "%s enthält %d Schlüssel."
 
-#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:499
+#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:494
 #: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Datei"
 
-#: Src/wptFileManagerDlg.cpp:242
+#: Src/wptFileManagerDlg.cpp:237
 msgid ""
 "Some of the imported keys are secret keys.\n"
 "\n"
@@ -1378,30 +1367,30 @@
 "Die Vertrauensstellungen dieser Schlüssel müssen Sie\n"
 "manuell in den Schlüsseleigenschaften setzen."
 
-#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
+#: Src/wptFileManagerDlg.cpp:276 Src/wptFileManagerDlg.cpp:323
 msgid "File Sign"
 msgstr "Datei signieren"
 
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:278
 msgid "&Normal Signature"
 msgstr "&Normale Signatur"
 
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:279
 msgid "&Detached Signature"
 msgstr "&Angehängte Signatur"
 
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:280
 msgid "&Cleartext Signature"
 msgstr "&Klartextsignatur"
 
-#: Src/wptFileManagerDlg.cpp:286
+#: Src/wptFileManagerDlg.cpp:281
 msgid "Signature mode"
 msgstr "Signaturmodus"
 
-#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyManager.cpp:690 Src/wptKeyManager.cpp:791
-#: Src/wptKeyManager.cpp:824 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptFileManagerDlg.cpp:323 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyManager.cpp:682 Src/wptKeyManager.cpp:783
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManagerDlg.cpp:1710
 #: Src/wptKeyManagerDlg.cpp:1726 Src/wptKeyManagerDlg.cpp:1754
 #: Src/wptKeyManagerDlg.cpp:1765 Src/wptKeyManagerDlg.cpp:1780
 #: Src/wptKeyManagerDlg.cpp:1893 Src/wptKeyManagerDlg.cpp:1912
@@ -1409,138 +1398,138 @@
 msgid "Please select a key."
 msgstr "Bitte wählen Sie einen Schlüssel aus."
 
-#: Src/wptFileManagerDlg.cpp:387
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "0 Objekte markiert"
 
-#: Src/wptFileManagerDlg.cpp:391
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d Objekt(e) markiert"
 
-#: Src/wptFileManagerDlg.cpp:496 Src/wptMainProc.cpp:532
+#: Src/wptFileManagerDlg.cpp:491 Src/wptMainProc.cpp:533
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Dateimanager (Drag & Drop möglich)"
 
-#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:495 Src/wptKeyManagerDlg.cpp:967
 #: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptMainProc.cpp:396
+#: Src/wptMainProc.cpp:397
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptFileManagerDlg.cpp:496 Src/wptKeyManagerDlg.cpp:968
 msgid "View"
 msgstr "Ansicht"
 
-#: Src/wptFileManagerDlg.cpp:504 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:499 Src/wptFileManagerDlg.cpp:587
 msgid "Encrypt into ZIP"
 msgstr "Verschlüsseln in ZIP"
 
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:984
 #: Src/wptKeyManagerDlg.cpp:1034
 msgid "&Sign"
 msgstr "&Signieren"
 
-#: Src/wptFileManagerDlg.cpp:507 Src/wptFileManagerDlg.cpp:596
-#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:406
+#: Src/wptFileManagerDlg.cpp:502 Src/wptFileManagerDlg.cpp:591
+#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
 msgid "Sign && Encrypt"
 msgstr "Signieren && Verschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:508
+#: Src/wptFileManagerDlg.cpp:503
 msgid "&Verify"
 msgstr "Über&prüfen"
 
-#: Src/wptFileManagerDlg.cpp:509
+#: Src/wptFileManagerDlg.cpp:504
 msgid "S&ymmetric"
 msgstr "S&ymmetrisch"
 
-#: Src/wptFileManagerDlg.cpp:510
+#: Src/wptFileManagerDlg.cpp:505
 msgid "&Import"
 msgstr "&Importieren"
 
-#: Src/wptFileManagerDlg.cpp:511
+#: Src/wptFileManagerDlg.cpp:506
 msgid "E&xport"
 msgstr "E&xportieren"
 
-#: Src/wptFileManagerDlg.cpp:512 Src/wptMainProc.cpp:398
+#: Src/wptFileManagerDlg.cpp:507 Src/wptMainProc.cpp:399
 msgid "Exit"
 msgstr "Beenden"
 
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:508
 msgid "&Reset"
 msgstr "&Aufräumen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:421
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:509
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:423
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:511
 msgid "&Select All"
 msgstr "Alles &markieren"
 
-#: Src/wptFileManagerDlg.cpp:517
+#: Src/wptFileManagerDlg.cpp:512
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:518 Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:594
 msgid "Send as Mail"
 msgstr "Als Mail versenden"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:425
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:514
 msgid "&List Packets"
 msgstr "Pakete an&zeigen"
 
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:516
 msgid "&Wipe"
 msgstr "&Löschen"
 
-#: Src/wptFileManagerDlg.cpp:598
+#: Src/wptFileManagerDlg.cpp:593
 msgid "Wipe"
 msgstr "Löschen"
 
-#: Src/wptFileManagerDlg.cpp:600
+#: Src/wptFileManagerDlg.cpp:595
 msgid "List Packets"
 msgstr "Pakete anzeigen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:627
+#: Src/wptFileManagerDlg.cpp:622
 msgid "&Calc Digest"
 msgstr "Digest &berechnen"
 
-#: Src/wptFileManagerDlg.cpp:639
+#: Src/wptFileManagerDlg.cpp:634
 msgid "This command requires admin privileges.\n"
 msgstr "Dieses Kommando benötigt Adminrechte.\n"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:785
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
 
-#: Src/wptFileManagerDlg.cpp:791 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:786 Src/wptMainProc.cpp:110
 msgid "&Yes"
 msgstr "&Ja"
 
-#: Src/wptFileManagerDlg.cpp:792 Src/wptMainProc.cpp:111
+#: Src/wptFileManagerDlg.cpp:787 Src/wptMainProc.cpp:111
 msgid "&No"
 msgstr "&Nein"
 
-#: Src/wptFileManagerDlg.cpp:793
+#: Src/wptFileManagerDlg.cpp:788
 msgid "passes"
 msgstr "Durchgänge"
 
-#: Src/wptFileManagerDlg.cpp:858
+#: Src/wptFileManagerDlg.cpp:853
 msgid "Operation Status: Error"
 msgstr "Prozess-Status: Fehler"
 
-#: Src/wptFileManagerDlg.cpp:859
+#: Src/wptFileManagerDlg.cpp:854
 msgid "Operation Status: Done."
 msgstr "Prozess-Status: Fertig."
 
-#: Src/wptFileManagerDlg.cpp:902
+#: Src/wptFileManagerDlg.cpp:897
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1636,11 +1625,11 @@
 msgid "GPG Warning"
 msgstr "GPG Warnung"
 
-#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
-#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
-#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
-#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
-#: Src/wptKeyEditDlgs.cpp:1739 Src/wptMainProc.cpp:419
+#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:231 Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:259
+#: Src/wptGPGPrefsDlg.cpp:265 Src/wptGPGPrefsDlg.cpp:279
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptMainProc.cpp:420
 #: Src/wptPreferencesDlg.cpp:209 Src/wptPreferencesDlg.cpp:254
 #: Src/wptPreferencesDlg.cpp:266 Src/wptPreferencesDlg.cpp:287
 #: Src/wptPreferencesDlg.cpp:315 Src/wptRegistry.cpp:596
@@ -1793,7 +1782,7 @@
 msgstr "Konnte GnuPG Konfigurationsdatei nicht laden."
 
 #: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1865
-#: Src/wptMainProc.cpp:580
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "GnuPG-Einstellungen"
 
@@ -1839,56 +1828,56 @@
 msgid "&Overwrite default settings"
 msgstr "&Überschreibe Voreinstellungen"
 
-#: Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter the GnuPG home directory."
 msgstr "Bitte geben Sie das GnuPG-Heimatverzeichnis ein."
 
-#: Src/wptGPGPrefsDlg.cpp:233
+#: Src/wptGPGPrefsDlg.cpp:242
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "Konnte 'Heinmatverzeichnis' nicht in der Registrierung speichern."
 
-#: Src/wptGPGPrefsDlg.cpp:239
+#: Src/wptGPGPrefsDlg.cpp:248
 msgid "Please enter where GPG.exe is located."
 msgstr "Bitte geben Sie den Pfad zu GPG.EXE ein."
 
-#: Src/wptGPGPrefsDlg.cpp:244
+#: Src/wptGPGPrefsDlg.cpp:253
 msgid "Could not find the GPG program in this directory."
 msgstr "Konnte GPG-Programm nicht in diesem Verzeichnis finden."
 
-#: Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:258
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "Konnte 'gpgProgram' nicht in der Registrierung speichern."
 
-#: Src/wptGPGPrefsDlg.cpp:269
+#: Src/wptGPGPrefsDlg.cpp:278
 msgid "Could not get GPG config file"
 msgstr "Konnte Konfigurationsdatei von GPG nicht öffnen"
 
-#: Src/wptGPGPrefsDlg.cpp:319
+#: Src/wptGPGPrefsDlg.cpp:328
 msgid "Choose GPG Home Directory"
 msgstr "Heimatverzeichnis von GPG auswählen"
 
-#: Src/wptGPGPrefsDlg.cpp:343
+#: Src/wptGPGPrefsDlg.cpp:352
 msgid "Choose GPG Binary"
 msgstr "Wählen Sie GPG.EXE Datei aus"
 
 #: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:186 Src/wptKeyManager.cpp:191
-#: Src/wptKeyManager.cpp:240 Src/wptKeyManager.cpp:283
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:326
-#: Src/wptKeyManager.cpp:331 Src/wptKeyManager.cpp:338
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:370 Src/wptKeyManager.cpp:374
-#: Src/wptKeyManager.cpp:394 Src/wptKeyManager.cpp:419
-#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:427
-#: Src/wptKeyManager.cpp:432 Src/wptKeyManager.cpp:438
-#: Src/wptKeyManager.cpp:443 Src/wptKeyManager.cpp:690
-#: Src/wptKeyManager.cpp:718 Src/wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:738 Src/wptKeyManager.cpp:764
-#: Src/wptKeyManager.cpp:791 Src/wptKeyManager.cpp:796
-#: Src/wptKeyManager.cpp:819 Src/wptKeyManager.cpp:824
-#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:898
-#: Src/wptKeyManager.cpp:903 Src/wptKeyManager.cpp:960
-#: Src/wptKeyManager.cpp:993 Src/wptKeyManager.cpp:1077
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
+#: Src/wptKeyManager.cpp:232 Src/wptKeyManager.cpp:275
+#: Src/wptKeyManager.cpp:287 Src/wptKeyManager.cpp:318
+#: Src/wptKeyManager.cpp:323 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:332 Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:362 Src/wptKeyManager.cpp:366
+#: Src/wptKeyManager.cpp:386 Src/wptKeyManager.cpp:411
+#: Src/wptKeyManager.cpp:416 Src/wptKeyManager.cpp:419
+#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:430
+#: Src/wptKeyManager.cpp:435 Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:710 Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:730 Src/wptKeyManager.cpp:756
+#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:788
+#: Src/wptKeyManager.cpp:811 Src/wptKeyManager.cpp:816
+#: Src/wptKeyManager.cpp:830 Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:895 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManager.cpp:1068
 #: Src/wptKeyManagerDlg.cpp:1357 Src/wptKeyManagerDlg.cpp:1368
 #: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1688
 #: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyManagerDlg.cpp:1726
@@ -1901,7 +1890,7 @@
 #: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeyManagerDlg.cpp:2117
 #: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
 #: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
-#: Src/wptMainProc.cpp:394 Src/wptMainProc.cpp:543 Src/wptMainProc.cpp:551
+#: Src/wptMainProc.cpp:395 Src/wptMainProc.cpp:544 Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "Schlüsselverwaltung"
 
@@ -1975,70 +1964,70 @@
 msgid "Unknown Hotkey"
 msgstr "Unbekanntes Tastenkürzel"
 
-#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1134 Src/wptKeyEditDlgs.cpp:1184
-#: Src/wptKeyEditDlgs.cpp:1450 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1509 Src/wptKeyEditDlgs.cpp:1540
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1784
-#: Src/wptKeyEditDlgs.cpp:1986 Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:252
+#: Src/wptKeyEditDlgs.cpp:1129 Src/wptKeyEditDlgs.cpp:1179
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1465
+#: Src/wptKeyEditDlgs.cpp:1504 Src/wptKeyEditDlgs.cpp:1535
+#: Src/wptKeyEditDlgs.cpp:1613 Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeylist.cpp:407 Src/wptKeylist.cpp:441
 #: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
 #: Src/wptKeysigDlg.cpp:215
 msgid "Revoked"
 msgstr "Widerrufen"
 
-#: Src/wptImportList.cpp:270 Src/wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1132 Src/wptKeyEditDlgs.cpp:1372
-#: Src/wptKeylist.cpp:427 Src/wptKeylist.cpp:457 Src/wptKeyPropsDlg.cpp:150
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:254
+#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeylist.cpp:409 Src/wptKeylist.cpp:439 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: Src/wptImportList.cpp:274
+#: Src/wptImportList.cpp:271
 msgid "secret key"
 msgstr "geheimer Schlüssel"
 
-#: Src/wptImportList.cpp:276 Src/wptKeylist.cpp:463
+#: Src/wptImportList.cpp:271 Src/wptKeylist.cpp:450
 msgid "public key"
 msgstr "öffentlicher Schlüssel"
 
-#: Src/wptImportList.cpp:306 Src/wptKeyEditDlgs.cpp:1192
+#: Src/wptImportList.cpp:289 Src/wptKeyEditDlgs.cpp:1187
 msgid "Invalid user ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588
+#: Src/wptImportList.cpp:327 Src/wptKeylist.cpp:566 Src/wptKeylist.cpp:574
 #: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:173
+#: Src/wptVerifyList.cpp:143
 msgid "User ID"
 msgstr "Benutzerkennung"
 
-#: Src/wptImportList.cpp:347 Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591
+#: Src/wptImportList.cpp:328 Src/wptKeylist.cpp:568 Src/wptKeylist.cpp:577
 #: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "Größe"
 
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1077
-#: Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptImportList.cpp:329 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeylist.cpp:567 Src/wptKeylist.cpp:575 Src/wptKeyManagerDlg.cpp:911
 #: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:172
+#: Src/wptVerifyList.cpp:142
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
-#: Src/wptImportList.cpp:349 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:595
+#: Src/wptImportList.cpp:330 Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:581
 #: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
 #: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "Erstellung"
 
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:590
+#: Src/wptImportList.cpp:331 Src/wptKeylist.cpp:576
 #: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
 msgid "Type"
 msgstr "Typ"
 
 # c:\oss\winpt-gpgme\src\wptImportList.cpp:424
-#: Src/wptImportList.cpp:421
+#: Src/wptImportList.cpp:402
 msgid ""
 "It is possible that the ASCII-Armor is damaged\n"
 "and thus causing a CRC error."
@@ -2063,24 +2052,24 @@
 msgid "Key Cache"
 msgstr "Schlüsselcache"
 
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:392
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeylist.cpp:374
 msgid "Ultimate"
 msgstr "Absolut"
 
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1130
-#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:386
+#: Src/wptKeyEditDlgs.cpp:238 Src/wptKeyEditDlgs.cpp:1125
+#: Src/wptKeylist.cpp:230 Src/wptKeylist.cpp:368
 msgid "Never"
 msgstr "Niemals"
 
-#: Src/wptKeyEditDlgs.cpp:261 Src/wptKeyEditDlgs.cpp:1136
+#: Src/wptKeyEditDlgs.cpp:256 Src/wptKeyEditDlgs.cpp:1131
 msgid "OK"
 msgstr "OK"
 
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:278
 msgid "user ID"
 msgstr "Benutzerkennung"
 
-#: Src/wptKeyEditDlgs.cpp:284
+#: Src/wptKeyEditDlgs.cpp:279
 #, c-format
 msgid ""
 "Could not get key information for: \"%s\":\n"
@@ -2090,7 +2079,7 @@
 "%s"
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:356
+#: Src/wptKeyEditDlgs.cpp:351
 msgid ""
 "Remember that the image is stored within your public key.  If you use a very "
 "large picture, your key will become very large as well! Keeping the image "
@@ -2101,7 +2090,7 @@
 "240x288 grosses Bild ist eine gute Größe."
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:357
+#: Src/wptKeyEditDlgs.cpp:352
 msgid ""
 "Pick an image to use for your photo ID.\n"
 "The image must be a JPEG file."
@@ -2109,35 +2098,35 @@
 "Bitte ein Bild auswählen fuer die photo ID.\n"
 "Das Bild muss eine JPEG Datei sein."
 
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:361
+#: Src/wptKeyEditDlgs.cpp:353 Src/wptKeyEditDlgs.cpp:434
+#: Src/wptKeysignDlg.cpp:417
 msgid "Passphrase"
 msgstr "Passwort"
 
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:355
 msgid "Add Photo ID"
 msgstr "Photo ID hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:367
+#: Src/wptKeyEditDlgs.cpp:362
 msgid "Select Image File"
 msgstr "Bilddatei auswählen"
 
-#: Src/wptKeyEditDlgs.cpp:371 Src/wptKeyEditDlgs.cpp:382
-#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyEditDlgs.cpp:400
-#: Src/wptKeyEditDlgs.cpp:903
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383 Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:898
 msgid "Add Photo"
 msgstr "Foto hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:367
 #, c-format
 msgid "'%s' is not a valid JPEG file."
 msgstr "'%s' ist keine gültige JPEG Datei."
 
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyRevokeDlg.cpp:166
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:166
 msgid "Please enter a file name."
 msgstr "Bitte Dateinamen eingeben."
 
-#: Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:381
 msgid ""
 "The JPEG is really large.\n"
 "Are you sure you want to use it?"
@@ -2145,146 +2134,146 @@
 "Das JPEG ist sehr groß.\n"
 "Sind Sie sicher, dass Sie es benutzen wollen?"
 
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:400
 msgid "Photo successfully added."
 msgstr "Foto erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:469
-#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:725
-#: Src/wptKeyEditDlgs.cpp:1472 Src/wptKeyEditDlgs.cpp:1542
-#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1640
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeyEditDlgs.cpp:401 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:546 Src/wptKeyEditDlgs.cpp:720
+#: Src/wptKeyEditDlgs.cpp:1467 Src/wptKeyEditDlgs.cpp:1537
+#: Src/wptKeyEditDlgs.cpp:1587 Src/wptKeyEditDlgs.cpp:1635
+#: Src/wptKeyEditDlgs.cpp:1833 Src/wptKeygenDlg.cpp:499
 #: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:386
 #: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "GnuPG-Status"
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:350
-#: Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:432
 msgid "Appointing a key as designated revoker cannot be undone."
 msgstr ""
 "Hinzufügen eines Widerrufers kann nicht mehr\n"
 "rückgängig gemacht werden."
 
-#: Src/wptKeyEditDlgs.cpp:438
+#: Src/wptKeyEditDlgs.cpp:433
 msgid "Public key"
 msgstr "öff. Schlüssel"
 
-#: Src/wptKeyEditDlgs.cpp:441 Src/wptKeyEditDlgs.cpp:450
-#: Src/wptKeyEditDlgs.cpp:463 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:436 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:458 Src/wptKeyEditDlgs.cpp:929
 msgid "Add Revoker"
 msgstr "Wiederrufer hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1561 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1812
-#: Src/wptKeyEditDlgs.cpp:1982
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1556 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1977
 msgid "Please select a user ID."
 msgstr "Bitte eine Benutzerkennung wählen."
 
-#: Src/wptKeyEditDlgs.cpp:468
+#: Src/wptKeyEditDlgs.cpp:463
 msgid "Revoker successfully addded."
 msgstr "Widerrufer erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:502
+#: Src/wptKeyEditDlgs.cpp:497
 msgid "Add new User ID"
 msgstr "Neue Benutzerkennung hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:499
 msgid "&Email"
 msgstr "&E-Mail"
 
-#: Src/wptKeyEditDlgs.cpp:505
+#: Src/wptKeyEditDlgs.cpp:500
 msgid "&Comment"
 msgstr "&Kommentar"
 
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:512
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
 
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:524
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:535
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:525 Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:544
 msgid "UserID"
 msgstr "Benutzerkennung"
 
-#: Src/wptKeyEditDlgs.cpp:523
+#: Src/wptKeyEditDlgs.cpp:518
 msgid ""
 "Please enter the email address in the email field and not in the name field"
 msgstr ""
 "Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
 
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:525
 msgid "Please enter an email address."
 msgstr "Bitte eine E-Mail-Adresse eingeben."
 
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:530
 msgid "Invalid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
-#: Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:546
 msgid "user ID successfully added."
 msgstr "Benutzerkennung erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:636 Src/wptKeyEditDlgs.cpp:839
+#: Src/wptKeyEditDlgs.cpp:631 Src/wptKeyEditDlgs.cpp:834
 msgid "Add new Subkey"
 msgstr "Neuen Unterschlüssel hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:637
+#: Src/wptKeyEditDlgs.cpp:632
 msgid "Key type"
 msgstr "Schlüssel-Typ"
 
-#: Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:633
 msgid "Size in bits"
 msgstr "Größe in Bits"
 
-#: Src/wptKeyEditDlgs.cpp:639
+#: Src/wptKeyEditDlgs.cpp:634
 msgid "Key expiration"
 msgstr "Key Ablaufdatum"
 
-#: Src/wptKeyEditDlgs.cpp:684
+#: Src/wptKeyEditDlgs.cpp:679
 msgid "Please select one entry."
 msgstr "Bitte wählen Sie einen Eintrag aus."
 
-#: Src/wptKeyEditDlgs.cpp:685 Src/wptKeyEditDlgs.cpp:691
-#: Src/wptKeyEditDlgs.cpp:722 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:680 Src/wptKeyEditDlgs.cpp:686
+#: Src/wptKeyEditDlgs.cpp:717 Src/wptKeyEditDlgs.cpp:817
 msgid "Add Subkey"
 msgstr "Unterschlüssel hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:690
+#: Src/wptKeyEditDlgs.cpp:685
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
 
-#: Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:719
 msgid "Subkey successfully added."
 msgstr "Unterschlüssel erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:752 Src/wptKeyEditDlgs.cpp:821
-#: Src/wptKeyEditDlgs.cpp:902 Src/wptKeyEditDlgs.cpp:934
-#: Src/wptKeyEditDlgs.cpp:1016 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:747 Src/wptKeyEditDlgs.cpp:816
+#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
+#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1355
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1488
 #: Src/wptKeyManagerDlg.cpp:1743
 msgid "There is no secret key available!"
 msgstr "Kein geheimer Schlüssel vorhanden!"
 
-#: Src/wptKeyEditDlgs.cpp:753 Src/wptKeyEditDlgs.cpp:772
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:767
 msgid "Add user ID"
 msgstr "Benutzerkennung hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:875
 msgid "Preferred keyserver successfully set."
 msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
 
-#: Src/wptKeyEditDlgs.cpp:969 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
 #: Src/wptKeyPropsDlg.cpp:377
 msgid "Change Ownertrust"
 msgstr "Besitzervertrauen ändern"
 
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyManager.cpp:238
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyManager.cpp:230
 msgid "Key status changed."
 msgstr "Schlüsselstatus geändert."
 
-#: Src/wptKeyEditDlgs.cpp:1022
+#: Src/wptKeyEditDlgs.cpp:1017
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
@@ -2292,15 +2281,15 @@
 "Kann das Passwort das Schlüssels nicht ändern, da der \n"
 "Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
 
-#: Src/wptKeyEditDlgs.cpp:1029
+#: Src/wptKeyEditDlgs.cpp:1024
 msgid "Current (old) Passphrase"
 msgstr "Aktuelles (altes) Passwort"
 
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1029
 msgid "New Passphrase"
 msgstr "Neues Passwort"
 
-#: Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1037
 msgid ""
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, continue?"
@@ -2308,32 +2297,32 @@
 "Sind Sie sicher das Sie wirklich keine Passphrase wollen?\n"
 "Das ist generell keine gute Idee, trotzdem fortfahren?"
 
-#: Src/wptKeyEditDlgs.cpp:1058
+#: Src/wptKeyEditDlgs.cpp:1053
 msgid "Change Password"
 msgstr "&Passwort ändern"
 
-#: Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1055
 msgid "Passphrase successfully changed."
 msgstr "Passwort erfolgreich geändert."
 
-#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
 msgid "Description"
 msgstr "Beschreibung"
 
-#: Src/wptKeyEditDlgs.cpp:1079
+#: Src/wptKeyEditDlgs.cpp:1074
 msgid "Expires"
 msgstr "Verfällt"
 
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeylist.cpp:584 Src/wptKeylist.cpp:593
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:570 Src/wptKeylist.cpp:579
 #: Src/wptKeyManagerDlg.cpp:915
 msgid "Validity"
 msgstr "Gültigkeit"
 
-#: Src/wptKeyEditDlgs.cpp:1162
+#: Src/wptKeyEditDlgs.cpp:1157
 msgid "Email"
 msgstr "E-Mail"
 
-#: Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1245
 msgid ""
 "ADDUID      add a user ID\r\n"
 "ADDPHOTO    add a photo ID\r\n"
@@ -2376,15 +2365,15 @@
 "CLEAN     \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
 "MINIMIZE  \t\tEntferne alle Signaturen vom Schlüssel\r\n"
 
-#: Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1266
 msgid "Key Edit Help"
 msgstr "Hilfe zum Schlüssel bearbeiten"
 
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1310
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1305
 msgid "Primary key can not be deleted!"
 msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
 
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1313
 msgid ""
 "Anything encrypted to the selected subkey cannot be\n"
 "decrypted any longer."
@@ -2392,7 +2381,7 @@
 "Alles was mit dem ausgewählten Unterschlüssel verschlüsselt wurde,\n"
 "kann nicht mehr länger entschlüsselt werden."
 
-#: Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid ""
 "Anything signed by the selected subkey cannot be\n"
 "verified any longer."
@@ -2400,7 +2389,7 @@
 "Jede Signatur die mit diesem Unterschlüssel erzeugt wurde, kann nicht\n"
 "mehr überprüft werden."
 
-#: Src/wptKeyEditDlgs.cpp:1327
+#: Src/wptKeyEditDlgs.cpp:1322
 #, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -2414,15 +2403,15 @@
 "%s\n"
 "Diesen Schlüssel wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1331
 msgid "Delete Subkey"
 msgstr "Unterschlüssel löschen"
 
-#: Src/wptKeyEditDlgs.cpp:1340
+#: Src/wptKeyEditDlgs.cpp:1335
 msgid "Subkey successfully deleted."
 msgstr "Unterschlüssel erfolgreich gelöscht."
 
-#: Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1368
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -2432,19 +2421,19 @@
 "\n"
 "Wollen Sie das Ablaufdatum ändern?"
 
-#: Src/wptKeyEditDlgs.cpp:1382 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1380
 msgid "Key Expiration Date"
 msgstr "Ablaufdatum"
 
-#: Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyEditDlgs.cpp:1401
 msgid "Expire Subkey"
 msgstr "Untschlüssel Ablauf"
 
-#: Src/wptKeyEditDlgs.cpp:1411
+#: Src/wptKeyEditDlgs.cpp:1406
 msgid "Subkey expire date successfully set."
 msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1437
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -2456,31 +2445,31 @@
 "\n"
 "Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
 
-#: Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1446
 msgid "Key already revoked."
 msgstr "Der Schlüssel ist bereits widerrufen."
 
-#: Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1463
 msgid "Revoke Subkey"
 msgstr "Unterschlüssel widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1472
+#: Src/wptKeyEditDlgs.cpp:1467
 msgid "Subkey successfully revoked."
 msgstr "Unterschlüssel erfolgreich widerrufen."
 
-#: Src/wptKeyEditDlgs.cpp:1494
+#: Src/wptKeyEditDlgs.cpp:1489
 msgid "Revoke user ID"
 msgstr "Benutzerkennung widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1494
 msgid "Key has only one user ID."
 msgstr "Schlüssel hat nur eine Benutzerkennung."
 
-#: Src/wptKeyEditDlgs.cpp:1510
+#: Src/wptKeyEditDlgs.cpp:1505
 msgid "This user ID has been already revoked."
 msgstr "Diese Benutzerkennung wurde bereits widerrufen."
 
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1511
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2490,51 +2479,51 @@
 "Benutzerkennung %s.\r\n"
 "Diese Benutzerkennung wirklich widerrufen?"
 
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1533
 msgid "Revoke User ID"
 msgstr "Benutzerkennung widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1542
+#: Src/wptKeyEditDlgs.cpp:1537
 msgid "User ID successfully revoked"
 msgstr "Benutzerkennung erfolgreich widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1589
+#: Src/wptKeyEditDlgs.cpp:1584
 msgid "Set user ID preferences"
 msgstr "Setze Einstellungen für Benutzerkennung"
 
-#: Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1587
 msgid "User ID preferences successfully updated"
 msgstr "Benutzerkennung wurde erfolgreich geändert"
 
-#: Src/wptKeyEditDlgs.cpp:1637
+#: Src/wptKeyEditDlgs.cpp:1632
 msgid "Primary"
 msgstr "Primär"
 
-#: Src/wptKeyEditDlgs.cpp:1640
+#: Src/wptKeyEditDlgs.cpp:1635
 msgid "User ID successfully flagged"
 msgstr "Benutzerkennung erfolgreich gekennzeichnet"
 
-#: Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1729
 msgid "No preferences available."
 msgstr "Keine Präferenzen verfübar."
 
-#: Src/wptKeyEditDlgs.cpp:1738
+#: Src/wptKeyEditDlgs.cpp:1733
 msgid "MDC feature"
 msgstr "Unterstützt MDC"
 
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1735
 msgid "user ID:"
 msgstr "Benutzerkennung:"
 
-#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr "Schlüsseleinstellungen"
 
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1801
 msgid "Primary user ID can not be deleted!"
 msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
 
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1812
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2549,27 +2538,27 @@
 "\n"
 "Diese Benutzerkennung wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1834
+#: Src/wptKeyEditDlgs.cpp:1829
 msgid "Delete User ID"
 msgstr "Benutzerkennung löschen"
 
-#: Src/wptKeyEditDlgs.cpp:1838
+#: Src/wptKeyEditDlgs.cpp:1833
 msgid "User ID successfully deleted"
 msgstr "Benutzerkennung erfolgreich gelöscht"
 
-#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1924 Src/wptKeyEditDlgs.cpp:1942
 msgid "Finished to compact key."
 msgstr "Schlüssel erfolgreich bearbeitet."
 
-#: Src/wptKeyEditDlgs.cpp:1989
+#: Src/wptKeyEditDlgs.cpp:1984
 msgid "Do you really want to make this sig exportable?"
 msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
 
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyEditDlgs.cpp:2015 Src/wptKeysignDlg.cpp:385
 msgid "Key successfully signed."
 msgstr "Schlüssel erfolgreich signiert."
 
-#: Src/wptKeyEditDlgs.cpp:2083
+#: Src/wptKeyEditDlgs.cpp:2078
 #, c-format
 msgid ""
 "Your keys is listed as a designated revoker for the key\n"
@@ -2587,31 +2576,31 @@
 "erstellen wollen welches es erlaubt den gelisteten Schlüssel\n"
 "zu widerrufen?"
 
-#: Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyEditDlgs.cpp:2116
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr ""
 "Fähigkeiten: C = Zertifizieren, S = Signieren, E = Verschlüsseln, A = "
 "Authentifizierung"
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:1739
-#: Src/wptKeyEditDlgs.cpp:2176
+#: Src/wptKeyEditDlgs.cpp:2171
 msgid "Command>"
 msgstr "Kommando>"
 
-#: Src/wptKeyEditDlgs.cpp:2177 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyEditDlgs.cpp:2172 Src/wptKeyserverDlg.cpp:691
 #: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Schliessen"
 
-#: Src/wptKeyEditDlgs.cpp:2179
+#: Src/wptKeyEditDlgs.cpp:2174
 msgid "&Revoke..."
 msgstr "&Widerrufen..."
 
-#: Src/wptKeyEditDlgs.cpp:2223
+#: Src/wptKeyEditDlgs.cpp:2218
 msgid "Please select a command."
 msgstr "Bitte einen Befehl auswählen."
 
-#: Src/wptKeyEditDlgs.cpp:2227
+#: Src/wptKeyEditDlgs.cpp:2222
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "Dieser Befehl kann mit PGP2 (v3) Schlüsseln nicht verwendet werden.\n"
 
@@ -2674,8 +2663,8 @@
 #: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
 #: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
 #: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
-#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:147
-#: Src/wptPassphraseDlg.cpp:157
+#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:138
+#: Src/wptPassphraseDlg.cpp:148
 msgid "Key Generation"
 msgstr "Schlüsselerzeugung"
 
@@ -2889,73 +2878,72 @@
 msgid "No keys updated."
 msgstr "Kein(e) Schlüssel aktualisiert."
 
-#: Src/wptKeylist.cpp:261
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:245
 msgid "Key Pair (Card)"
 msgstr "Schlüsselpaar (Karte)"
 
-#: Src/wptKeylist.cpp:264
+#: Src/wptKeylist.cpp:246
 msgid "Public Key"
 msgstr "Öffentlicher Schlüssel"
 
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:366
 msgid "None"
 msgstr "Keine"
 
-#: Src/wptKeylist.cpp:388
+#: Src/wptKeylist.cpp:370
 msgid "Marginal"
 msgstr "Marginal"
 
 # c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:390
+#: Src/wptKeylist.cpp:372
 msgid "Full"
 msgstr "Voll"
 
-#: Src/wptKeylist.cpp:429 Src/wptKeylist.cpp:455 Src/wptKeyPropsDlg.cpp:154
+#: Src/wptKeylist.cpp:411 Src/wptKeylist.cpp:437 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "Inaktiv"
 
-#: Src/wptKeylist.cpp:465
+#: Src/wptKeylist.cpp:452
 msgid "key pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeylist.cpp:569 Src/wptKeylist.cpp:578 Src/wptKeyManagerDlg.cpp:914
 #: Src/wptKeyManagerDlg.cpp:1005
 msgid "Cipher"
 msgstr "Cipher"
 
-#: Src/wptKeylist.cpp:594 Src/wptKeyManagerDlg.cpp:916
-#: Src/wptVerifyList.cpp:171
+#: Src/wptKeylist.cpp:580 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:141
 msgid "Trust"
 msgstr "Vertrauen"
 
-#: Src/wptKeylist.cpp:782 Src/wptPassphraseCB.cpp:126
+#: Src/wptKeylist.cpp:768 Src/wptPassphraseCB.cpp:120
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptKeylist.cpp:1051
-#, c-format
+#: Src/wptKeylist.cpp:1031
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
 "named in the user ID.  If you *really* know what you are\n"
 "doing, you may answer the next question with yes\n"
 "\n"
-"Use \"%s\" anyway?"
+"Still proceed?"
 msgstr ""
 "Es ist nicht sicher, dass der Schlüssel zu der Person, die in der\n"
 "Benutzerkennung steht, gehört. Wenn Sie wirklich wissen, was Sie tun,\n"
 "dann beantworten Sie die untenstehende Frage mit JA.\n"
 "\n"
-"\"%s\" trotzdem benutzen?"
+"Diesen Schlüssel trotzdem benutzen?"
 
-#: Src/wptKeylist.cpp:1059 Src/wptKeylist.cpp:1122
+#: Src/wptKeylist.cpp:1100
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: Src/wptKeylist.cpp:1123
+#: Src/wptKeylist.cpp:1101
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -2964,11 +2952,11 @@
 "Schlüssel ID %s.\n"
 "Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
 
-#: Src/wptKeylist.cpp:1225
+#: Src/wptKeylist.cpp:1198
 msgid "Secret Key List"
 msgstr "Liste der geheimen Schlüssel"
 
-#: Src/wptKeyManager.cpp:185
+#: Src/wptKeyManager.cpp:177
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -2976,7 +2964,7 @@
 "Dieser Schlüssel ist abgelaufen!\n"
 "Schlüsselüberprüfung fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:190
+#: Src/wptKeyManager.cpp:182
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -2984,25 +2972,25 @@
 "Dieser Schlüssel wurde vom Besitzer widerrufen!\n"
 "Schlüsselüberprüfung fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:322
 msgid "Only one secret key can be exported."
 msgstr "Nur ein geheimer Schlüssel kann exportiert werden."
 
-#: Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:333
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "Geheimer Schlüssel gespeichert in '%s'."
 
-#: Src/wptKeyManager.cpp:375
+#: Src/wptKeyManager.cpp:367
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "Schlüssel erfolgreich in '%s' gespeichert."
 
-#: Src/wptKeyManager.cpp:431
+#: Src/wptKeyManager.cpp:423
 msgid "No valid OpenPGP keys found."
 msgstr "Keine gültigen OpenPGP-Schlüssel gefunden."
 
-#: Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:428
 msgid ""
 "The key you want to import is dash escaped.\n"
 "Do you want to extract the key?"
@@ -3010,11 +2998,11 @@
 "Der Schlüssel ist \"dash escaped\".\n"
 "Möchten Sie den Schlüssel extrahieren?"
 
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:434
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "Kann keine beschädigten OpenPGP-Schlüssel importieren."
 
-#: Src/wptKeyManager.cpp:467 Src/wptKeyManager.cpp:584
+#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:576
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -3022,38 +3010,38 @@
 "Schlüssel ohne Eigensignatur erkannt!\n"
 "(Dieser Schlüssel ist für Verschlüsselung, etc. NICHT verwendbar)\n"
 
-#: Src/wptKeyManager.cpp:496 Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:488 Src/wptKeyManager.cpp:495
 msgid "Key Import HTTP"
 msgstr "Schlüssel Import HTTP"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:448
-#: Src/wptKeyManager.cpp:496
+#: Src/wptKeyManager.cpp:488
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "Ungültige HTTP URL: %s"
 
-#: Src/wptKeyManager.cpp:517
+#: Src/wptKeyManager.cpp:509
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "Konnte Schlüssel von der URL: %s nicht runterladen"
 
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "Namen der Schlüsseldatei auswählen"
 
-#: Src/wptKeyManager.cpp:558
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "Dateiimport"
 
-#: Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:687
 msgid "Do you really want to confirm each key?"
 msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
 
-#: Src/wptKeyManager.cpp:696
+#: Src/wptKeyManager.cpp:688
 msgid "Delete Confirmation"
 msgstr "Löschen Bestätigen"
 
-#: Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:711
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -3065,7 +3053,7 @@
 "%s"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:728
+#: Src/wptKeyManager.cpp:720
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -3082,7 +3070,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:735
+#: Src/wptKeyManager.cpp:727
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -3092,51 +3080,50 @@
 "Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
 "Schlüssel werden gelöscht.\n"
 
-#: Src/wptKeyManager.cpp:797
+#: Src/wptKeyManager.cpp:789
 #, c-format
 msgid "Do you really want to send '0x%s' to keyserver %s?"
 msgstr "Wollen Sie '0x%s' wirklich zum Schlüsselserver %s senden?"
 
-#: Src/wptKeyManager.cpp:818
+#: Src/wptKeyManager.cpp:810
 msgid "Please only select one key."
 msgstr "Bitte nur einen Schlüssel auswählen."
 
-#: Src/wptKeyManager.cpp:897
+#: Src/wptKeyManager.cpp:889
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
 
-#: Src/wptKeyManager.cpp:902
+#: Src/wptKeyManager.cpp:894
 msgid "Could not connect to keyserver, abort procedure."
 msgstr ""
 "Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "Suchen"
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "Suche nach:"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:988
-#, c-format
-msgid "String pattern \"%s\" not found."
-msgstr "Zeichenkette \"%s\" nicht gefunden."
+#: Src/wptKeyManager.cpp:982
+msgid "String pattern not found:"
+msgstr "Zeichenkette nicht gefunden:"
 
-#: Src/wptKeyManager.cpp:1054 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:85
 msgid "0. No reason specified"
 msgstr "0. Kein Grund angeben"
 
-#: Src/wptKeyManager.cpp:1055 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:86
 msgid "1. Key has been compromised"
 msgstr "1. Der Schlüssel ist nicht mehr sicher"
 
-#: Src/wptKeyManager.cpp:1056 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:87
 msgid "2. Key is superseded"
 msgstr "2. Der Schlüssel ist veraltet"
 
-#: Src/wptKeyManager.cpp:1057 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:88
 msgid "3. Key is no longer used"
 msgstr "3. Der Schlüssel wird nicht mehr benutzt"
 
@@ -3435,10 +3422,10 @@
 msgid "Could not access public keyring"
 msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
 
-#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:351
-#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
-#: Src/wptKeysignDlg.cpp:455 Src/wptKeysignDlg.cpp:461
-#: Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:378 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:385 Src/wptKeysignDlg.cpp:407
+#: Src/wptKeysignDlg.cpp:421
 msgid "Key Signing"
 msgstr "Schlüsselsignierung"
 
@@ -3475,11 +3462,11 @@
 msgid "Smart Card support is not available."
 msgstr "SmartCard-Unterstützung ist nicht verfügbar."
 
-#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:680
+#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:682
 msgid "Keyserver Access"
 msgstr "Schlüsselserver-Zugriff"
 
-#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:574
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:575
 #: Src/wptPreferencesDlg.cpp:125
 msgid "WinPT Preferences"
 msgstr "WinPT Einstellungen"
@@ -3530,8 +3517,9 @@
 msgid "I trust ultimately (implicit)"
 msgstr "(Implizites) Absolutes Vertrauen"
 
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
-#: Src/wptVerifyList.cpp:311
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:215
+#: Src/wptVerifyList.cpp:218 Src/wptVerifyList.cpp:277
+#: Src/wptVerifyList.cpp:279 Src/wptVerifyList.cpp:285
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -3661,39 +3649,39 @@
 msgid "Do you want to retrieve %s via the default keyserver?"
 msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
 
-#: Src/wptKeyserver.cpp:443
+#: Src/wptKeyserver.cpp:444
 msgid "Network unreachable"
 msgstr "Netzwerk unerreichbar"
 
-#: Src/wptKeyserver.cpp:446
+#: Src/wptKeyserver.cpp:447
 msgid "Host unreachable"
 msgstr "Rechner unerreichbar"
 
-#: Src/wptKeyserver.cpp:449
+#: Src/wptKeyserver.cpp:450
 msgid "Could not resolve host name"
 msgstr "Konnte Rechnernamen nicht auflösen"
 
-#: Src/wptKeyserver.cpp:452
+#: Src/wptKeyserver.cpp:453
 msgid "Connection refused"
 msgstr "Verbindung abgelehnt"
 
-#: Src/wptKeyserver.cpp:456
+#: Src/wptKeyserver.cpp:457
 msgid "Connection timeout"
 msgstr "Verbindung Time-Out"
 
-#: Src/wptKeyserver.cpp:460
+#: Src/wptKeyserver.cpp:461
 msgid "Connection resetted by peer"
 msgstr "Verbindung wurde zurückgesetzt"
 
-#: Src/wptKeyserver.cpp:463
+#: Src/wptKeyserver.cpp:464
 msgid "Socket has been shutdown"
 msgstr "Socket wurde runtergefahren"
 
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:642
 msgid "Could not save keyserver.conf file"
 msgstr "Konnte keyserver.conf Datei nicht speichern"
 
-#: Src/wptKeyserver.cpp:727
+#: Src/wptKeyserver.cpp:728
 msgid ""
 "Invalid proxy configuration. You need to set a user and a password to use "
 "proxy authentication!"
@@ -3701,11 +3689,11 @@
 "Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
 "Passwort setzen, um Proxy-Authentifizierung nutzen zu können!"
 
-#: Src/wptKeyserver.cpp:730
+#: Src/wptKeyserver.cpp:731
 msgid "Proxy Error"
 msgstr "Proxyfehler"
 
-#: Src/wptKeyserver.cpp:755
+#: Src/wptKeyserver.cpp:756
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3713,16 +3701,16 @@
 "Alle Eintraäge in dieser Datei müssen über einen gültigen Präfix verfügen.\n"
 "Aktuell werden HKP/HTTP, LDAP and FINGER unterstützt.\n"
 
-#: Src/wptKeyserver.cpp:757
+#: Src/wptKeyserver.cpp:758
 msgid "Keyserver Error"
 msgstr "Schlüsselserver-Fehler"
 
 # c:\oss\winpt-gpgme\src\wptKeyserver.cpp:548
-#: Src/wptKeyserver.cpp:776
+#: Src/wptKeyserver.cpp:777
 msgid "The keyserver limit is exceeded"
 msgstr "Das Limit der Keyserver wurde erreicht"
 
-#: Src/wptKeyserver.cpp:777
+#: Src/wptKeyserver.cpp:778
 msgid "Keyserver Warning"
 msgstr "Keyserver Warnung"
 
@@ -3770,7 +3758,7 @@
 msgid "This is not a valid OpenPGP key."
 msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
 
-#: Src/wptKeyserverDlg.cpp:277
+#: Src/wptKeyserverDlg.cpp:280
 #, c-format
 msgid ""
 "Signature made %s using %s key ID 0x%s\n"
@@ -3783,101 +3771,101 @@
 "\n"
 "Möchten Sie versuchen, den Schlüssel vom Schlüsselserver zu importieren?"
 
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:393
 msgid "Please select one of the servers."
 msgstr "Bitte einen der Server auswählen."
 
-#: Src/wptKeyserverDlg.cpp:397
+#: Src/wptKeyserverDlg.cpp:399
 msgid "Only HKP keyserver can be used."
 msgstr "Nur HKP-Schlüsselserver können benutzt werden."
 
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:416
 msgid "DNS Name"
 msgstr "DNS Name"
 
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:417
 msgid "Port"
 msgstr "Port"
 
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:501
 msgid "No space for new keyserver entry"
 msgstr "Kein Platz für neuen Keserver-Eintrag"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:522
 msgid "HKP Keyserver"
 msgstr "HKP-Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:523
 msgid "LDAP Keyserver"
 msgstr "LDAP-Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:522
+#: Src/wptKeyserverDlg.cpp:524
 msgid "Finger Keyserver"
 msgstr "Finger-Keyserver"
 
-#: Src/wptKeyserverDlg.cpp:547 Src/wptKeyserverDlg.cpp:840
-#: Src/wptKeyserverDlg.cpp:860
+#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverDlg.cpp:842
+#: Src/wptKeyserverDlg.cpp:862
 msgid "Edit Keyserver"
 msgstr "Editiere Keyserver"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:548 Src/wptKeyserverDlg.cpp:713
+#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:715
 msgid "&Add"
 msgstr "&Hinzufügen"
 
-#: Src/wptKeyserverDlg.cpp:550
+#: Src/wptKeyserverDlg.cpp:552
 msgid "Type:"
 msgstr "Typ:"
 
-#: Src/wptKeyserverDlg.cpp:551
+#: Src/wptKeyserverDlg.cpp:553
 msgid "Port:"
 msgstr "Port:"
 
-#: Src/wptKeyserverDlg.cpp:552
+#: Src/wptKeyserverDlg.cpp:554
 msgid "Host name:"
 msgstr "Rechnername:"
 
-#: Src/wptKeyserverDlg.cpp:560
+#: Src/wptKeyserverDlg.cpp:562
 msgid "Please enter a host name"
 msgstr "Bitte einen Rechnernamen eingeben."
 
-#: Src/wptKeyserverDlg.cpp:565
+#: Src/wptKeyserverDlg.cpp:567
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "Ungültiger Port, gültige Nummern sind < 65535"
 
-#: Src/wptKeyserverDlg.cpp:681 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "&Empfangen"
 
-#: Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:685
 msgid "Send key (default is receiving)"
 msgstr "Schlüssel senden (sonst empfangen)"
 
-#: Src/wptKeyserverDlg.cpp:685
+#: Src/wptKeyserverDlg.cpp:687
 msgid "Key ID or email address you want to search for"
 msgstr "Key ID oder E-Mail-Adresse eingeben die gesucht wird"
 
-#: Src/wptKeyserverDlg.cpp:686
+#: Src/wptKeyserverDlg.cpp:688
 msgid "&Search"
 msgstr "&Suchen"
 
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:689
 msgid "C&hange proxy"
 msgstr "Proxy Ä&ndern"
 
-#: Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:690
 msgid "Set &default"
 msgstr "Als &Standard"
 
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
 msgid "&Remove"
 msgstr "&Entfernen"
 
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:717
 msgid "&Edit"
 msgstr "&Edtieren"
 
-#: Src/wptKeyserverDlg.cpp:750 Src/wptProxySettingsDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:752 Src/wptProxySettingsDlg.cpp:105
 #: Src/wptProxySettingsDlg.cpp:115 Src/wptProxySettingsDlg.cpp:120
 #: Src/wptProxySettingsDlg.cpp:127 Src/wptProxySettingsDlg.cpp:132
 #: Src/wptProxySettingsDlg.cpp:137 Src/wptProxySettingsDlg.cpp:198
@@ -3885,23 +3873,23 @@
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: Src/wptKeyserverDlg.cpp:758 Src/wptKeyserverDlg.cpp:799
+#: Src/wptKeyserverDlg.cpp:760 Src/wptKeyserverDlg.cpp:801
 msgid "Please enter the search pattern."
 msgstr "Bitte Suchmuster eingeben."
 
-#: Src/wptKeyserverDlg.cpp:783
+#: Src/wptKeyserverDlg.cpp:785
 msgid "Please select one of the keyservers."
 msgstr "Bitte einen Keyserver auswählen."
 
-#: Src/wptKeyserverDlg.cpp:804
+#: Src/wptKeyserverDlg.cpp:806
 msgid "Only keyids are allowed."
 msgstr "Nur Schlüssel-IDs zulässig"
 
-#: Src/wptKeyserverDlg.cpp:810
+#: Src/wptKeyserverDlg.cpp:812
 msgid "Only enter the name of the user."
 msgstr "Nur den Namen des Benutzers eingeben."
 
-#: Src/wptKeyserverDlg.cpp:816
+#: Src/wptKeyserverDlg.cpp:818
 msgid "Only email addresses or keyids are allowed."
 msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
 
@@ -4033,22 +4021,22 @@
 msgid "&Receive Key"
 msgstr "&Schlüssel empfangen"
 
-#: Src/wptKeysignDlg.cpp:78
+#: Src/wptKeysignDlg.cpp:75
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr "%d-bit %s Schlüssel, ID 0x%s"
 
-#: Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:174
 #, c-format
 msgid "Photo of %s"
 msgstr "Foto von %s"
 
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
+#: Src/wptKeysignDlg.cpp:216 Src/wptKeysignDlg.cpp:333
 msgid "Choose Signature Class"
 msgstr "Signaturklasse auswählen"
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:224
+#: Src/wptKeysignDlg.cpp:218
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -4057,30 +4045,30 @@
 "gehört? Wenn Sie nicht antworten wollen, bitte \"0\" benutzen."
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:226
+#: Src/wptKeysignDlg.cpp:220
 msgid "(0) I will not answer (default)"
 msgstr "(0) Ich möchte nicht darauf antworten"
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:158
-#: Src/wptKeysignDlg.cpp:228
+#: Src/wptKeysignDlg.cpp:222
 msgid "(1) I have not checked at all."
 msgstr "(1) Ich habe keine Überprüfung gemacht."
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:159
-#: Src/wptKeysignDlg.cpp:230
+#: Src/wptKeysignDlg.cpp:224
 msgid "(2) I have done causal checking."
 msgstr "(2) Ich habe einige Überprüfungen gemacht."
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:160
-#: Src/wptKeysignDlg.cpp:232
+#: Src/wptKeysignDlg.cpp:226
 msgid "(3) I have done very careful checking."
 msgstr "(3) Ich habe gründliche Überprüfungen gemacht."
 
-#: Src/wptKeysignDlg.cpp:271
+#: Src/wptKeysignDlg.cpp:265
 msgid "never"
 msgstr "niemals"
 
-#: Src/wptKeysignDlg.cpp:304
+#: Src/wptKeysignDlg.cpp:297
 #, c-format
 msgid ""
 "pub %d/0x%s   created: %s    expires: %s\n"
@@ -4093,7 +4081,7 @@
 "primärer Fingerabdruck: %s\n"
 "\n"
 
-#: Src/wptKeysignDlg.cpp:321
+#: Src/wptKeysignDlg.cpp:312
 msgid ""
 "\n"
 "\n"
@@ -4104,45 +4092,44 @@
 "Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
 
 #: Src/wptKeysignDlg.cpp:351
+msgid "You cannot select today as the expiration date."
+msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
+
+#: Src/wptKeysignDlg.cpp:382
+msgid "This key is already signed by your key"
+msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
+
+#: Src/wptKeysignDlg.cpp:407
 msgid "No valid secret key found."
 msgstr "Kein gültiger geheimer Schlüssel gefunden."
 
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:413
 msgid "Sign local only (non exportable signature)"
 msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
 
-#: Src/wptKeysignDlg.cpp:358
+#: Src/wptKeysignDlg.cpp:414
 msgid "Signature expires on"
 msgstr "Signatur läuft ab am"
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:415
 msgid "Sign non-revocably"
 msgstr "Nicht-widerrufbar signieren"
 
-#: Src/wptKeysignDlg.cpp:360
+#: Src/wptKeysignDlg.cpp:416
 msgid "&Ask for certification level"
 msgstr "Zertifizierungslevel erfragen"
 
-#: Src/wptKeysignDlg.cpp:363
+#: Src/wptKeysignDlg.cpp:419
 msgid "&Show photo"
 msgstr "&Photo anzeigen"
 
 # c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:98
-#: Src/wptPassphraseCB.cpp:104 Src/wptPassphraseDlg.cpp:103
-#: Src/wptPINDlg.cpp:53
+#: Src/wptKeysignDlg.cpp:420 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:98 Src/wptPassphraseDlg.cpp:94 Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "&Maskiere Eingabe"
 
-#: Src/wptKeysignDlg.cpp:425
-msgid "You cannot select today as the expiration date."
-msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
-
-#: Src/wptKeysignDlg.cpp:460
-msgid "This key is already signed by your key"
-msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
-
 #: Src/wptKeyTrustPathDlg.cpp:136
 msgid "Trustlist"
 msgstr "Vertrauensliste"
@@ -4176,34 +4163,34 @@
 msgid "Could not set current window mode hooks."
 msgstr "Konnte \"Current Window\" Hooks nicht setzen."
 
-#: Src/wptMainProc.cpp:397
+#: Src/wptMainProc.cpp:398
 msgid "About..."
 msgstr "Über..."
 
-#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
+#: Src/wptMainProc.cpp:404 Src/wptMainProc.cpp:408
 msgid "Decrypt/Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
 # c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:419
 msgid "Current Window"
 msgstr "Aktuelles Fenster"
 
-#: Src/wptMainProc.cpp:476
+#: Src/wptMainProc.cpp:477
 msgid "Remove all passphrases from cache?"
 msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
 
-#: Src/wptMainProc.cpp:477 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
+#: Src/wptMainProc.cpp:478 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
 msgid "WinPT"
 msgstr "WinPT"
 
-#: Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:488
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 "Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
 "WinPT beenden?"
 
-#: Src/wptMainProc.cpp:520
+#: Src/wptMainProc.cpp:521
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4274,34 +4261,32 @@
 msgid "Ownertrust successfully imported."
 msgstr "Besitzervertrauen erfolgreich importiert."
 
-#: Src/wptPassphraseCB.cpp:100
+#: Src/wptPassphraseCB.cpp:94
 msgid "Encrypted with the following public key(s)"
 msgstr "Verschlüsselt mit folgenden öffentlichen Schlüssel(n)"
 
-#: Src/wptPassphraseCB.cpp:144
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr "Unbekannte Schlüssel-ID (%s, 0x%s)"
+#: Src/wptPassphraseCB.cpp:127
+msgid "Unknown key ID"
+msgstr "Unbekannte Schlüssel-ID"
 
 # c:\oss\winpt-gpgme\src\wptPassphraseCB.cpp:124
-#: Src/wptPassphraseCB.cpp:156
+#: Src/wptPassphraseCB.cpp:140
 msgid "Bad passphrase; Enter passphrase again"
 msgstr "Ungültiges Passwort; Bitte Passwort erneut eingeben"
 
-#: Src/wptPassphraseCB.cpp:157
+#: Src/wptPassphraseCB.cpp:141
 msgid "Please enter your passphrase"
 msgstr "Bitte geben Sie Ihr Passwort ein"
 
-#: Src/wptPassphraseCB.cpp:161
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
-msgstr ""
-"Symmetrisch verschlüsselt.\n"
-"%s verschlüsselte Daten."
+#: Src/wptPassphraseCB.cpp:147
+msgid "Symmetric encryption."
+msgstr "Symmetrisch verschlüsseln."
 
-#: Src/wptPassphraseCB.cpp:300
+#: Src/wptPassphraseCB.cpp:149
+msgid "encrypted data."
+msgstr "verschlüsselte Daten."
+
+#: Src/wptPassphraseCB.cpp:281
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4312,7 +4297,7 @@
 "\"%s\"\n"
 "%s Schlüssel, ID 0x%s (Hauptschlüssel ID 0x%s)\n"
 
-#: Src/wptPassphraseCB.cpp:306
+#: Src/wptPassphraseCB.cpp:287
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4323,7 +4308,7 @@
 "\"%s\"\n"
 "%s key, ID %s\n"
 
-#: Src/wptPassphraseCB.cpp:395
+#: Src/wptPassphraseCB.cpp:376
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -4333,23 +4318,23 @@
 "Schlüssel\n"
 "Karte: %s"
 
-#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
+#: Src/wptPassphraseDlg.cpp:82 Src/wptPassphraseDlg.cpp:128
 msgid "Passphrase Dialog"
 msgstr "Passwort Dialog"
 
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:87
 msgid "Repeat Passphrase"
 msgstr "Passwort erneut eingeben"
 
-#: Src/wptPassphraseDlg.cpp:98
+#: Src/wptPassphraseDlg.cpp:89
 msgid "Enter Passphrase"
 msgstr "Passwort eingeben"
 
-#: Src/wptPassphraseDlg.cpp:136
+#: Src/wptPassphraseDlg.cpp:127
 msgid "Please enter a passphrase."
 msgstr "Bitte ein Passwort eingeben."
 
-#: Src/wptPassphraseDlg.cpp:144
+#: Src/wptPassphraseDlg.cpp:135
 msgid ""
 "Your passphrase should be at least 8 characters long\n"
 "and should contain non-alphabetic characters.\n"
@@ -4361,7 +4346,7 @@
 "\n"
 "Möchten Sie trotzdem fortfahren?"
 
-#: Src/wptPassphraseDlg.cpp:154
+#: Src/wptPassphraseDlg.cpp:145
 msgid ""
 "The passphrase contains 8-bit characters.\n"
 "It is not suggested to use charset specific characters.\n"
@@ -4624,12 +4609,12 @@
 msgid "Text Input from File"
 msgstr "Texteingabe aus Datei"
 
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:79
 #, c-format
 msgid "PKA: Verified signer's address is '%s'"
 msgstr "PKA: Überprüfte Adresse des Unterzeichners ist '%s'"
 
-#: Src/wptVerifyList.cpp:139
+#: Src/wptVerifyList.cpp:109
 msgid ""
 "WARNING: This key is not certified with a trusted signature!\r\n"
 "                   There is no indication that the signature belongs to the "
@@ -4639,14 +4624,33 @@
 "                   Es gibt keinen Hinweis, dass die Signatur wirklich zu "
 "dieser Person gehört.\r\n"
 
-#: Src/wptVerifyList.cpp:144
+#: Src/wptVerifyList.cpp:114
 msgid "The signature is expired!"
 msgstr "Die Signatur ist abgelaufen!"
 
-#: Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:140
 msgid "Signed"
 msgstr "Signiert"
 
+#~ msgid ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serial-No: %s\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serien-Nr: %s\n"
+
+#~ msgid "Unknown key ID (%s, 0x%s)"
+#~ msgstr "Unbekannte Schlüssel-ID (%s, 0x%s)"
+
+#~ msgid ""
+#~ "Symmetric encryption.\n"
+#~ "%s encrypted data."
+#~ msgstr ""
+#~ "Symmetrisch verschlüsselt.\n"
+#~ "%s verschlüsselte Daten."
+
 #~ msgid "Select &wipe mode"
 #~ msgstr "Löschmodus auswählen"
 

Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po	2007-01-15 22:02:32 UTC (rev 279)
+++ trunk/Po/jp.po	2007-01-15 22:03:31 UTC (rev 280)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 0.10.2\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-12-07 14:51+0100\n"
+"POT-Creation-Date: 2007-01-15 22:58+0100\n"
 "PO-Revision-Date: 2005-12-22 07:28+0100\n"
 "Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
 "Language-Team: jp <jp at li.org>\n"
@@ -13,7 +13,7 @@
 "Content-Type: text/plain; charset=Shift_JIS\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:75
+#: Src/WinPT.cpp:71
 msgid ""
 "The gpg.conf contains at least one argument which points to a non-existing "
 "file."
@@ -21,7 +21,7 @@
 "gpg.conf‚̏­‚È‚­‚Ä‚àˆê‚ƒpƒ‰ƒ[ƒ^‚ª‘¶Ý‚µ‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ü‚·B"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:196
+#: Src/WinPT.cpp:192
 msgid "Could not create GPG home directory"
 msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -36,48 +36,48 @@
 # c:\oss\winpt\src\wptGPG.cpp:886 c:\oss\winpt\src\wptGPG.cpp:896
 # c:\oss\winpt\src\wptGPGME.cpp:175 c:\oss\winpt\src\wptMainProc.cpp:337
 # c:\oss\winpt\src\wptMainProc.cpp:509
-#: Src/WinPT.cpp:197 Src/WinPT.cpp:298 Src/WinPT.cpp:302 Src/WinPT.cpp:543
-#: Src/WinPT.cpp:552 Src/WinPT.cpp:559 Src/WinPT.cpp:582 Src/WinPT.cpp:592
-#: Src/WinPT.cpp:608 Src/WinPT.cpp:617 Src/WinPT.cpp:621 Src/WinPT.cpp:638
-#: Src/WinPT.cpp:707 Src/WinPT.cpp:720 Src/WinPT.cpp:767 Src/WinPT.cpp:810
-#: Src/WinPT.cpp:828 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:144
+#: Src/WinPT.cpp:193 Src/WinPT.cpp:294 Src/WinPT.cpp:298 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:555 Src/WinPT.cpp:578 Src/WinPT.cpp:588
+#: Src/WinPT.cpp:604 Src/WinPT.cpp:613 Src/WinPT.cpp:617 Src/WinPT.cpp:634
+#: Src/WinPT.cpp:703 Src/WinPT.cpp:716 Src/WinPT.cpp:763 Src/WinPT.cpp:806
+#: Src/WinPT.cpp:824 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:151
 #: Src/wptGPG.cpp:929 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951 Src/wptGPG.cpp:962
-#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:519
+#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:520
 msgid "WinPT Error"
 msgstr "WinPT ƒGƒ‰["
 
 # c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/WinPT.cpp:233
+#: Src/WinPT.cpp:229
 msgid "No useable secret key found."
 msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:173
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:180
-#: Src/WinPT.cpp:234 Src/WinPT.cpp:245 Src/wptKeyPropsDlg.cpp:370
+#: Src/WinPT.cpp:230 Src/WinPT.cpp:241 Src/wptKeyPropsDlg.cpp:370
 msgid "WinPT Warning"
 msgstr "WinPT Œx"
 
-#: Src/WinPT.cpp:244
+#: Src/WinPT.cpp:240
 msgid "Default secret key is unuseable"
 msgstr ""
 
 # c:\oss\winpt\src\WinPT.cpp:155
-#: Src/WinPT.cpp:297
+#: Src/WinPT.cpp:293
 msgid "Could not read GnuPG version."
 msgstr "GnuPGƒo[ƒWƒ‡ƒ“î•ñ‚ð“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:161
-#: Src/WinPT.cpp:303
-#, c-format
+#: Src/WinPT.cpp:299
+#, fuzzy, c-format
 msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
+"A newer GPG version is needed.\n"
+"Current GPG version %d.%d.%d, required "
 msgstr ""
 "GPG‚̐V‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B\n"
 "•K—v‚Æ‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ª %d.%d.%d ‚Å‚·B"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:337
+#: Src/WinPT.cpp:333
 msgid "Failed to create WinPT directory"
 msgstr "WinPTƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -96,26 +96,26 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/WinPT.cpp:338 Src/WinPT.cpp:355 Src/WinPT.cpp:366
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:642
+#: Src/WinPT.cpp:334 Src/WinPT.cpp:351 Src/WinPT.cpp:362
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:643
 #: Src/wptKeyserverDlg.cpp:71 Src/wptKeyserverDlg.cpp:73
 #: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
-#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:392
-#: Src/wptKeyserverDlg.cpp:398 Src/wptKeyserverDlg.cpp:500
-#: Src/wptKeyserverDlg.cpp:560 Src/wptKeyserverDlg.cpp:565
-#: Src/wptKeyserverDlg.cpp:759 Src/wptKeyserverDlg.cpp:784
-#: Src/wptKeyserverDlg.cpp:800 Src/wptKeyserverDlg.cpp:805
-#: Src/wptKeyserverDlg.cpp:811 Src/wptKeyserverDlg.cpp:817
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:394
+#: Src/wptKeyserverDlg.cpp:400 Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:567
+#: Src/wptKeyserverDlg.cpp:761 Src/wptKeyserverDlg.cpp:786
+#: Src/wptKeyserverDlg.cpp:802 Src/wptKeyserverDlg.cpp:807
+#: Src/wptKeyserverDlg.cpp:813 Src/wptKeyserverDlg.cpp:819
 msgid "Keyserver"
 msgstr "ƒL[ƒT[ƒo["
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:370
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/WinPT.cpp:354
+#: Src/WinPT.cpp:350
 msgid "Failed to copy the keyserver.conf"
 msgstr "keyserver.conf‚̃tƒ@ƒCƒ‹ƒRƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
-#: Src/WinPT.cpp:544
+#: Src/WinPT.cpp:540
 #, c-format
 msgid ""
 "The PTD.dll file has a different version than WinPT.exe\n"
@@ -125,15 +125,15 @@
 "PTD.dll‚̃o[ƒWƒ‡ƒ“‚ð%d.%d.%d‚ɍXV‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\WinPT.cpp:223
-#: Src/WinPT.cpp:551
+#: Src/WinPT.cpp:547
 msgid "Cryptographic selftest failed."
 msgstr "ˆÃ†–@ƒZƒ‹ƒtƒeƒXƒg‚ªŽ¸”s‚µ‚Ü‚µ‚½B"
 
-#: Src/WinPT.cpp:558
+#: Src/WinPT.cpp:554
 msgid "A newer GPGME version is needed; at least "
 msgstr "­‚È‚­‚Ä‚àGPME‚̐V‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B"
 
-#: Src/WinPT.cpp:579
+#: Src/WinPT.cpp:575
 msgid ""
 "The gpg.conf file contains the 'textmode' option\n"
 "which leads to broken binary output during decryption.\n"
@@ -141,7 +141,7 @@
 msgstr ""
 
 # c:\oss\winpt\src\WinPT.cpp:242
-#: Src/WinPT.cpp:593
+#: Src/WinPT.cpp:589
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -153,17 +153,17 @@
 "%s."
 
 # c:\oss\winpt\src\WinPT.cpp:246
-#: Src/WinPT.cpp:597
+#: Src/WinPT.cpp:593
 msgid "Select GPG Public Keyring"
 msgstr "GPGŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\WinPT.cpp:268
-#: Src/WinPT.cpp:607
+#: Src/WinPT.cpp:603
 msgid "GPG home directory could not be determined."
 msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:276
-#: Src/WinPT.cpp:615
+#: Src/WinPT.cpp:611
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -171,7 +171,7 @@
 "GPGƒoƒCƒiƒŠ(gpg.exe)‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
 "GPG ƒJƒXƒ^ƒ€Ý’è‚ð‹N“®‚µ‚Ä‚±‚Ì–â‘è‚ð‰ðŒˆ‚µ‚Ü‚·‚©H"
 
-#: Src/WinPT.cpp:630
+#: Src/WinPT.cpp:626
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -184,23 +184,23 @@
 "‚±‚Ì‚Ü‚Ü‘±‚¯‚é‚ÆWinPT‚ª‚¢‚ë‚¢‚ë‚È‘I‘ð‚ð’ño‚µ‚Ü‚·B\n"
 
 # c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
-#: Src/WinPT.cpp:663 Src/wptFileManagerDlg.cpp:520
-#: Src/wptFileManagerDlg.cpp:861
+#: Src/WinPT.cpp:659 Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:856
 msgid "Wipe Free Space"
 msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
 
 # c:\oss\winpt\src\WinPT.cpp:382
-#: Src/WinPT.cpp:706
+#: Src/WinPT.cpp:702
 msgid "Could not register window class"
 msgstr "ƒEƒBƒ“ƒh‚̃Nƒ‰ƒX‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:395
-#: Src/WinPT.cpp:720
+#: Src/WinPT.cpp:716
 msgid "Could not create window"
 msgstr "ƒEƒBƒ“ƒh‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:461
-#: Src/WinPT.cpp:808
+#: Src/WinPT.cpp:804
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -209,7 +209,7 @@
 "GPG‚±‚¤‚¹‚¢ (ƒL[ƒŠƒ“ƒO, ƒpƒX‚È‚Ç...) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\WinPT.cpp:464
-#: Src/WinPT.cpp:811
+#: Src/WinPT.cpp:807
 msgid ""
 "It seems that GPG is not configured properly.\n"
 "Do you want to start the GPG preferences dialog?"
@@ -218,7 +218,7 @@
 "GPGƒJƒXƒ^ƒ€Ý’è‚ðŽÀs‚µ‚Ü‚·H"
 
 # c:\oss\winpt\src\WinPT.cpp:480
-#: Src/WinPT.cpp:829
+#: Src/WinPT.cpp:825
 #, fuzzy, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found or is unuseable.\n"
@@ -247,7 +247,7 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
 # c:\oss\winpt\src\wptMainProc.cpp:560
 #: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptMainProc.cpp:568
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "WinPT‚ɂ‚¢‚Ä"
 
@@ -302,29 +302,29 @@
 msgid "&About GPG..."
 msgstr "GPG‚ɂ‚¢‚Ä..."
 
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2178
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2173
 #: Src/wptKeyManagerDlg.cpp:1002
 msgid "&Help"
 msgstr "ƒwƒ‹ƒv(&H)"
 
 # c:\oss\winpt\src\WinPT.cpp:340 c:\oss\winpt\src\wptCardDlg.cpp:98
 # c:\oss\winpt\src\wptCardDlg.cpp:125 c:\oss\winpt\src\wptMainProc.cpp:389
-#: Src/wptCardDlg.cpp:149 Src/wptMainProc.cpp:395
+#: Src/wptCardDlg.cpp:146 Src/wptMainProc.cpp:396
 msgid "Card Manager"
 msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
 
 # c:\oss\winpt\src\wptCardDlg.cpp:149
-#: Src/wptCardDlg.cpp:185
+#: Src/wptCardDlg.cpp:182
 msgid "No Fingerprint"
 msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:175
-#: Src/wptCardDlg.cpp:216
+#: Src/wptCardDlg.cpp:213
 msgid "No OpenPGP smart card detected."
 msgstr "OpenPGPƒXƒ}[ƒgƒJ[ƒh‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptCardDlg.cpp:340
+#: Src/wptCardDlg.cpp:337
 msgid "No PINs found."
 msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -338,92 +338,80 @@
 # c:\oss\winpt\src\wptCardDlg.cpp:634 c:\oss\winpt\src\wptCardDlg.cpp:639
 # c:\oss\winpt\src\wptCardDlg.cpp:644 c:\oss\winpt\src\wptCardDlg.cpp:695
 # c:\oss\winpt\src\wptCardDlg.cpp:697 c:\oss\winpt\src\wptMainProc.cpp:546
-#: Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:356
-#: Src/wptCardDlg.cpp:362 Src/wptCardDlg.cpp:374 Src/wptCardDlg.cpp:388
-#: Src/wptCardDlg.cpp:523 Src/wptCardDlg.cpp:624 Src/wptCardDlg.cpp:629
-#: Src/wptCardDlg.cpp:635 Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:648
-#: Src/wptCardDlg.cpp:656 Src/wptCardDlg.cpp:677 Src/wptCardDlg.cpp:703
-#: Src/wptCardDlg.cpp:708 Src/wptCardDlg.cpp:711 Src/wptCardDlg.cpp:737
-#: Src/wptCardDlg.cpp:739 Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749
-#: Src/wptCardDlg.cpp:813 Src/wptCardDlg.cpp:826 Src/wptCardDlg.cpp:829
+#: Src/wptCardDlg.cpp:337 Src/wptCardDlg.cpp:348 Src/wptCardDlg.cpp:353
+#: Src/wptCardDlg.cpp:359 Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:385
+#: Src/wptCardDlg.cpp:511 Src/wptCardDlg.cpp:612 Src/wptCardDlg.cpp:617
+#: Src/wptCardDlg.cpp:623 Src/wptCardDlg.cpp:630 Src/wptCardDlg.cpp:636
+#: Src/wptCardDlg.cpp:644 Src/wptCardDlg.cpp:665 Src/wptCardDlg.cpp:691
+#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:725
+#: Src/wptCardDlg.cpp:727 Src/wptCardDlg.cpp:732 Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:801 Src/wptCardDlg.cpp:814 Src/wptCardDlg.cpp:817
 #: Src/wptMainProc.cpp:265
 msgid "Card Edit"
 msgstr "ƒJ[ƒh•ÒW"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:299
-#: Src/wptCardDlg.cpp:350
+#: Src/wptCardDlg.cpp:347
 msgid "Only plain ASCII is currently allowed."
 msgstr "Œ»Ý‚̓vƒŒ[ƒ“ASCII‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:304
-#: Src/wptCardDlg.cpp:355
+#: Src/wptCardDlg.cpp:352
 msgid "Only alphabetic characters are allowed."
 msgstr "ƒAƒ‹ƒtƒ@ƒxƒbƒg‚Ì•¶Žš‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptCardDlg.cpp:362
+#: Src/wptCardDlg.cpp:359
 msgid "Invalid URL."
 msgstr "–³Œø‚ÈURLB"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:317
-#: Src/wptCardDlg.cpp:375
+#: Src/wptCardDlg.cpp:372
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "ƒJ[ƒh‚Ì‘®«u%sv‚ð•ÏX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:327
-#: Src/wptCardDlg.cpp:388
+#: Src/wptCardDlg.cpp:385
 msgid "Card attribute changed."
 msgstr "ƒJ[ƒh‚Ì‘®«‚ª•ÏX‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:362
-#: Src/wptCardDlg.cpp:428
+#: Src/wptCardDlg.cpp:423
 msgid "Please enter the 'Admin PIN'"
 msgstr "'Admin PIN'‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:364
-#: Src/wptCardDlg.cpp:430
+#: Src/wptCardDlg.cpp:425
 msgid "Please enter the 'User PIN'"
 msgstr "'User PIN'‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:366 c:\oss\winpt\src\wptPINDlg.cpp:47
-#: Src/wptCardDlg.cpp:432 Src/wptPINDlg.cpp:51
+#: Src/wptCardDlg.cpp:427 Src/wptPINDlg.cpp:51
 msgid "Please enter the PIN"
 msgstr "ˆÃØ”ԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-# c:\oss\winpt\src\wptCardDlg.cpp:370
-#: Src/wptCardDlg.cpp:436
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-"%s\n"
-"–¼‘OF %s %s\n"
-"ƒVƒŠƒAƒ‹”ԍ†F %s\n"
-
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:479 Src/wptCardDlg.cpp:595 Src/wptKeyEditDlgs.cpp:503
+#: Src/wptCardDlg.cpp:467 Src/wptCardDlg.cpp:583 Src/wptKeyEditDlgs.cpp:498
 msgid "&Name"
 msgstr "–¼‘O(&N)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptCardDlg.cpp:480
+#: Src/wptCardDlg.cpp:468
 #, fuzzy
 msgid "&Language"
 msgstr "•ÏX(&C)"
 
-#: Src/wptCardDlg.cpp:481
+#: Src/wptCardDlg.cpp:469
 msgid "&Key-URL"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:482
+#: Src/wptCardDlg.cpp:470
 msgid "&Login"
 msgstr ""
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptCardDlg.cpp:483
+#: Src/wptCardDlg.cpp:471
 #, fuzzy
 msgid "&Sex"
 msgstr "•Û‘¶(&S)"
@@ -431,31 +419,31 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptCardDlg.cpp:484 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2180
-#: Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
+#: Src/wptCardDlg.cpp:472 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2175
+#: Src/wptPassphraseDlg.cpp:96 Src/wptPINDlg.cpp:55
 msgid "&OK"
 msgstr "&OK"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:364
 # c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptCardDlg.cpp:485 Src/wptGPGOptDlg.cpp:51
+#: Src/wptCardDlg.cpp:473 Src/wptGPGOptDlg.cpp:51
 msgid "&Exit"
 msgstr "I—¹i&Ej"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:603
-#: Src/wptCardDlg.cpp:486
+#: Src/wptCardDlg.cpp:474
 #, fuzzy
 msgid "&New keys"
 msgstr "V‚µ‚¢ƒTƒuƒL["
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptCardDlg.cpp:487
+#: Src/wptCardDlg.cpp:475
 #, fuzzy
 msgid "Change &PIN"
 msgstr "ƒJ[ƒh‚̈Ïؔԍ†‚ð•ÏX‚·‚é"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:451
-#: Src/wptCardDlg.cpp:522
+#: Src/wptCardDlg.cpp:510
 msgid ""
 "This operation will override the keys on the card.\n"
 "Continue?"
@@ -464,13 +452,13 @@
 "‘±‚¯‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptSigList.cpp:47
-#: Src/wptCardDlg.cpp:594
+#: Src/wptCardDlg.cpp:582
 #, fuzzy
 msgid "Pubkey algorithm"
 msgstr "ƒAƒ‹ƒSƒŠƒYƒ€"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:596 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:584 Src/wptKeygenDlg.cpp:375
 msgid "&Comment (optional)"
 msgstr "ƒIƒvƒVƒ‡ƒiƒ‹ƒRƒƒ“ƒg(&C)"
 
@@ -479,77 +467,77 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
 # c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptCardDlg.cpp:597 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:377
 msgid "&Expire date"
 msgstr "—LŒøŠúŒÀ(&E)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:152
-#: Src/wptCardDlg.cpp:598
+#: Src/wptCardDlg.cpp:586
 msgid "Off-card passphrase"
 msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:599 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:587 Src/wptKeyEditDlgs.cpp:635 Src/wptKeygenDlg.cpp:379
 msgid "&Never"
 msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:600 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:588 Src/wptKeygenDlg.cpp:376
 msgid "Email &address"
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX(&A)"
 
 # c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptCardDlg.cpp:601
+#: Src/wptCardDlg.cpp:589
 msgid "Overwrite old keys on the card"
 msgstr "ƒJ[ƒhã‚É‚ ‚éŒÃ‚¢ƒL[‚ðã‘‚«‚µ‚Ü‚·‚©H"
 
-#: Src/wptCardDlg.cpp:602
+#: Src/wptCardDlg.cpp:590
 msgid "Make off-card backup of encryption key"
 msgstr "ˆÃ†‰»ƒL[‚̃J[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:603 Src/wptKeyManagerDlg.cpp:1833
+#: Src/wptCardDlg.cpp:591 Src/wptKeyManagerDlg.cpp:1833
 msgid "Card Key Generation"
 msgstr "ƒJ[ƒhƒL[ì¬"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:537
-#: Src/wptCardDlg.cpp:624
+#: Src/wptCardDlg.cpp:612
 msgid "Please enter your name."
 msgstr "‚ ‚È‚½‚Ì–¼‘O‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:541
-#: Src/wptCardDlg.cpp:628
+#: Src/wptCardDlg.cpp:616
 msgid "Name must be at least 5 characters long."
 msgstr "–¼‘O‚Ì’·‚³‚͍Œá5•¶Žš‚É‚È‚é‚ׂ«‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:547
-#: Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:622
 msgid "Please enter your e-mail address."
 msgstr "‚ ‚È‚½‚Ì“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:554
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:629
 msgid "Please enter a valid e-mail address."
 msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptCardDlg.cpp:647
+#: Src/wptCardDlg.cpp:635
 msgid "Please enter an off-card passphrase."
 msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-#: Src/wptCardDlg.cpp:655
+#: Src/wptCardDlg.cpp:643
 msgid "Please use plain ASCII charset for the fields."
 msgstr "ƒtƒB[ƒ‹ƒh‚ɃvƒŒ[ƒ“ASCII•¶Žš‚ðŽg‚Á‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:580
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
 # c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:676 Src/wptKeyEditDlgs.cpp:1389 Src/wptKeygenDlg.cpp:457
+#: Src/wptCardDlg.cpp:664 Src/wptKeyEditDlgs.cpp:1384 Src/wptKeygenDlg.cpp:457
 msgid "The date you have chosen has already passed."
 msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª–³Œø‚Å‚·i‰ß‚¬‚Ä‚¢‚Ü‚·jB"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:602
-#: Src/wptCardDlg.cpp:701
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -558,42 +546,42 @@
 "ã‘‚«(Overwrite)ƒtƒ‰ƒO‚ðƒ}[ƒN‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:610
-#: Src/wptCardDlg.cpp:710
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "ƒL[‚̍쐬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:632
-#: Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:725
 msgid "Please enter the old card PIN."
 msgstr "ŒÃ‚¢ƒJ[ƒh‚̈Ïؔԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:634
-#: Src/wptCardDlg.cpp:739
+#: Src/wptCardDlg.cpp:727
 msgid "Please enter the new card PIN."
 msgstr "V‚µ‚¢ƒJ[ƒh‚̈Ïؔԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptPINDlg.cpp:69
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:732
 msgid "Admin PIN must be at least 8 characters."
 msgstr "ŠÇ—ŽÒˆÃØ”ԍ†'Admin PIN'‚Ì’·‚³‚͍Œá8•¶Žš‚Å‚·B"
 
 # c:\oss\winpt\src\wptPINDlg.cpp:88
-#: Src/wptCardDlg.cpp:749
+#: Src/wptCardDlg.cpp:737
 msgid "PIN must be at least 6 characters."
 msgstr "ˆÃØ”ԍ†'PIN'‚Ì’·‚³‚͍Œá6•¶Žš‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptCardDlg.cpp:772
+#: Src/wptCardDlg.cpp:760
 msgid "Change Card PIN"
 msgstr "ƒJ[ƒh‚̈Ïؔԍ†‚ð•ÏX‚·‚é"
 
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:146
-#: Src/wptCardDlg.cpp:812 Src/wptPassphraseDlg.cpp:256
+#: Src/wptCardDlg.cpp:800 Src/wptPassphraseDlg.cpp:247
 msgid "Passphrases do not match. Please try again."
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ªƒ}ƒbƒ`‚µ‚Ü‚¹‚ñB‚à‚¤ˆê“xƒgƒ‰ƒC‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:697
-#: Src/wptCardDlg.cpp:828
+#: Src/wptCardDlg.cpp:816
 msgid "PIN successfully changed."
 msgstr "ˆÃØ”ԍ†‚ª³‚µ‚­•ÏX‚µ‚Ü‚µ‚½B"
 
@@ -621,7 +609,7 @@
 msgstr "GnuPG‚̏ó‘Ô"
 
 # c:\oss\winpt\src\wptCardManager.cpp:47
-#: Src/wptCardManager.cpp:53
+#: Src/wptCardManager.cpp:48
 msgid ""
 "Please insert the OpenPGP smart card\n"
 "Press OK to continue or Cancel"
@@ -630,34 +618,34 @@
 "Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:136
-#: Src/wptClipDecryptDlg.cpp:179 Src/wptKeyRevokersDlg.cpp:129
-#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:257
-#: Src/wptVerifyList.cpp:319
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:138
+#: Src/wptClipDecryptDlg.cpp:182 Src/wptKeyRevokersDlg.cpp:129
+#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:229
+#: Src/wptVerifyList.cpp:293
 msgid "user ID not found"
 msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:105
+#: Src/wptClipDecryptDlg.cpp:106
 msgid "Signature status: created with a fully trusted key"
 msgstr "–¼‚̏ó‘ԁFŠ®‘S‚ɐM—p‚Å‚«‚éƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:172
-#: Src/wptClipDecryptDlg.cpp:107
+#: Src/wptClipDecryptDlg.cpp:108
 msgid "Signature status: created with a marginal trusted key"
 msgstr "–¼‚̏ó‘ԁF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:112
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "–¼‚̏ó‘ԁFM—p‚Å‚«‚È‚¢ƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:115
 msgid "Signature status: created with an undefined trusted key"
 msgstr "–¼‚̏ó‘ԁF’è‹`‚³‚ê‚Ä‚¢‚È‚¢Š®‘S‚ɐM—p‚Å‚«‚éƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:125
 #, c-format
 msgid ""
 "*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -676,7 +664,7 @@
 "*** –¼ŽÒ: %s (0x%s)\r\n"
 "*** PGP•œ†ƒeƒLƒXƒg‚ðŽn‚ß‚é ***\r\n"
 
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:132
 msgid ""
 "\r\n"
 "*** END PGP DECRYPTED TEXT ***"
@@ -685,12 +673,12 @@
 "*** PGP•œ†ƒeƒLƒXƒg‚ðI—¹‚·‚é ***"
 
 # c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Decrypt Verify"
 msgstr "•œ†/Šm”F"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:190
 #, c-format
 msgid ""
 "%s\n"
@@ -720,14 +708,14 @@
 # c:\oss\winpt\src\wptMainProc.cpp:191 c:\oss\winpt\src\wptMainProc.cpp:259
 # c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
 # c:\oss\winpt\src\wptMainProc.cpp:406
-#: Src/wptClipDecryptDlg.cpp:218 Src/wptClipVerifyDlg.cpp:159
-#: Src/wptClipVerifyDlg.cpp:170 Src/wptClipVerifyDlg.cpp:186
-#: Src/wptClipVerifyDlg.cpp:203 Src/wptClipVerifyDlg.cpp:214
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipVerifyDlg.cpp:144
+#: Src/wptClipVerifyDlg.cpp:155 Src/wptClipVerifyDlg.cpp:171
+#: Src/wptClipVerifyDlg.cpp:188 Src/wptClipVerifyDlg.cpp:199
 #: Src/wptFileManager.cpp:1670 Src/wptFileManager.cpp:1735
-#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:597
-#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:276
-#: Src/wptKeyserverDlg.cpp:284 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
-#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:404
+#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:279
+#: Src/wptKeyserverDlg.cpp:286 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:405
 msgid "Verify"
 msgstr "Šm”F‚·‚é"
 
@@ -737,16 +725,16 @@
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:138
 # c:\oss\winpt\src\wptFileManager.cpp:952
 # c:\oss\winpt\src\wptFileManager.cpp:996
-#: Src/wptClipDecryptDlg.cpp:225 Src/wptClipDecryptDlg.cpp:238
-#: Src/wptClipDecryptDlg.cpp:246 Src/wptClipDecryptDlg.cpp:253
-#: Src/wptClipDecryptDlg.cpp:255 Src/wptFileManager.cpp:1377
+#: Src/wptClipDecryptDlg.cpp:230 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptClipDecryptDlg.cpp:258
+#: Src/wptClipDecryptDlg.cpp:260 Src/wptFileManager.cpp:1377
 #: Src/wptFileManager.cpp:1428
 msgid "Decryption"
 msgstr "•œ†"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
 # c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:239 Src/wptFileManager.cpp:1429
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptFileManager.cpp:1429
 #, c-format
 msgid ""
 "Encrypted with %s key, ID 0x%s.%s\n"
@@ -755,17 +743,17 @@
 " %s‚ň͆‰»‚µ‚Ä‚ ‚éAID‚ª %s.%s‚Å‚·\n"
 "•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
 
-#: Src/wptClipDecryptDlg.cpp:246
+#: Src/wptClipDecryptDlg.cpp:251
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
 
-#: Src/wptClipDecryptDlg.cpp:252
+#: Src/wptClipDecryptDlg.cpp:257
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr "•s–¾‚ÈOpenPGPƒƒbƒZ[ƒW"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:267
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -780,7 +768,7 @@
 "‚Ü‚½A‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:272
 msgid "*** IMPORTANT ***"
 msgstr "*** d—v ***"
 
@@ -792,10 +780,10 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:274
 # c:\oss\winpt\src\wptKeyManager.cpp:610
 # c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:271 Src/wptClipEncryptDlg.cpp:221
+#: Src/wptClipDecryptDlg.cpp:276 Src/wptClipEncryptDlg.cpp:216
 #: Src/wptClipSignDlg.cpp:118 Src/wptClipSignDlg.cpp:264
-#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:962 Src/wptSymEnc.cpp:94
+#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:296
+#: Src/wptKeyManager.cpp:762 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:88
 msgid "GnuPG Status: Finished"
 msgstr "GunPG‚̏ó‘ԁFI—¹‚µ‚Ü‚µ‚½"
 
@@ -812,9 +800,9 @@
 #: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
 #: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
 #: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
-#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:417
-#: Src/wptMainProc.cpp:500 Src/wptMainProc.cpp:505 Src/wptVerifyList.cpp:232
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:212
+#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:501 Src/wptMainProc.cpp:506 Src/wptVerifyList.cpp:202
 msgid "Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
 
@@ -859,7 +847,7 @@
 msgstr "ˆø‚«‡‚¢(&Q)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:502
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:497
 msgid "&Open..."
 msgstr "ŠJ‚­(&O)..."
 
@@ -868,32 +856,32 @@
 msgid "&Save..."
 msgstr "•Û‘¶...(&S)"
 
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:515
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:510
 msgid "&Paste"
 msgstr "‚Í‚è•t‚¯(&P)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:355
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:503
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:498
 msgid "&Encrypt"
 msgstr "ˆÃ†‰»(&E)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:356
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:505
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:500
 msgid "&Decrypt"
 msgstr "•œ†(&D)"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:45 c:\oss\winpt\src\wptMainProc.cpp:181
 # c:\oss\winpt\src\wptMainProc.cpp:249 c:\oss\winpt\src\wptMainProc.cpp:554
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:562
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipEncryptDlg.cpp:104
+#: Src/wptClipEncryptDlg.cpp:106
 msgid "key not found"
 msgstr "ƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: Src/wptClipEncryptDlg.cpp:123
+#: Src/wptClipEncryptDlg.cpp:122
 msgid "Recipients unsuable for encryption:\n"
 msgstr "ŽóMŽÒ‚½‚¿‚͈͆‰»Žg—p‚É“K‚³‚È‚¢:\n"
 
@@ -903,43 +891,43 @@
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
 # c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptClipEncryptDlg.cpp:139 Src/wptClipEncryptDlg.cpp:161
-#: Src/wptClipEncryptDlg.cpp:211 Src/wptClipEncryptDlg.cpp:218
-#: Src/wptClipEncryptDlg.cpp:244 Src/wptMainProc.cpp:172
+#: Src/wptClipEncryptDlg.cpp:135 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:172
 msgid "Encryption"
 msgstr "ˆÃ†‰»"
 
 # c:\oss\winpt\src\wptFileSaveDlg.cpp:88
 # c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipEncryptDlg.cpp:162
+#: Src/wptClipEncryptDlg.cpp:157
 msgid "&Find"
 msgstr "ŒŸŽ@(&F)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptClipEncryptDlg.cpp:163 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
 #: Src/wptCommonDlg.cpp:80 Src/wptCommonDlg.cpp:257
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
-#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:283 Src/wptFileSaveDlg.cpp:59
 #: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
-#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
-#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
+#: Src/wptKeyEditDlgs.cpp:354 Src/wptKeyEditDlgs.cpp:435
+#: Src/wptKeyEditDlgs.cpp:501 Src/wptKeyEditDlgs.cpp:636
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
 #: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:95
-#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
+#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:418 Src/wptPassphraseCB.cpp:89
+#: Src/wptPassphraseDlg.cpp:95 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:120 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
 msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)"
 
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:109
 # c:\oss\winpt\src\wptClipSignEncDlg.cpp:110
-#: Src/wptClipEncryptDlg.cpp:210 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
 msgid "You must select at least one key."
 msgstr "­‚È‚­‚Ä‚àˆê‚‚̃L[‚ð‘I‘ð‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
 
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
-#: Src/wptClipEncryptDlg.cpp:245
+#: Src/wptClipEncryptDlg.cpp:240
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr "'%s'‚É‚æ‚éŽóMŽÒ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1020,28 +1008,28 @@
 
 # c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1225
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1198
 msgid "No key was selected."
 msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:136
-#: Src/wptClipVerifyDlg.cpp:139
+#: Src/wptClipVerifyDlg.cpp:125
 msgid "Signature Information"
 msgstr "ƒVƒOƒjƒ`ƒƒ[‚̏î•ñ"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptClipVerifyDlg.cpp:160 Src/wptFileVerifyDlg.cpp:52
+#: Src/wptClipVerifyDlg.cpp:145 Src/wptFileVerifyDlg.cpp:52
 #: Src/wptGPGOptDlg.cpp:49
 msgid "&Save"
 msgstr "•Û‘¶(&S)"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
-#: Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:188
 msgid "Invalid signature state."
 msgstr "–¼‚̏󋵂͖³Œø‚Å‚·B"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:118
-#: Src/wptClipVerifyDlg.cpp:213
+#: Src/wptClipVerifyDlg.cpp:198
 #, fuzzy
 msgid "Error while adding signature information."
 msgstr "ƒL[‚Ü‚½‚͏–¼î•ñ‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1054,7 +1042,7 @@
 # c:\oss\winpt\src\wptFileSaveDlg.cpp:92
 # c:\oss\winpt\src\wptFileSaveDlg.cpp:97
 # c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipVerifyDlg.cpp:251 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:236 Src/wptFileSaveDlg.cpp:58
 #: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
 #: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
 #: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -1069,7 +1057,7 @@
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:180
 # c:\oss\winpt\src\wptKeyManager.cpp:427
-#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:516
+#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:508
 msgid "HTTP Key Import"
 msgstr "HTTPƒL[‚̃Cƒ“ƒ|[ƒg"
 
@@ -1117,34 +1105,34 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1568
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1173
-#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:758
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:867
-#: Src/wptKeyEditDlgs.cpp:881 Src/wptKeyEditDlgs.cpp:883
-#: Src/wptKeyEditDlgs.cpp:909 Src/wptKeyEditDlgs.cpp:939
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyEditDlgs.cpp:1017
-#: Src/wptKeyEditDlgs.cpp:1024 Src/wptKeyEditDlgs.cpp:1044
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1310 Src/wptKeyEditDlgs.cpp:1326
-#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1394 Src/wptKeyEditDlgs.cpp:1433
-#: Src/wptKeyEditDlgs.cpp:1438 Src/wptKeyEditDlgs.cpp:1445
-#: Src/wptKeyEditDlgs.cpp:1451 Src/wptKeyEditDlgs.cpp:1456
-#: Src/wptKeyEditDlgs.cpp:1499 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1518
-#: Src/wptKeyEditDlgs.cpp:1521 Src/wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:1569 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1734
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1807
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeyEditDlgs.cpp:1822
-#: Src/wptKeyEditDlgs.cpp:1927 Src/wptKeyEditDlgs.cpp:1929
-#: Src/wptKeyEditDlgs.cpp:1945 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1982 Src/wptKeyEditDlgs.cpp:1990
-#: Src/wptKeyEditDlgs.cpp:2006 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2024 Src/wptKeyEditDlgs.cpp:2091
-#: Src/wptKeyEditDlgs.cpp:2154 Src/wptKeyEditDlgs.cpp:2168
-#: Src/wptKeyEditDlgs.cpp:2183 Src/wptKeyEditDlgs.cpp:2223
-#: Src/wptKeyEditDlgs.cpp:2228 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:753
+#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:862
+#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1012
+#: Src/wptKeyEditDlgs.cpp:1019 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1305 Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1355 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389 Src/wptKeyEditDlgs.cpp:1428
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1506 Src/wptKeyEditDlgs.cpp:1513
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1556
+#: Src/wptKeyEditDlgs.cpp:1564 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1620 Src/wptKeyEditDlgs.cpp:1729
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1922 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:2001 Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2019 Src/wptKeyEditDlgs.cpp:2086
+#: Src/wptKeyEditDlgs.cpp:2149 Src/wptKeyEditDlgs.cpp:2163
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyEditDlgs.cpp:2218
+#: Src/wptKeyEditDlgs.cpp:2223 Src/wptKeyManagerDlg.cpp:1031
 #: Src/wptKeyManagerDlg.cpp:1972
 msgid "Key Edit"
 msgstr "ƒL[‚̕ҏW"
@@ -1154,7 +1142,7 @@
 msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ð“ü—Í‚·‚é"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:337
+#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:346
 msgid "Choose Locale Directory"
 msgstr "'Locale'ÃÞ¨Ú¸ÄØ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢"
 
@@ -1173,13 +1161,13 @@
 msgstr "Œ¾Œê‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptErrors.cpp:43
-#: Src/wptErrors.cpp:47
+#: Src/wptErrors.cpp:51
 #, c-format
 msgid "Could not locate GPG.exe in %s."
 msgstr "GPG.exeƒvƒƒOƒ‰ƒ€‚ð %s ‚ÅŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:48
-#: Src/wptErrors.cpp:52
+#: Src/wptErrors.cpp:56
 #, c-format
 msgid ""
 "Could not find keyring entries in the config file in %s or the file does NOT "
@@ -1189,182 +1177,182 @@
 "Šù‘¶‚µ‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptErrors.cpp:65
-#: Src/wptErrors.cpp:78
+#: Src/wptErrors.cpp:83
 msgid "General error occured"
 msgstr "ˆê”Ê“I‚ȃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:66
-#: Src/wptErrors.cpp:79
+#: Src/wptErrors.cpp:84
 msgid "Could not open file"
 msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚­‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:67
-#: Src/wptErrors.cpp:80
+#: Src/wptErrors.cpp:85
 msgid "Could not create file"
 msgstr "ƒtƒ@ƒCƒ‹‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:68
-#: Src/wptErrors.cpp:81
+#: Src/wptErrors.cpp:86
 msgid "Could not read file"
 msgstr "ƒtƒ@ƒCƒ‹‚ð“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:69
-#: Src/wptErrors.cpp:82
+#: Src/wptErrors.cpp:87
 msgid "Could not write file"
 msgstr "ƒtƒ@ƒCƒ‹‚ɏ‘‚­‚±‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:70
-#: Src/wptErrors.cpp:83
+#: Src/wptErrors.cpp:88
 msgid "Could not close file"
 msgstr "ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptErrors.cpp:84
+#: Src/wptErrors.cpp:89
 msgid "File does not exist"
 msgstr "ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptErrors.cpp:72
-#: Src/wptErrors.cpp:85
+#: Src/wptErrors.cpp:90
 msgid "Could not delete file"
 msgstr "ƒtƒ@ƒCƒ‹‚ðíœ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:73
-#: Src/wptErrors.cpp:86
+#: Src/wptErrors.cpp:91
 msgid "Could not open Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ðŠJ‚­‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:74
-#: Src/wptErrors.cpp:87
+#: Src/wptErrors.cpp:92
 msgid "Could not close Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ð•Â‚¶‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:75
-#: Src/wptErrors.cpp:88
+#: Src/wptErrors.cpp:93
 msgid "Could not empty Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ð‹ó‚É‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:76
-#: Src/wptErrors.cpp:89
+#: Src/wptErrors.cpp:94
 msgid "Could not set Clipboard data"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒf[ƒ^‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:77
-#: Src/wptErrors.cpp:90
+#: Src/wptErrors.cpp:95
 msgid "Could not get Clipboard data"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚̃f[ƒ^‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:78
-#: Src/wptErrors.cpp:91
+#: Src/wptErrors.cpp:96
 msgid "There is no text in the Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ɃeƒLƒXƒg‚ª“ü‚Á‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptErrors.cpp:79
-#: Src/wptErrors.cpp:92
+#: Src/wptErrors.cpp:97
 msgid "The Clipboard already contains GPG data"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚É‚ÍŠù‚ÉGPGƒf[ƒ^‚ª“ü‚Á‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptErrors.cpp:80
-#: Src/wptErrors.cpp:93
+#: Src/wptErrors.cpp:98
 msgid "General Clipboard error"
 msgstr "ˆê”Ê“I‚ȃNƒŠƒbƒvƒ{[ƒhƒGƒ‰["
 
 # c:\oss\winpt\src\wptErrors.cpp:82
-#: Src/wptErrors.cpp:94
+#: Src/wptErrors.cpp:99
 msgid "Registry error: "
 msgstr "ƒŒƒWƒXƒgƒŠƒGƒ‰["
 
 # c:\oss\winpt\src\wptErrors.cpp:83
-#: Src/wptErrors.cpp:97
+#: Src/wptErrors.cpp:102
 msgid "Could not startup Winsock 2 interface"
 msgstr "Winsock2‚̃Cƒ“ƒ^[ƒtƒF[ƒX‚ðŠJŽn‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:84
-#: Src/wptErrors.cpp:98
+#: Src/wptErrors.cpp:103
 msgid "Could not resolve hostname"
 msgstr "ƒzƒXƒg–¼‚ð‘ÅŠJ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:85
-#: Src/wptErrors.cpp:99
+#: Src/wptErrors.cpp:104
 msgid "Could not create new socket"
 msgstr "V‚µ‚¢¿¯¹Ä‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:86
-#: Src/wptErrors.cpp:100
+#: Src/wptErrors.cpp:105
 msgid "Could not connect to the host"
 msgstr "ƒzƒXƒg‚ɐڑ±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:87
-#: Src/wptErrors.cpp:101
+#: Src/wptErrors.cpp:106
 msgid "Could not send the key to the keyserver"
 msgstr "‚±‚̃L[‚ðƒL[ƒT[ƒo[‚É‘—M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:88
-#: Src/wptErrors.cpp:102
+#: Src/wptErrors.cpp:107
 msgid "Could not receive the key from the keyserver"
 msgstr "ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽóM‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:89
-#: Src/wptErrors.cpp:103
+#: Src/wptErrors.cpp:108
 msgid "Socket timed out, no data"
 msgstr "¿¹¯Ã‚ªƒ^ƒCƒ€ƒAƒEƒg‚µ‚Ü‚µ‚½Bƒf[ƒ^‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/wptErrors.cpp:104
+#: Src/wptErrors.cpp:109
 #, fuzzy
 msgid "Could not forward request to proxy"
 msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:90
-#: Src/wptErrors.cpp:105
+#: Src/wptErrors.cpp:110
 msgid "Keyserver returned: no matching keys in database"
 msgstr "ƒL[ƒT[ƒo[ŒŸõŒ‹‰ÊF ƒ}ƒbƒ`‚·‚éƒL[‚ªƒf[ƒ^ƒx[ƒX‚É‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptErrors.cpp:91
-#: Src/wptErrors.cpp:106
+#: Src/wptErrors.cpp:111
 msgid "Could not register hotkey: "
 msgstr "ƒzƒbƒgƒL[‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:92
-#: Src/wptErrors.cpp:109
+#: Src/wptErrors.cpp:114
 msgid "Could not open directory"
 msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ð‹ó‚É‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/wptErrors.cpp:110
+#: Src/wptErrors.cpp:115
 msgid "Could not create directory"
 msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:94
-#: Src/wptErrors.cpp:111
+#: Src/wptErrors.cpp:116
 msgid "Could not extract data from the current window"
 msgstr "Œ»Ý‚̃EƒBƒ“ƒh‚©‚çƒf[ƒ^‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:95
-#: Src/wptErrors.cpp:112
+#: Src/wptErrors.cpp:117
 msgid "Could not load config file"
 msgstr "‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðƒ[ƒh‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:121
 msgid "No data available"
 msgstr "ƒf[ƒ^‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 # c:\oss\winpt\src\wptErrors.cpp:99
-#: Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:122
 msgid "There is no card in the reader"
 msgstr "ƒŠ[ƒ_[‚ɃJ[ƒh‚ª“ü‚Á‚Ä‚¨‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptErrors.cpp:100
-#: Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:123
 msgid "There was no reader found"
 msgstr "ƒŠ[ƒ_[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptErrors.cpp:101
-#: Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:124
 msgid "This is not an OpenPGP card"
 msgstr "‚±‚ê‚ÍOpenPGPƒJ[ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:274
-#: Src/wptErrors.cpp:128
+#: Src/wptErrors.cpp:134
 #, c-format
 msgid "Unknown error=%d"
 msgstr "–¢’mƒGƒ‰[ ec=%d"
@@ -1387,9 +1375,9 @@
 #: Src/wptFileManager.cpp:915 Src/wptFileManager.cpp:1045
 #: Src/wptFileManager.cpp:1579 Src/wptFileManager.cpp:1606
 #: Src/wptFileManager.cpp:1625 Src/wptFileManager.cpp:1910
-#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:530
-#: Src/wptFileManagerDlg.cpp:640 Src/wptFileStatDlg.cpp:152
-#: Src/wptMainProc.cpp:393 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:525
+#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:394 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
 msgid "File Manager"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
 
@@ -1435,8 +1423,8 @@
 # c:\oss\winpt\src\wptFileManager.cpp:179
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
 # c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
-#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1080
-#: Src/wptVerifyList.cpp:169
+#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptVerifyList.cpp:139
 msgid "Status"
 msgstr "ó‹µ"
 
@@ -1444,9 +1432,9 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:919
 # c:\oss\winpt\src\wptKeyRevokersDlg.cpp:43
 # c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
-#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1156
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:168
+#: Src/wptVerifyList.cpp:138
 msgid "Name"
 msgstr "–¼‘O"
 
@@ -1499,21 +1487,21 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:403
 # c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
 #: Src/wptFileManager.cpp:1217 Src/wptFileManager.cpp:1529
-#: Src/wptFileManagerDlg.cpp:595 Src/wptMainProc.cpp:156
-#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:408
+#: Src/wptFileManagerDlg.cpp:590 Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:409
 msgid "Sign"
 msgstr "–¼"
 
 # c:\oss\winpt\src\wptFileManager.cpp:868
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:401
 # c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
-#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:593
-#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:405
+#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:588
+#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:406
 msgid "Encrypt"
 msgstr "ŒöŠJˆÃ†‰»"
 
 # c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
-#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:92
+#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:66 Src/wptSymEnc.cpp:86
 msgid "Symmetric Encryption"
 msgstr "‹¤’ʈ͆‰»"
 
@@ -1522,7 +1510,7 @@
 # c:\oss\winpt\src\wptFileManager.cpp:919
 # c:\oss\winpt\src\wptMainProc.cpp:401
 #: Src/wptFileManager.cpp:1290 Src/wptFileManager.cpp:1295
-#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:410
 msgid "Symmetric"
 msgstr "‹¤’ʈ͆‰»"
 
@@ -1545,7 +1533,7 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1011
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:402
 #: Src/wptFileManager.cpp:1437 Src/wptFileManager.cpp:1457
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:589
 msgid "Decrypt"
 msgstr "•œ†"
 
@@ -1612,11 +1600,11 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:516
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:150
 #: Src/wptFileManager.cpp:1803 Src/wptFileManager.cpp:1814
-#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:406
-#: Src/wptImportList.cpp:413 Src/wptImportList.cpp:423
-#: Src/wptImportList.cpp:431 Src/wptImportList.cpp:440
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:469
-#: Src/wptKeyManager.cpp:567 Src/wptKeyManager.cpp:586
+#: Src/wptFileManagerDlg.cpp:240 Src/wptImportList.cpp:387
+#: Src/wptImportList.cpp:394 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:412 Src/wptImportList.cpp:421
+#: Src/wptKeyManager.cpp:450 Src/wptKeyManager.cpp:461
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:578
 #: Src/wptKeyserverDlg.cpp:220
 msgid "Import"
 msgstr "ƒCƒ“ƒ|[ƒg"
@@ -1639,8 +1627,8 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:262
 # c:\oss\winpt\src\wptKeyManager.cpp:294
 # c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:282
-#: Src/wptKeyManager.cpp:325 Src/wptKeyManager.cpp:360
+#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:317 Src/wptKeyManager.cpp:352
 msgid "No key was selected for export."
 msgstr "ƒGƒLƒXƒ|[ƒg‚·‚邽‚߂̃L[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
 
@@ -1665,8 +1653,8 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1060
-#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1412
+#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1055
+#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1407
 #: Src/wptKeyserverDlg.cpp:105
 msgid "GnuPG status"
 msgstr "GnuPG‚̏ó‘Ô"
@@ -1715,27 +1703,27 @@
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:69
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:129
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
+#: Src/wptFileManagerDlg.cpp:86 Src/wptFileManagerDlg.cpp:148
 msgid "File Encrypt"
 msgstr "ƒtƒ@ƒCƒ‹‚̈͆‰»"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:70
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:247
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:87 Src/wptFileManagerDlg.cpp:277
 msgid "&Text Output"
 msgstr "ƒeƒLƒXƒgo—Í(&T)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:71
-#: Src/wptFileManagerDlg.cpp:93
+#: Src/wptFileManagerDlg.cpp:88
 msgid "&Wipe Original"
 msgstr "Œ´–{‚ðíœ‚·‚é(&W)"
 
-#: Src/wptFileManagerDlg.cpp:94
+#: Src/wptFileManagerDlg.cpp:89
 msgid "Anonymize (throw keyid)"
 msgstr "“½–¼‚É‚·‚é(ƒL[ID‚𖳌ø‰»‚É‚·‚é)"
 
 # c:\oss\winpt\src\wptClipSignEncDlg.cpp:71
-#: Src/wptFileManagerDlg.cpp:95
+#: Src/wptFileManagerDlg.cpp:90
 msgid "&Select Key for signing"
 msgstr "–¼—p‚̃L[‚ð‘I‘ð‚·‚é(&S)"
 
@@ -1743,42 +1731,42 @@
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:79 c:\oss\winpt\src\wptGPGOptDlg.cpp:83
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:90 c:\oss\winpt\src\wptGPGOptDlg.cpp:96
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:580
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:282
 msgid "Options"
 msgstr "ƒIƒvƒVƒ‡ƒ“"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:128
-#: Src/wptFileManagerDlg.cpp:152
+#: Src/wptFileManagerDlg.cpp:147
 msgid "Please select at least one recipient."
 msgstr "­‚È‚­‚Ä‚àˆêl‚ÌŽóMŽÒ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:190
 # c:\oss\winpt\src\wptKeyManager.cpp:408
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:426
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileStatDlg.cpp:281
+#: Src/wptKeyManager.cpp:418
 msgid "No valid OpenPGP data found."
 msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:180
 # c:\oss\winpt\src\wptKeyManager.cpp:427
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
-#: Src/wptKeyManager.cpp:451
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileManagerDlg.cpp:220
+#: Src/wptKeyManager.cpp:443
 msgid "Key Import"
 msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
 
-#: Src/wptFileManagerDlg.cpp:216
+#: Src/wptFileManagerDlg.cpp:211
 #, c-format
 msgid "%s contain(s) %d key(s)."
 msgstr "%s ‚É‚Í %d ƒL[‚ª‚ ‚è‚Ü‚·B"
 
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
-#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:499
+#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:494
 #: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "ƒtƒ@ƒCƒ‹"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:219
-#: Src/wptFileManagerDlg.cpp:242
+#: Src/wptFileManagerDlg.cpp:237
 msgid ""
 "Some of the imported keys are secret keys.\n"
 "\n"
@@ -1791,27 +1779,27 @@
 "ƒL[‘®«ƒ_ƒCƒ„ƒƒO‚ð—˜—p‚µ‚Đݒ肷‚é‚ׂ«‚Å‚·B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:246
-#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
+#: Src/wptFileManagerDlg.cpp:276 Src/wptFileManagerDlg.cpp:323
 msgid "File Sign"
 msgstr "–¼ƒtƒ@ƒCƒ‹"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:248
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:278
 msgid "&Normal Signature"
 msgstr "•’ʂȏ–¼(&N)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:249
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:279
 msgid "&Detached Signature"
 msgstr "ƒfƒ^ƒbƒ`ƒh–¼(&D)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:250
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:280
 msgid "&Cleartext Signature"
 msgstr "•½•ª–¼(&C)"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:136
-#: Src/wptFileManagerDlg.cpp:286
+#: Src/wptFileManagerDlg.cpp:281
 msgid "Signature mode"
 msgstr "–¼‚̃‚[ƒh"
 
@@ -1831,10 +1819,10 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyManager.cpp:690 Src/wptKeyManager.cpp:791
-#: Src/wptKeyManager.cpp:824 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptFileManagerDlg.cpp:323 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyManager.cpp:682 Src/wptKeyManager.cpp:783
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManagerDlg.cpp:1710
 #: Src/wptKeyManagerDlg.cpp:1726 Src/wptKeyManagerDlg.cpp:1754
 #: Src/wptKeyManagerDlg.cpp:1765 Src/wptKeyManagerDlg.cpp:1780
 #: Src/wptKeyManagerDlg.cpp:1893 Src/wptKeyManagerDlg.cpp:1912
@@ -1842,28 +1830,28 @@
 msgid "Please select a key."
 msgstr "ƒL[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
-#: Src/wptFileManagerDlg.cpp:387
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "ƒ[ƒƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
 
-#: Src/wptFileManagerDlg.cpp:391
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:496 Src/wptMainProc.cpp:532
+#: Src/wptFileManagerDlg.cpp:491 Src/wptMainProc.cpp:533
 msgid "File Manager (use drag & drop to add files)"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:495 Src/wptKeyManagerDlg.cpp:967
 #: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptMainProc.cpp:396
+#: Src/wptMainProc.cpp:397
 msgid "Edit"
 msgstr "•ÒW"
 
-#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptFileManagerDlg.cpp:496 Src/wptKeyManagerDlg.cpp:968
 msgid "View"
 msgstr "ƒrƒ…["
 
@@ -1873,13 +1861,13 @@
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
 # c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptFileManagerDlg.cpp:504 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:499 Src/wptFileManagerDlg.cpp:587
 msgid "Encrypt into ZIP"
 msgstr "ZIP‚Ɉ͆‰»‚·‚é"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:357
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:984
 #: Src/wptKeyManagerDlg.cpp:1034
 msgid "&Sign"
 msgstr "–¼(&S)"
@@ -1887,48 +1875,48 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:358
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:404
 # c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
-#: Src/wptFileManagerDlg.cpp:507 Src/wptFileManagerDlg.cpp:596
-#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:406
+#: Src/wptFileManagerDlg.cpp:502 Src/wptFileManagerDlg.cpp:591
+#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
 msgid "Sign && Encrypt"
 msgstr "–¼‹y‚ш͆‰»"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:359
-#: Src/wptFileManagerDlg.cpp:508
+#: Src/wptFileManagerDlg.cpp:503
 msgid "&Verify"
 msgstr "Šm”F‚·‚é(&V)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:361
-#: Src/wptFileManagerDlg.cpp:509
+#: Src/wptFileManagerDlg.cpp:504
 msgid "S&ymmetric"
 msgstr "‹¤’ʈ͆‰»(&Y)"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:181
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptFileManagerDlg.cpp:510
+#: Src/wptFileManagerDlg.cpp:505
 msgid "&Import"
 msgstr "ƒCƒ“ƒ|[ƒg(&I)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:363
-#: Src/wptFileManagerDlg.cpp:511
+#: Src/wptFileManagerDlg.cpp:506
 msgid "E&xport"
 msgstr "ƒGƒNƒXƒ|[ƒg(&X)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:364
 # c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:512 Src/wptMainProc.cpp:398
+#: Src/wptFileManagerDlg.cpp:507 Src/wptMainProc.cpp:399
 msgid "Exit"
 msgstr "I—¹"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:508
 msgid "&Reset"
 msgstr "‰Šú‰»(&R)"
 
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:509
 msgid "Always on Top"
 msgstr "‚¢‚‚àÅ‘O–Ê"
 
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:511
 msgid "&Select All"
 msgstr "‘S‚Ä‚ð‘I‘ð‚·‚é(&S)"
 
@@ -1952,71 +1940,71 @@
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:270
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:317
 # c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptFileManagerDlg.cpp:517
+#: Src/wptFileManagerDlg.cpp:512
 msgid "&Preferences"
 msgstr "ƒJƒXƒ^ƒ€Ý’è(&P)"
 
-#: Src/wptFileManagerDlg.cpp:518 Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:594
 msgid "Send as Mail"
 msgstr "ƒ[ƒ‹‚Æ‚µ‚Ä‘—M‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:514
 msgid "&List Packets"
 msgstr "ƒpƒPƒbƒg‚̈ꗗ‚Ђ傤(&L)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:360
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:516
 msgid "&Wipe"
 msgstr "íœ(&W)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:406
-#: Src/wptFileManagerDlg.cpp:598
+#: Src/wptFileManagerDlg.cpp:593
 msgid "Wipe"
 msgstr "Žæ‚èÁ‚µ"
 
-#: Src/wptFileManagerDlg.cpp:600
+#: Src/wptFileManagerDlg.cpp:595
 msgid "List Packets"
 msgstr "ƒpƒPƒbƒg‚ðƒŠƒXƒg‚·‚é"
 
 # c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptFileManagerDlg.cpp:627
+#: Src/wptFileManagerDlg.cpp:622
 msgid "&Calc Digest"
 msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
 
-#: Src/wptFileManagerDlg.cpp:639
+#: Src/wptFileManagerDlg.cpp:634
 msgid "This command requires admin privileges.\n"
 msgstr "‚±‚̃Rƒ}ƒ“ƒh‚ð—˜—p‚·‚é‚Ì‚ÉŠÇ—ŽÒ“ÁŒ ‚ª•K—v‚Å‚·B\n"
 
 # c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:785
 msgid "Are you sure you want to secure delete these files?"
 msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘Síœ‚µ‚Ü‚·‚©Hn"
 
-#: Src/wptFileManagerDlg.cpp:791 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:786 Src/wptMainProc.cpp:110
 msgid "&Yes"
 msgstr "‚Í‚¢(&Y)"
 
-#: Src/wptFileManagerDlg.cpp:792 Src/wptMainProc.cpp:111
+#: Src/wptFileManagerDlg.cpp:787 Src/wptMainProc.cpp:111
 msgid "&No"
 msgstr "‚¢‚¢‚¦(&N)"
 
-#: Src/wptFileManagerDlg.cpp:793
+#: Src/wptFileManagerDlg.cpp:788
 msgid "passes"
 msgstr ""
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:858
+#: Src/wptFileManagerDlg.cpp:853
 msgid "Operation Status: Error"
 msgstr "‘€ìó‹µFƒGƒ‰["
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:859
+#: Src/wptFileManagerDlg.cpp:854
 msgid "Operation Status: Done."
 msgstr "‘€ìó‹µFŠ®—¹B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:902
+#: Src/wptFileManagerDlg.cpp:897
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -2146,11 +2134,11 @@
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:270
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:317
 # c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
-#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
-#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
-#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
-#: Src/wptKeyEditDlgs.cpp:1739 Src/wptMainProc.cpp:419
+#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:231 Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:259
+#: Src/wptGPGPrefsDlg.cpp:265 Src/wptGPGPrefsDlg.cpp:279
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptMainProc.cpp:420
 #: Src/wptPreferencesDlg.cpp:209 Src/wptPreferencesDlg.cpp:254
 #: Src/wptPreferencesDlg.cpp:266 Src/wptPreferencesDlg.cpp:287
 #: Src/wptPreferencesDlg.cpp:315 Src/wptRegistry.cpp:596
@@ -2337,7 +2325,7 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
 # c:\oss\winpt\src\wptMainProc.cpp:572
 #: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1865
-#: Src/wptMainProc.cpp:580
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
 
@@ -2393,42 +2381,42 @@
 msgstr "‹K’èÝ’è‚ðã‘‚µ‚Ü‚·(&O)"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:107
-#: Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter the GnuPG home directory."
 msgstr "GnuPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:154
-#: Src/wptGPGPrefsDlg.cpp:233
+#: Src/wptGPGPrefsDlg.cpp:242
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "ƒŒƒWƒXƒgƒŠ‚É'HomeDir'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:158
-#: Src/wptGPGPrefsDlg.cpp:239
+#: Src/wptGPGPrefsDlg.cpp:248
 msgid "Please enter where GPG.exe is located."
 msgstr "GPG.exeƒtƒ@ƒCƒ‹‚Ì‚ ‚éêŠ‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:162
-#: Src/wptGPGPrefsDlg.cpp:244
+#: Src/wptGPGPrefsDlg.cpp:253
 msgid "Could not find the GPG program in this directory."
 msgstr "GPGƒvƒ‰ƒOƒ‰ƒ€‚ª‚±‚̃fƒBƒŒƒNƒgƒŠ‚É“ü‚Á‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:166
-#: Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:258
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "ƒŒƒWƒXƒgƒŠ‚É'gpgProgram'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:180
-#: Src/wptGPGPrefsDlg.cpp:269
+#: Src/wptGPGPrefsDlg.cpp:278
 msgid "Could not get GPG config file"
 msgstr "GPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:319
+#: Src/wptGPGPrefsDlg.cpp:328
 msgid "Choose GPG Home Directory"
 msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
 
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
-#: Src/wptGPGPrefsDlg.cpp:343
+#: Src/wptGPGPrefsDlg.cpp:352
 msgid "Choose GPG Binary"
 msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð‚·‚é"
 
@@ -2500,23 +2488,23 @@
 # c:\oss\winpt\src\wptKeysigDlg.cpp:397 c:\oss\winpt\src\wptMainProc.cpp:388
 # c:\oss\winpt\src\wptMainProc.cpp:536
 #: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:186 Src/wptKeyManager.cpp:191
-#: Src/wptKeyManager.cpp:240 Src/wptKeyManager.cpp:283
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:326
-#: Src/wptKeyManager.cpp:331 Src/wptKeyManager.cpp:338
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:370 Src/wptKeyManager.cpp:374
-#: Src/wptKeyManager.cpp:394 Src/wptKeyManager.cpp:419
-#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:427
-#: Src/wptKeyManager.cpp:432 Src/wptKeyManager.cpp:438
-#: Src/wptKeyManager.cpp:443 Src/wptKeyManager.cpp:690
-#: Src/wptKeyManager.cpp:718 Src/wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:738 Src/wptKeyManager.cpp:764
-#: Src/wptKeyManager.cpp:791 Src/wptKeyManager.cpp:796
-#: Src/wptKeyManager.cpp:819 Src/wptKeyManager.cpp:824
-#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:898
-#: Src/wptKeyManager.cpp:903 Src/wptKeyManager.cpp:960
-#: Src/wptKeyManager.cpp:993 Src/wptKeyManager.cpp:1077
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
+#: Src/wptKeyManager.cpp:232 Src/wptKeyManager.cpp:275
+#: Src/wptKeyManager.cpp:287 Src/wptKeyManager.cpp:318
+#: Src/wptKeyManager.cpp:323 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:332 Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:362 Src/wptKeyManager.cpp:366
+#: Src/wptKeyManager.cpp:386 Src/wptKeyManager.cpp:411
+#: Src/wptKeyManager.cpp:416 Src/wptKeyManager.cpp:419
+#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:430
+#: Src/wptKeyManager.cpp:435 Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:710 Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:730 Src/wptKeyManager.cpp:756
+#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:788
+#: Src/wptKeyManager.cpp:811 Src/wptKeyManager.cpp:816
+#: Src/wptKeyManager.cpp:830 Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:895 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManager.cpp:1068
 #: Src/wptKeyManagerDlg.cpp:1357 Src/wptKeyManagerDlg.cpp:1368
 #: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1688
 #: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyManagerDlg.cpp:1726
@@ -2529,7 +2517,7 @@
 #: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeyManagerDlg.cpp:2117
 #: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
 #: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
-#: Src/wptMainProc.cpp:394 Src/wptMainProc.cpp:543 Src/wptMainProc.cpp:551
+#: Src/wptMainProc.cpp:395 Src/wptMainProc.cpp:544 Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
 
@@ -2627,12 +2615,12 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
 # c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1134 Src/wptKeyEditDlgs.cpp:1184
-#: Src/wptKeyEditDlgs.cpp:1450 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1509 Src/wptKeyEditDlgs.cpp:1540
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1784
-#: Src/wptKeyEditDlgs.cpp:1986 Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:252
+#: Src/wptKeyEditDlgs.cpp:1129 Src/wptKeyEditDlgs.cpp:1179
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1465
+#: Src/wptKeyEditDlgs.cpp:1504 Src/wptKeyEditDlgs.cpp:1535
+#: Src/wptKeyEditDlgs.cpp:1613 Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeylist.cpp:407 Src/wptKeylist.cpp:441
 #: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
 #: Src/wptKeysigDlg.cpp:215
 msgid "Revoked"
@@ -2643,26 +2631,26 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
 # c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptImportList.cpp:270 Src/wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1132 Src/wptKeyEditDlgs.cpp:1372
-#: Src/wptKeylist.cpp:427 Src/wptKeylist.cpp:457 Src/wptKeyPropsDlg.cpp:150
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:254
+#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeylist.cpp:409 Src/wptKeylist.cpp:439 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
 msgid "Expired"
 msgstr "ŠúŒÀØ‚ê"
 
 # c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptImportList.cpp:274
+#: Src/wptImportList.cpp:271
 msgid "secret key"
 msgstr "ӎФΨ"
 
 # c:\oss\winpt\src\wptImportList.cpp:57
-#: Src/wptImportList.cpp:276 Src/wptKeylist.cpp:463
+#: Src/wptImportList.cpp:271 Src/wptKeylist.cpp:450
 msgid "public key"
 msgstr "ŒöŠJŒ®"
 
 # c:\oss\winpt\src\wptImportList.cpp:84
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:306 Src/wptKeyEditDlgs.cpp:1192
+#: Src/wptImportList.cpp:289 Src/wptKeyEditDlgs.cpp:1187
 msgid "Invalid user ID"
 msgstr "–³Œø‚ȃ†[ƒU[ID"
 
@@ -2672,10 +2660,10 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:45
 # c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
 # c:\oss\winpt\src\wptVerifyList.cpp:88
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588
+#: Src/wptImportList.cpp:327 Src/wptKeylist.cpp:566 Src/wptKeylist.cpp:574
 #: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:173
+#: Src/wptVerifyList.cpp:143
 msgid "User ID"
 msgstr "ƒ†[ƒU[ID"
 
@@ -2683,7 +2671,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:474 c:\oss\winpt\src\wptKeylist.cpp:40
 # c:\oss\winpt\src\wptKeylist.cpp:51
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
-#: Src/wptImportList.cpp:347 Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591
+#: Src/wptImportList.cpp:328 Src/wptKeylist.cpp:568 Src/wptKeylist.cpp:577
 #: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "ƒTƒCƒY"
@@ -2694,11 +2682,11 @@
 # c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
 # c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1077
-#: Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptImportList.cpp:329 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeylist.cpp:567 Src/wptKeylist.cpp:575 Src/wptKeyManagerDlg.cpp:911
 #: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:172
+#: Src/wptVerifyList.cpp:142
 msgid "Key ID"
 msgstr "ƒL[‚ÌID"
 
@@ -2707,21 +2695,21 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
 # c:\oss\winpt\src\wptSigList.cpp:44
-#: Src/wptImportList.cpp:349 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:595
+#: Src/wptImportList.cpp:330 Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:581
 #: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
 #: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "ì¬"
 
 # c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:590
+#: Src/wptImportList.cpp:331 Src/wptKeylist.cpp:576
 #: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
 msgid "Type"
 msgstr "Ží—Þ"
 
 # c:\oss\winpt\src\wptImportList.cpp:216
-#: Src/wptImportList.cpp:421
+#: Src/wptImportList.cpp:402
 msgid ""
 "It is possible that the ASCII-Armor is damaged\n"
 "and thus causing a CRC error."
@@ -2751,32 +2739,32 @@
 msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:392
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeylist.cpp:374
 msgid "Ultimate"
 msgstr "ÅI“I"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
 # c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1130
-#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:386
+#: Src/wptKeyEditDlgs.cpp:238 Src/wptKeyEditDlgs.cpp:1125
+#: Src/wptKeylist.cpp:230 Src/wptKeylist.cpp:368
 msgid "Never"
 msgstr "‚Í‚¸‚Í‚È‚¢"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptKeyEditDlgs.cpp:261 Src/wptKeyEditDlgs.cpp:1136
+#: Src/wptKeyEditDlgs.cpp:256 Src/wptKeyEditDlgs.cpp:1131
 msgid "OK"
 msgstr "OK"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:278
 msgid "user ID"
 msgstr "ƒ†[ƒU[ID"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:284
+#: Src/wptKeyEditDlgs.cpp:279
 #, c-format
 msgid ""
 "Could not get key information for: \"%s\":\n"
@@ -2784,7 +2772,7 @@
 msgstr "ƒL[‚̏î•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:356
+#: Src/wptKeyEditDlgs.cpp:351
 msgid ""
 "Remember that the image is stored within your public key.  If you use a very "
 "large picture, your key will become very large as well! Keeping the image "
@@ -2795,7 +2783,7 @@
 "‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:357
+#: Src/wptKeyEditDlgs.cpp:352
 msgid ""
 "Pick an image to use for your photo ID.\n"
 "The image must be a JPEG file."
@@ -2805,8 +2793,8 @@
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:361
+#: Src/wptKeyEditDlgs.cpp:353 Src/wptKeyEditDlgs.cpp:434
+#: Src/wptKeysignDlg.cpp:417
 msgid "Passphrase"
 msgstr "ƒpƒXƒtƒŒ[ƒY"
 
@@ -2815,12 +2803,12 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:355
 msgid "Add Photo ID"
 msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:367
+#: Src/wptKeyEditDlgs.cpp:362
 msgid "Select Image File"
 msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
 
@@ -2829,25 +2817,25 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:371 Src/wptKeyEditDlgs.cpp:382
-#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyEditDlgs.cpp:400
-#: Src/wptKeyEditDlgs.cpp:903
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383 Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:898
 msgid "Add Photo"
 msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:367
 #, c-format
 msgid "'%s' is not a valid JPEG file."
 msgstr "ŽŸ‚̃tƒ@ƒCƒ‹'%s'‚ª—LŒø‚ÈJPEG‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:248
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyRevokeDlg.cpp:166
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:166
 msgid "Please enter a file name."
 msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:381
 msgid ""
 "The JPEG is really large.\n"
 "Are you sure you want to use it?"
@@ -2856,7 +2844,7 @@
 "Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:400
 msgid "Photo successfully added."
 msgstr "ƒtƒHƒg‚ª³‚µ‚­’ljÁ‚³‚ê‚Ü‚µ‚½B"
 
@@ -2875,23 +2863,23 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:167
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:75
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:469
-#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:725
-#: Src/wptKeyEditDlgs.cpp:1472 Src/wptKeyEditDlgs.cpp:1542
-#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1640
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeyEditDlgs.cpp:401 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:546 Src/wptKeyEditDlgs.cpp:720
+#: Src/wptKeyEditDlgs.cpp:1467 Src/wptKeyEditDlgs.cpp:1537
+#: Src/wptKeyEditDlgs.cpp:1587 Src/wptKeyEditDlgs.cpp:1635
+#: Src/wptKeyEditDlgs.cpp:1833 Src/wptKeygenDlg.cpp:499
 #: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:386
 #: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "GnuPG‚̏ó‘Ô"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:318
-#: Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:432
 msgid "Appointing a key as designated revoker cannot be undone."
 msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤Žw’肳‚ꂽŒãAŒ³‚É–ß‚³‚ê‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:319
-#: Src/wptKeyEditDlgs.cpp:438
+#: Src/wptKeyEditDlgs.cpp:433
 msgid "Public key"
 msgstr "ŒöŠJŒ®"
 
@@ -2899,8 +2887,8 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:358
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:708
-#: Src/wptKeyEditDlgs.cpp:441 Src/wptKeyEditDlgs.cpp:450
-#: Src/wptKeyEditDlgs.cpp:463 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:436 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:458 Src/wptKeyEditDlgs.cpp:929
 msgid "Add Revoker"
 msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
 
@@ -2909,35 +2897,35 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1324
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1365
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1561 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1812
-#: Src/wptKeyEditDlgs.cpp:1982
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1556 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1977
 msgid "Please select a user ID."
 msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:468
+#: Src/wptKeyEditDlgs.cpp:463
 msgid "Revoker successfully addded."
 msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:502
+#: Src/wptKeyEditDlgs.cpp:497
 msgid "Add new User ID"
 msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:499
 msgid "&Email"
 msgstr "“dŽqƒ[ƒ‹(&E)"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:505
+#: Src/wptKeyEditDlgs.cpp:500
 msgid "&Comment"
 msgstr "ƒRƒƒ“ƒg(&C)"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:512
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
 
@@ -2945,14 +2933,14 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:524
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:535
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:525 Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:544
 msgid "UserID"
 msgstr "ƒ†[ƒU[ID"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:523
+#: Src/wptKeyEditDlgs.cpp:518
 msgid ""
 "Please enter the email address in the email field and not in the name field"
 msgstr ""
@@ -2960,43 +2948,43 @@
 "‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:525
 msgid "Please enter an email address."
 msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:530
 msgid "Invalid email address."
 msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:546
 msgid "user ID successfully added."
 msgstr "ƒ†[ƒU[ID‚𐳂µ‚­’ljÁ‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:472
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditDlgs.cpp:636 Src/wptKeyEditDlgs.cpp:839
+#: Src/wptKeyEditDlgs.cpp:631 Src/wptKeyEditDlgs.cpp:834
 msgid "Add new Subkey"
 msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:637
+#: Src/wptKeyEditDlgs.cpp:632
 msgid "Key type"
 msgstr "ƒL[‚ÌŽí—Þ"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:633
 msgid "Size in bits"
 msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:639
+#: Src/wptKeyEditDlgs.cpp:634
 msgid "Key expiration"
 msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:684
+#: Src/wptKeyEditDlgs.cpp:679
 msgid "Please select one entry."
 msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
@@ -3009,18 +2997,18 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:540
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:637
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:676
-#: Src/wptKeyEditDlgs.cpp:685 Src/wptKeyEditDlgs.cpp:691
-#: Src/wptKeyEditDlgs.cpp:722 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:680 Src/wptKeyEditDlgs.cpp:686
+#: Src/wptKeyEditDlgs.cpp:717 Src/wptKeyEditDlgs.cpp:817
 msgid "Add Subkey"
 msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:690
+#: Src/wptKeyEditDlgs.cpp:685
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS‚͌ŒèƒL[ƒTƒCƒY1024‚ªŽg—p‚µ‚Ü‚·BƒTƒCƒY‚ª•ÏX‚³‚ê‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:678
-#: Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:719
 msgid "Subkey successfully added."
 msgstr "ƒTƒuƒL[‚ª³‚µ‚­’ljÁ‚³‚ê‚Ü‚µ‚½B"
 
@@ -3033,10 +3021,10 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1196
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
-#: Src/wptKeyEditDlgs.cpp:752 Src/wptKeyEditDlgs.cpp:821
-#: Src/wptKeyEditDlgs.cpp:902 Src/wptKeyEditDlgs.cpp:934
-#: Src/wptKeyEditDlgs.cpp:1016 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:747 Src/wptKeyEditDlgs.cpp:816
+#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
+#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1355
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1488
 #: Src/wptKeyManagerDlg.cpp:1743
 msgid "There is no secret key available!"
 msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -3044,29 +3032,29 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:579
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:599
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:613
-#: Src/wptKeyEditDlgs.cpp:753 Src/wptKeyEditDlgs.cpp:772
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:767
 msgid "Add user ID"
 msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:875
 msgid "Preferred keyserver successfully set."
 msgstr "Šó–]‚̃L[ƒT[ƒo[‚ª³‚µ‚­Ý’è‚Å‚«‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:58
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:189
-#: Src/wptKeyEditDlgs.cpp:969 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
 #: Src/wptKeyPropsDlg.cpp:377
 msgid "Change Ownertrust"
 msgstr "Š—LŽÒ‚̐M—Š(ownertrust)‚̕ύX"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:156
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyManager.cpp:238
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyManager.cpp:230
 msgid "Key status changed."
 msgstr "ƒL[‚̏ó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:1022
+#: Src/wptKeyEditDlgs.cpp:1017
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
@@ -3075,16 +3063,16 @@
 "IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:1029
+#: Src/wptKeyEditDlgs.cpp:1024
 msgid "Current (old) Passphrase"
 msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1029
 msgid "New Passphrase"
 msgstr "V‚µ‚¢ƒpƒXƒtƒŒ[ƒY"
 
-#: Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1037
 msgid ""
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, continue?"
@@ -3093,39 +3081,39 @@
 "‚±‚ê‚Í‚ ‚Ü‚è—Ç‚¢‘I‘ð‚Å‚Í‚ ‚è‚Ü‚¹‚ñB‘±‚¯‚Ü‚·‚©?"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
-#: Src/wptKeyEditDlgs.cpp:1058
+#: Src/wptKeyEditDlgs.cpp:1053
 msgid "Change Password"
 msgstr "ƒpƒXƒ[ƒh‚̕ύX"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1055
 msgid "Passphrase successfully changed."
 msgstr "ƒpƒXƒtƒŒ[ƒY‚̕ύX‚͐³‚µ‚­‚Å‚«‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
 msgid "Description"
 msgstr "Ú×"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1079
+#: Src/wptKeyEditDlgs.cpp:1074
 msgid "Expires"
 msgstr "ŠúŒÀØ‚ê‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
 # c:\oss\winpt\src\wptKeylist.cpp:53
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeylist.cpp:584 Src/wptKeylist.cpp:593
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:570 Src/wptKeylist.cpp:579
 #: Src/wptKeyManagerDlg.cpp:915
 msgid "Validity"
 msgstr "—LŒø«"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1162
+#: Src/wptKeyEditDlgs.cpp:1157
 msgid "Email"
 msgstr "“dŽqƒ[ƒ‹"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1245
 #, fuzzy
 msgid ""
 "ADDUID      add a user ID\r\n"
@@ -3172,29 +3160,29 @@
 "MINIMIZE  ‘S‚Ă̏–¼‚ðƒL[‚©‚çŠO‚·\r\n"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1266
 msgid "Key Edit Help"
 msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1310
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1305
 msgid "Primary key can not be deleted!"
 msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
 
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1313
 msgid ""
 "Anything encrypted to the selected subkey cannot be\n"
 "decrypted any longer."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid ""
 "Anything signed by the selected subkey cannot be\n"
 "verified any longer."
 msgstr ""
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1327
+#: Src/wptKeyEditDlgs.cpp:1322
 #, fuzzy, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -3208,16 +3196,16 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1331
 msgid "Delete Subkey"
 msgstr "ƒTƒuƒL[‚̍폜"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1340
+#: Src/wptKeyEditDlgs.cpp:1335
 msgid "Subkey successfully deleted."
 msgstr "ƒTƒuƒL[‚𐳂µ‚­íœ‚³‚ê‚Ü‚µ‚½B"
 
-#: Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1368
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -3230,22 +3218,22 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1146
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1149
 # c:\oss\winpt\src\wptKeygenDlg.cpp:303 c:\oss\winpt\src\wptKeygenDlg.cpp:306
-#: Src/wptKeyEditDlgs.cpp:1382 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1380
 msgid "Key Expiration Date"
 msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyEditDlgs.cpp:1401
 msgid "Expire Subkey"
 msgstr "ŠúŒÀ‚̐؂ꂽƒTƒuƒL["
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1411
+#: Src/wptKeyEditDlgs.cpp:1406
 msgid "Subkey expire date successfully set."
 msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚­Ý’è‚Å‚«‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1437
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -3258,37 +3246,37 @@
 "‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1446
 msgid "Key already revoked."
 msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1463
 msgid "Revoke Subkey"
 msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1472
+#: Src/wptKeyEditDlgs.cpp:1467
 msgid "Subkey successfully revoked."
 msgstr "ƒTƒuƒL[‚𐳂µ‚­–³Œø‚É‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1494
+#: Src/wptKeyEditDlgs.cpp:1489
 msgid "Revoke user ID"
 msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1494
 msgid "Key has only one user ID."
 msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1510
+#: Src/wptKeyEditDlgs.cpp:1505
 msgid "This user ID has been already revoked."
 msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1511
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -3300,60 +3288,60 @@
 "‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1533
 msgid "Revoke User ID"
 msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1542
+#: Src/wptKeyEditDlgs.cpp:1537
 msgid "User ID successfully revoked"
 msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1589
+#: Src/wptKeyEditDlgs.cpp:1584
 msgid "Set user ID preferences"
 msgstr "ƒ†[ƒU[IDƒIƒvƒVƒ‡ƒ“‚ðƒZƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1587
 msgid "User ID preferences successfully updated"
 msgstr "ƒ†[ƒU[IDƒIƒvƒVƒ‡ƒ“‚̍XV‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1637
+#: Src/wptKeyEditDlgs.cpp:1632
 msgid "Primary"
 msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1640
+#: Src/wptKeyEditDlgs.cpp:1635
 msgid "User ID successfully flagged"
 msgstr "ƒ†[ƒU[ID‚ɐ³‚µ‚­ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
 
-#: Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1729
 msgid "No preferences available."
 msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
 
-#: Src/wptKeyEditDlgs.cpp:1738
+#: Src/wptKeyEditDlgs.cpp:1733
 msgid "MDC feature"
 msgstr "MDC‚«‚Ì‚¤"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1735
 msgid "user ID:"
 msgstr "ƒ†[ƒU[IDF"
 
 # c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1801
 msgid "Primary user ID can not be deleted!"
 msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1812
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -3369,30 +3357,30 @@
 "‚±‚̃†[ƒU[ID‚ð–{“–‚ɍ폜‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1834
+#: Src/wptKeyEditDlgs.cpp:1829
 msgid "Delete User ID"
 msgstr "ƒ†[ƒU[ID‚ðíœ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1838
+#: Src/wptKeyEditDlgs.cpp:1833
 msgid "User ID successfully deleted"
 msgstr "ƒ†[ƒU[ID‚𐳂µ‚­íœ‚µ‚Ü‚µ‚½B"
 
-#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1924 Src/wptKeyEditDlgs.cpp:1942
 msgid "Finished to compact key."
 msgstr "ƒL[‚ðƒRƒ“ƒpƒNƒg‚·‚邱‚Æ‚ªŠ®¬‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1989
+#: Src/wptKeyEditDlgs.cpp:1984
 msgid "Do you really want to make this sig exportable?"
 msgstr "‚±‚̏–¼‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyEditDlgs.cpp:2015 Src/wptKeysignDlg.cpp:385
 msgid "Key successfully signed."
 msgstr "ƒL[‚ð–¼‚·‚邱‚Ƃɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
-#: Src/wptKeyEditDlgs.cpp:2083
+#: Src/wptKeyEditDlgs.cpp:2078
 #, c-format
 msgid ""
 "Your keys is listed as a designated revoker for the key\n"
@@ -3409,32 +3397,32 @@
 "ã‹L‚̃ŠƒXƒg‚É‚ ‚éƒL[‚𖳌ø‰»‚·‚邽‚ß\n"
 "–³Œø‰»‚·‚éØ–¾‘‚ð–{“–‚ɍ쐬‚µ‚Ü‚·‚©?"
 
-#: Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyEditDlgs.cpp:2116
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr "‚«‚Ì‚¤: C = Ø–¾‚·‚éA S = –¼A E = ˆÃ†‰»AA = Ø–¾‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:2176
+#: Src/wptKeyEditDlgs.cpp:2171
 msgid "Command>"
 msgstr "ƒRƒ}ƒ“ƒh"
 
-#: Src/wptKeyEditDlgs.cpp:2177 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyEditDlgs.cpp:2172 Src/wptKeyserverDlg.cpp:691
 #: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "•Â‚¶‚é(&C)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyEditDlgs.cpp:2179
+#: Src/wptKeyEditDlgs.cpp:2174
 msgid "&Revoke..."
 msgstr "–³Œø‰»‚«‚Ì‚¤(&R)"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2223
+#: Src/wptKeyEditDlgs.cpp:2218
 msgid "Please select a command."
 msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2227
+#: Src/wptKeyEditDlgs.cpp:2222
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
 
@@ -3533,8 +3521,8 @@
 #: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
 #: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
 #: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
-#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:147
-#: Src/wptPassphraseDlg.cpp:157
+#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:138
+#: Src/wptPassphraseDlg.cpp:148
 msgid "Key Generation"
 msgstr "ƒL[‚̍쐬"
 
@@ -3791,52 +3779,52 @@
 msgstr "ƒL[‚ªƒAƒbƒvƒf[ƒg‚³‚ê‚Ä‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:261
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair"
 msgstr "ƒL[ƒyƒA"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:245
 msgid "Key Pair (Card)"
 msgstr "ƒL[ƒyƒA(ƒJ[ƒh)"
 
 # c:\oss\winpt\src\wptKeylist.cpp:168
-#: Src/wptKeylist.cpp:264
+#: Src/wptKeylist.cpp:246
 msgid "Public Key"
 msgstr "ŒöŠJŒ®"
 
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:366
 msgid "None"
 msgstr "‚È‚µ"
 
 # c:\oss\winpt\src\wptMAPI.cpp:396 c:\oss\winpt\src\wptMAPI.cpp:404
-#: Src/wptKeylist.cpp:388
+#: Src/wptKeylist.cpp:370
 msgid "Marginal"
 msgstr "‚Ù‚ñ‚̂킸‚©‚΂©‚è"
 
-#: Src/wptKeylist.cpp:390
+#: Src/wptKeylist.cpp:372
 msgid "Full"
 msgstr "ƒtƒ‹"
 
-#: Src/wptKeylist.cpp:429 Src/wptKeylist.cpp:455 Src/wptKeyPropsDlg.cpp:154
+#: Src/wptKeylist.cpp:411 Src/wptKeylist.cpp:437 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "–³Œø‰»‚È‚Á‚½"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:465
+#: Src/wptKeylist.cpp:452
 msgid "key pair"
 msgstr "ƒL[ƒyƒA"
 
 # c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeylist.cpp:569 Src/wptKeylist.cpp:578 Src/wptKeyManagerDlg.cpp:914
 #: Src/wptKeyManagerDlg.cpp:1005
 msgid "Cipher"
 msgstr "ˆÃ†"
 
 # c:\oss\winpt\src\wptKeylist.cpp:54 c:\oss\winpt\src\wptVerifyList.cpp:78
 # c:\oss\winpt\src\wptVerifyList.cpp:86
-#: Src/wptKeylist.cpp:594 Src/wptKeyManagerDlg.cpp:916
-#: Src/wptVerifyList.cpp:171
+#: Src/wptKeylist.cpp:580 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:141
 msgid "Trust"
 msgstr "M—p"
 
@@ -3844,19 +3832,19 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1030
 # c:\oss\winpt\src\wptKeylist.cpp:569 c:\oss\winpt\src\wptPassphraseCB.cpp:75
 # c:\oss\winpt\src\wptVerifyList.cpp:160
-#: Src/wptKeylist.cpp:782 Src/wptPassphraseCB.cpp:126
+#: Src/wptKeylist.cpp:768 Src/wptPassphraseCB.cpp:120
 msgid "Invalid User ID"
 msgstr "–³Œø‚ȃ†[ƒU[ID"
 
 # c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1051
-#, c-format
+#: Src/wptKeylist.cpp:1031
+#, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
 "named in the user ID.  If you *really* know what you are\n"
 "doing, you may answer the next question with yes\n"
 "\n"
-"Use \"%s\" anyway?"
+"Still proceed?"
 msgstr ""
 "‚±‚̃L[‚ªƒ†[ƒU[ID‚ÅŽw’肳‚ê‚Ä‚¢‚é–¼‘O‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ªŠm”F‚Å‚«‚Ü‚¹‚ñB\n"
 "‚³‚ꂽ‚¢‚±‚Ƃɑ΂µ‚Ä–{“–‚ÉŽ©M‚ª‚ ‚éê‡‚݈̂ȉº‚ÌŽ¿–â‚ɑ΂µ‚ÄYes‚ð‘I‚ñ‚Å‚­‚¾"
@@ -3865,12 +3853,12 @@
 "‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1059 Src/wptKeylist.cpp:1122
+#: Src/wptKeylist.cpp:1100
 msgid "Recipients"
 msgstr "ŽóMŽÒ"
 
 # c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1123
+#: Src/wptKeylist.cpp:1101
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -3880,12 +3868,12 @@
 "–{“–‚É–³Œø‚ȃL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1225
+#: Src/wptKeylist.cpp:1198
 msgid "Secret Key List"
 msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:97
-#: Src/wptKeyManager.cpp:185
+#: Src/wptKeyManager.cpp:177
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -3894,7 +3882,7 @@
 "ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:100
-#: Src/wptKeyManager.cpp:190
+#: Src/wptKeyManager.cpp:182
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -3903,29 +3891,29 @@
 "ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:298
-#: Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:322
 msgid "Only one secret key can be exported."
 msgstr "ˆêŒÂ‚̔閧Œ®‚Ì‚Ý‚ªƒGƒLƒXƒ|[ƒg‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:333
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "”é–§Œ®‚ð'%s'‚É•Û‘¶‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptKeyManager.cpp:375
+#: Src/wptKeyManager.cpp:367
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "ƒL[‚𐳂µ‚­'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:412
-#: Src/wptKeyManager.cpp:431
+#: Src/wptKeyManager.cpp:423
 msgid "No valid OpenPGP keys found."
 msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:416
-#: Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:428
 msgid ""
 "The key you want to import is dash escaped.\n"
 "Do you want to extract the key?"
@@ -3934,13 +3922,13 @@
 "ƒL[‚ðˆø‚­o‚µ‚½‚¢‚Å‚µ‚傤‚©H"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:422
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:434
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "ƒ_ƒbƒVƒ…ƒGƒXƒP[ƒvƒhOpenPGPƒL[‚ðƒCƒ“ƒ|[ƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1285
 # c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptKeyManager.cpp:467 Src/wptKeyManager.cpp:584
+#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:576
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -3951,45 +3939,45 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:444
 # c:\oss\winpt\src\wptKeyManager.cpp:455
 # c:\oss\winpt\src\wptKeyManager.cpp:468
-#: Src/wptKeyManager.cpp:496 Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:488 Src/wptKeyManager.cpp:495
 msgid "Key Import HTTP"
 msgstr "ƒL[ƒCƒ“ƒ|[ƒg‚ÌHTTP"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:496
+#: Src/wptKeyManager.cpp:488
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "–³Œø‚ÈHTTP URL: %s"
 
 # c:\oss\winpt\src\wptMAPI.cpp:348
-#: Src/wptKeyManager.cpp:517
+#: Src/wptKeyManager.cpp:509
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "URL'%s'‚æ‚èƒL[‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1082
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚é"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:182
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:190
 # c:\oss\winpt\src\wptKeyManager.cpp:490
-#: Src/wptKeyManager.cpp:558
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒ|[ƒg"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:687
 msgid "Do you really want to confirm each key?"
 msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
 
-#: Src/wptKeyManager.cpp:696
+#: Src/wptKeyManager.cpp:688
 msgid "Delete Confirmation"
 msgstr "Šm”F‚ðíœ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:711
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -4001,7 +3989,7 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:728
+#: Src/wptKeyManager.cpp:720
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -4019,7 +4007,7 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:735
+#: Src/wptKeyManager.cpp:727
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -4030,58 +4018,58 @@
 "íœ‚³‚ê‚Ü‚·B\n"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:797
+#: Src/wptKeyManager.cpp:789
 #, c-format
 msgid "Do you really want to send '0x%s' to keyserver %s?"
 msgstr "'0x%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:818
+#: Src/wptKeyManager.cpp:810
 msgid "Please only select one key."
 msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:897
+#: Src/wptKeyManager.cpp:889
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "ƒL[ƒŠƒ“ƒO‚É‚ ‚é‚·‚ׂẴL[‚ð–{“–‚ɃŠƒtƒŒƒbƒVƒ…‚µ‚½‚¢‚Å‚·‚ªH"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:902
+#: Src/wptKeyManager.cpp:894
 msgid "Could not connect to keyserver, abort procedure."
 msgstr "ƒL[ƒT[ƒo[‚ɐڑ±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "ŒŸõ"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "ŒŸõ‚·‚邱‚ƁF"
 
-#: Src/wptKeyManager.cpp:988
-#, c-format
-msgid "String pattern \"%s\" not found."
+#: Src/wptKeyManager.cpp:982
+#, fuzzy
+msgid "String pattern not found:"
 msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:74
-#: Src/wptKeyManager.cpp:1054 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:85
 msgid "0. No reason specified"
 msgstr "0. ——R‚Í–¾Ž¦‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:75
-#: Src/wptKeyManager.cpp:1055 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:86
 msgid "1. Key has been compromised"
 msgstr "1. ƒL[‚͐M—p‚Å‚«‚È‚­‚È‚Á‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:76
-#: Src/wptKeyManager.cpp:1056 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:87
 msgid "2. Key is superseded"
 msgstr "2. ƒL[‚Í”pŽ~‚³‚ê‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:77
-#: Src/wptKeyManager.cpp:1057 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:88
 msgid "3. Key is no longer used"
 msgstr "3. ƒL[‚Í‚à‚Í‚âŽg‚í‚ê‚Ä‚¢‚Ü‚¹‚ñ "
 
@@ -4475,10 +4463,10 @@
 # c:\oss\winpt\src\wptKeysignDlg.cpp:318
 # c:\oss\winpt\src\wptKeysignDlg.cpp:320
 # c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:351
-#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
-#: Src/wptKeysignDlg.cpp:455 Src/wptKeysignDlg.cpp:461
-#: Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:378 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:385 Src/wptKeysignDlg.cpp:407
+#: Src/wptKeysignDlg.cpp:421
 msgid "Key Signing"
 msgstr "ƒL[‚ð–¼‚·‚é"
 
@@ -4529,13 +4517,13 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:680
+#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:682
 msgid "Keyserver Access"
 msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
 
 # c:\oss\winpt\src\wptMainProc.cpp:566
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:574
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:575
 #: Src/wptPreferencesDlg.cpp:125
 msgid "WinPT Preferences"
 msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
@@ -4597,8 +4585,9 @@
 msgstr "‚‚¢‚ɐM—p‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:84 c:\oss\winpt\src\wptKeylist.cpp:701
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
-#: Src/wptVerifyList.cpp:311
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:215
+#: Src/wptVerifyList.cpp:218 Src/wptVerifyList.cpp:277
+#: Src/wptVerifyList.cpp:279 Src/wptVerifyList.cpp:285
 msgid "Unknown"
 msgstr "–³–¼"
 
@@ -4743,42 +4732,42 @@
 msgid "Do you want to retrieve %s via the default keyserver?"
 msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å %s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
 
-#: Src/wptKeyserver.cpp:443
+#: Src/wptKeyserver.cpp:444
 msgid "Network unreachable"
 msgstr "ƒlƒbƒgƒ[ƒN‚ªŒ©‚‚©‚ç‚È‚¢"
 
-#: Src/wptKeyserver.cpp:446
+#: Src/wptKeyserver.cpp:447
 msgid "Host unreachable"
 msgstr "ƒzƒXƒg‚ªŒ©‚‚©‚ç‚È‚¢"
 
 # c:\oss\winpt\src\wptErrors.cpp:84
-#: Src/wptKeyserver.cpp:449
+#: Src/wptKeyserver.cpp:450
 msgid "Could not resolve host name"
 msgstr "ƒzƒXƒg–¼‚ð‘ÅŠJ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: Src/wptKeyserver.cpp:452
+#: Src/wptKeyserver.cpp:453
 msgid "Connection refused"
 msgstr "Ú‘±‚ª‹‘”Û‚³‚ê‚Ü‚µ‚½B"
 
-#: Src/wptKeyserver.cpp:456
+#: Src/wptKeyserver.cpp:457
 msgid "Connection timeout"
 msgstr "Ú‘±ƒ^ƒCƒ€ƒAƒEƒg"
 
-#: Src/wptKeyserver.cpp:460
+#: Src/wptKeyserver.cpp:461
 msgid "Connection resetted by peer"
 msgstr "“¯”yŽÒ‚͐ڑ±‚ð‰Šú‰»‚µ‚Ü‚µ‚½"
 
-#: Src/wptKeyserver.cpp:463
+#: Src/wptKeyserver.cpp:464
 msgid "Socket has been shutdown"
 msgstr "¿¹¯Ä‚ª¼¬¯ÄÀ޳݂³‚ê‚Ä‚¢‚Ü‚·"
 
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:221
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:642
 msgid "Could not save keyserver.conf file"
 msgstr "keyserver.confƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:436
-#: Src/wptKeyserver.cpp:727
+#: Src/wptKeyserver.cpp:728
 msgid ""
 "Invalid proxy configuration. You need to set a user and a password to use "
 "proxy authentication!"
@@ -4787,12 +4776,12 @@
 "ƒvƒƒNƒV[‚Ì”FØI"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserver.cpp:730
+#: Src/wptKeyserver.cpp:731
 msgid "Proxy Error"
 msgstr "ƒvƒƒNƒV[ƒGƒ‰["
 
 # c:\oss\winpt\src\wptKeyserver.cpp:462
-#: Src/wptKeyserver.cpp:755
+#: Src/wptKeyserver.cpp:756
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -4815,17 +4804,17 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserver.cpp:757
+#: Src/wptKeyserver.cpp:758
 msgid "Keyserver Error"
 msgstr "ƒL[ƒT[ƒo[ƒGƒ‰["
 
 # c:\oss\winpt\src\wptKeyserver.cpp:473
-#: Src/wptKeyserver.cpp:776
+#: Src/wptKeyserver.cpp:777
 msgid "The keyserver limit is exceeded"
 msgstr "ƒL[ƒT[ƒo[‚̐§ŒÀ‚ª’´‚¦‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserver.cpp:777
+#: Src/wptKeyserver.cpp:778
 msgid "Keyserver Warning"
 msgstr "ƒL[ƒT[ƒo[Œx"
 
@@ -4891,7 +4880,7 @@
 msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:81
-#: Src/wptKeyserverDlg.cpp:277
+#: Src/wptKeyserverDlg.cpp:280
 #, c-format
 msgid ""
 "Signature made %s using %s key ID 0x%s\n"
@@ -4905,25 +4894,25 @@
 "ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:393
 msgid "Please select one of the servers."
 msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:397
+#: Src/wptKeyserverDlg.cpp:399
 msgid "Only HKP keyserver can be used."
 msgstr "HKPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:416
 msgid "DNS Name"
 msgstr "DNS–¼"
 
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:417
 msgid "Port"
 msgstr "ƒ|[ƒg"
 
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:501
 msgid "No space for new keyserver entry"
 msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
 
@@ -4942,12 +4931,12 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:522
 msgid "HKP Keyserver"
 msgstr "HKPƒL[ƒT[ƒo["
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:523
 msgid "LDAP Keyserver"
 msgstr "LDAPƒL[ƒT[ƒo["
 
@@ -4966,7 +4955,7 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:522
+#: Src/wptKeyserverDlg.cpp:524
 msgid "Finger Keyserver"
 msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
 
@@ -4985,74 +4974,74 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:547 Src/wptKeyserverDlg.cpp:840
-#: Src/wptKeyserverDlg.cpp:860
+#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverDlg.cpp:842
+#: Src/wptKeyserverDlg.cpp:862
 msgid "Edit Keyserver"
 msgstr "ƒL[ƒT[ƒo[•ÒW"
 
-#: Src/wptKeyserverDlg.cpp:548 Src/wptKeyserverDlg.cpp:713
+#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:715
 msgid "&Add"
 msgstr "’ljÁ(&A)"
 
 # c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:550
+#: Src/wptKeyserverDlg.cpp:552
 msgid "Type:"
 msgstr "Ží—Þ"
 
-#: Src/wptKeyserverDlg.cpp:551
+#: Src/wptKeyserverDlg.cpp:553
 msgid "Port:"
 msgstr "ƒ|[ƒg"
 
-#: Src/wptKeyserverDlg.cpp:552
+#: Src/wptKeyserverDlg.cpp:554
 msgid "Host name:"
 msgstr "ƒzƒXƒg"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:560
+#: Src/wptKeyserverDlg.cpp:562
 msgid "Please enter a host name"
 msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-#: Src/wptKeyserverDlg.cpp:565
+#: Src/wptKeyserverDlg.cpp:567
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:681 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "ŽóM(&R)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:685
 msgid "Send key (default is receiving)"
 msgstr "ƒL[‚𑗐M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:685
+#: Src/wptKeyserverDlg.cpp:687
 msgid "Key ID or email address you want to search for"
 msgstr "ŒŸõ‚·‚é‚à‚̂̃L[ID‚Ü‚½‚Í“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyserverDlg.cpp:686
+#: Src/wptKeyserverDlg.cpp:688
 msgid "&Search"
 msgstr "ŒŸõ(&S)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:689
 msgid "C&hange proxy"
 msgstr "ƒvƒƒNƒV[•ÏX(&C)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:690
 msgid "Set &default"
 msgstr "‹K’èÝ’è(&D)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
 msgid "&Remove"
 msgstr "Žæ‚菜‚­(&R)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:717
 msgid "&Edit"
 msgstr "•ÒW(&E)"
 
@@ -5060,7 +5049,7 @@
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:57
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:750 Src/wptProxySettingsDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:752 Src/wptProxySettingsDlg.cpp:105
 #: Src/wptProxySettingsDlg.cpp:115 Src/wptProxySettingsDlg.cpp:120
 #: Src/wptProxySettingsDlg.cpp:127 Src/wptProxySettingsDlg.cpp:132
 #: Src/wptProxySettingsDlg.cpp:137 Src/wptProxySettingsDlg.cpp:198
@@ -5070,28 +5059,28 @@
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:381
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:407
-#: Src/wptKeyserverDlg.cpp:758 Src/wptKeyserverDlg.cpp:799
+#: Src/wptKeyserverDlg.cpp:760 Src/wptKeyserverDlg.cpp:801
 msgid "Please enter the search pattern."
 msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:370
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:783
+#: Src/wptKeyserverDlg.cpp:785
 msgid "Please select one of the keyservers."
 msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:804
+#: Src/wptKeyserverDlg.cpp:806
 msgid "Only keyids are allowed."
 msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:810
+#: Src/wptKeyserverDlg.cpp:812
 msgid "Only enter the name of the user."
 msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:816
+#: Src/wptKeyserverDlg.cpp:818
 msgid "Only email addresses or keyids are allowed."
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
 
@@ -5253,24 +5242,24 @@
 msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1026
-#: Src/wptKeysignDlg.cpp:78
+#: Src/wptKeysignDlg.cpp:75
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr "%d-bit %s ƒL[AID 0x%s"
 
-#: Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:174
 #, c-format
 msgid "Photo of %s"
 msgstr "%s ‚̎ʐ^"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:152
 # c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
+#: Src/wptKeysignDlg.cpp:216 Src/wptKeysignDlg.cpp:333
 msgid "Choose Signature Class"
 msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:153
-#: Src/wptKeysignDlg.cpp:224
+#: Src/wptKeysignDlg.cpp:218
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -5279,34 +5268,34 @@
 "‚ð”»‚ç‚È‚¢ê‡‚͈ȉº‚ðŽg—p‚µ‚ĉº‚³‚¢B\"0\""
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:154
-#: Src/wptKeysignDlg.cpp:226
+#: Src/wptKeysignDlg.cpp:220
 msgid "(0) I will not answer (default)"
 msgstr "(0)‚Í•ÔŽ–‚ð‚µ‚Ü‚¹‚ñ(‹K’è)"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:228
+#: Src/wptKeysignDlg.cpp:222
 msgid "(1) I have not checked at all."
 msgstr "(1) ‚Ü‚Á‚½‚­ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:230
+#: Src/wptKeysignDlg.cpp:224
 msgid "(2) I have done causal checking."
 msgstr "(2) ‚³‚è‚°‚È‚­ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:232
+#: Src/wptKeysignDlg.cpp:226
 msgid "(3) I have done very careful checking."
 msgstr "(3) Td‚Ƀ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
 # c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeysignDlg.cpp:271
+#: Src/wptKeysignDlg.cpp:265
 msgid "never"
 msgstr "‚Í‚¸‚Í‚È‚¢"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:304
+#: Src/wptKeysignDlg.cpp:297
 #, fuzzy, c-format
 msgid ""
 "pub %d/0x%s   created: %s    expires: %s\n"
@@ -5320,7 +5309,7 @@
 "\n"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:321
+#: Src/wptKeysignDlg.cpp:312
 msgid ""
 "\n"
 "\n"
@@ -5330,51 +5319,50 @@
 "\n"
 "‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚ɏ–¼‚µ‚Ü‚·‚©H\n"
 
+#: Src/wptKeysignDlg.cpp:351
+msgid "You cannot select today as the expiration date."
+msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
+
+# c:\oss\winpt\src\wptKeysignDlg.cpp:318
+#: Src/wptKeysignDlg.cpp:382
+msgid "This key is already signed by your key"
+msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚ɏ–¼‚µ‚Ä‚¢‚Ü‚·B"
+
 # c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:351
+#: Src/wptKeysignDlg.cpp:407
 msgid "No valid secret key found."
 msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:413
 msgid "Sign local only (non exportable signature)"
 msgstr "ƒ[ƒJƒ‹—pƒVƒOƒjƒ`ƒƒ[(ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢ƒVƒOƒjƒ`ƒƒ[)"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptKeysignDlg.cpp:358
+#: Src/wptKeysignDlg.cpp:414
 msgid "Signature expires on"
 msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:415
 msgid "Sign non-revocably"
 msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚ɏ–¼‚·‚é"
 
-#: Src/wptKeysignDlg.cpp:360
+#: Src/wptKeysignDlg.cpp:416
 msgid "&Ask for certification level"
 msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:363
+#: Src/wptKeysignDlg.cpp:419
 msgid "&Show photo"
 msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:98
-#: Src/wptPassphraseCB.cpp:104 Src/wptPassphraseDlg.cpp:103
-#: Src/wptPINDlg.cpp:53
+#: Src/wptKeysignDlg.cpp:420 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:98 Src/wptPassphraseDlg.cpp:94 Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "“ü—Í‚ð‰B‚·(&H)"
 
-#: Src/wptKeysignDlg.cpp:425
-msgid "You cannot select today as the expiration date."
-msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
-
-# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:460
-msgid "This key is already signed by your key"
-msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚ɏ–¼‚µ‚Ä‚¢‚Ü‚·B"
-
 # c:\oss\winpt\src\wptKeyTrustPathDlg.cpp:134
 #: Src/wptKeyTrustPathDlg.cpp:136
 msgid "Trustlist"
@@ -5416,39 +5404,39 @@
 "Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:397
+#: Src/wptMainProc.cpp:398
 msgid "About..."
 msgstr "WinPT‚ɂ‚¢‚Ä..."
 
 # c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
+#: Src/wptMainProc.cpp:404 Src/wptMainProc.cpp:408
 msgid "Decrypt/Verify"
 msgstr "•œ†/Šm”F"
 
-#: Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:419
 msgid "Current Window"
 msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
 
 # c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:476
+#: Src/wptMainProc.cpp:477
 msgid "Remove all passphrases from cache?"
 msgstr "‚·‚ׂẴpƒXƒtƒŒ[ƒY‚ðƒLƒƒƒbƒVƒ…‚©‚çŠO‚¹‚Ü‚·B"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:112
 # c:\oss\winpt\src\wptMainProc.cpp:466 c:\oss\winpt\src\wptProgressDlg.cpp:98
 # c:\oss\winpt\src\wptRegistry.cpp:133
-#: Src/wptMainProc.cpp:477 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
+#: Src/wptMainProc.cpp:478 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
 msgid "WinPT"
 msgstr "WinPT"
 
 # c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:488
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BWinPT‚ðI—¹‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptMainProc.cpp:510
-#: Src/wptMainProc.cpp:520
+#: Src/wptMainProc.cpp:521
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -5527,37 +5515,38 @@
 msgstr "Š—LŽÒ‚̐M—Š(ownertrust)‚̃Cƒ“ƒ|[ƒg‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptPassphraseCB.cpp:61
-#: Src/wptPassphraseCB.cpp:100
+#: Src/wptPassphraseCB.cpp:94
 msgid "Encrypted with the following public key(s)"
 msgstr "ˆÈ‰º‚ÌŒöŠJŒ®‚ň͆‰»‚µ‚½‚à‚Ì‚Å‚·B"
 
-# c:\oss\winpt\src\wptPassphraseCB.cpp:82
-#: Src/wptPassphraseCB.cpp:144
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr "–³–¼ƒL[ID (%s, 0x%s)"
+# c:\oss\winpt\src\wptHotkey.cpp:44
+#: Src/wptPassphraseCB.cpp:127
+#, fuzzy
+msgid "Unknown key ID"
+msgstr "–¢’m‚̃zƒbƒgƒL["
 
-#: Src/wptPassphraseCB.cpp:156
+#: Src/wptPassphraseCB.cpp:140
 msgid "Bad passphrase; Enter passphrase again"
 msgstr "–³Œø‚ȃpƒXƒtƒŒ[ƒYAÄ“x“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptPassphraseCB.cpp:90
-#: Src/wptPassphraseCB.cpp:157
+#: Src/wptPassphraseCB.cpp:141
 msgid "Please enter your passphrase"
 msgstr "‚ ‚È‚½‚̃pƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
-#: Src/wptPassphraseCB.cpp:161
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
-msgstr ""
-"‹¤’ʈ͆‰»B\n"
-"%s ‚ªˆÃ†‰»ƒf[ƒ^‚Å‚·B"
+#: Src/wptPassphraseCB.cpp:147
+#, fuzzy
+msgid "Symmetric encryption."
+msgstr "‹¤’ʈ͆‰»"
 
+#: Src/wptPassphraseCB.cpp:149
+#, fuzzy
+msgid "encrypted data."
+msgstr "GPGˆÃ†‰»ƒf[ƒ^"
+
 # c:\oss\winpt\src\wptPassphraseCB.cpp:224
-#: Src/wptPassphraseCB.cpp:300
+#: Src/wptPassphraseCB.cpp:281
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5569,7 +5558,7 @@
 "%s ƒL[, ID 0x%s (ƒ[ƒ“ƒL[ ID 0x%s)\n"
 
 # c:\oss\winpt\src\wptPassphraseCB.cpp:231
-#: Src/wptPassphraseCB.cpp:306
+#: Src/wptPassphraseCB.cpp:287
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5581,7 +5570,7 @@
 "%s ƒL[, ID 0x%s\n"
 
 # c:\oss\winpt\src\wptPassphraseCB.cpp:283
-#: Src/wptPassphraseCB.cpp:395
+#: Src/wptPassphraseCB.cpp:376
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -5591,27 +5580,27 @@
 "ƒJ[ƒhF %s"
 
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:56
-#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
+#: Src/wptPassphraseDlg.cpp:82 Src/wptPassphraseDlg.cpp:128
 msgid "Passphrase Dialog"
 msgstr "ƒpƒXƒtƒŒ[ƒYƒ_ƒCƒ„ƒƒO"
 
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:62
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:87
 msgid "Repeat Passphrase"
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ðÄ“x“ü—Í‚·‚é"
 
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:64
-#: Src/wptPassphraseDlg.cpp:98
+#: Src/wptPassphraseDlg.cpp:89
 msgid "Enter Passphrase"
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptPassphraseDlg.cpp:136
+#: Src/wptPassphraseDlg.cpp:127
 msgid "Please enter a passphrase."
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:227
-#: Src/wptPassphraseDlg.cpp:144
+#: Src/wptPassphraseDlg.cpp:135
 msgid ""
 "Your passphrase should be at least 8 characters long\n"
 "and should contain non-alphabetic characters.\n"
@@ -5626,7 +5615,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:771
 # c:\oss\winpt\src\wptKeygenDlg.cpp:250
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:153
-#: Src/wptPassphraseDlg.cpp:154
+#: Src/wptPassphraseDlg.cpp:145
 msgid ""
 "The passphrase contains 8-bit characters.\n"
 "It is not suggested to use charset specific characters.\n"
@@ -5948,12 +5937,12 @@
 msgid "Text Input from File"
 msgstr "ƒtƒ@ƒCƒ‹‚©‚ç‚̃eƒLƒXƒg“ü—Í"
 
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:79
 #, c-format
 msgid "PKA: Verified signer's address is '%s'"
 msgstr "PKA: Šm”F‚µ‚½–¼ŽÒ‚̏ZŠ‚Í '%s' ‚Å‚·B"
 
-#: Src/wptVerifyList.cpp:139
+#: Src/wptVerifyList.cpp:109
 msgid ""
 "WARNING: This key is not certified with a trusted signature!\r\n"
 "                   There is no indication that the signature belongs to the "
@@ -5964,15 +5953,37 @@
 "‚¹‚ñB\r\n"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptVerifyList.cpp:144
+#: Src/wptVerifyList.cpp:114
 msgid "The signature is expired!"
 msgstr "–¼‚Ì—LŒøŠúŒÀ‚ª‰ß‚¬‚Ä‚¢‚Ü‚·I"
 
 # c:\oss\winpt\src\wptVerifyList.cpp:77 c:\oss\winpt\src\wptVerifyList.cpp:85
-#: Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:140
 msgid "Signed"
 msgstr "–¼‚µ‚Ü‚µ‚½"
 
+# c:\oss\winpt\src\wptCardDlg.cpp:370
+#~ msgid ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serial-No: %s\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "–¼‘OF %s %s\n"
+#~ "ƒVƒŠƒAƒ‹”ԍ†F %s\n"
+
+# c:\oss\winpt\src\wptPassphraseCB.cpp:82
+#~ msgid "Unknown key ID (%s, 0x%s)"
+#~ msgstr "–³–¼ƒL[ID (%s, 0x%s)"
+
+# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
+#~ msgid ""
+#~ "Symmetric encryption.\n"
+#~ "%s encrypted data."
+#~ msgstr ""
+#~ "‹¤’ʈ͆‰»B\n"
+#~ "%s ‚ªˆÃ†‰»ƒf[ƒ^‚Å‚·B"
+
 #~ msgid "Select &wipe mode"
 #~ msgstr "Žæ‚èÁ‚·uwipevƒ‚[ƒh‘I‘ð(&W)"
 

Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po	2007-01-15 22:02:32 UTC (rev 279)
+++ trunk/Po/pt_BR.po	2007-01-15 22:03:31 UTC (rev 280)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 1.0.0\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-12-07 14:51+0100\n"
+"POT-Creation-Date: 2007-01-15 22:58+0100\n"
 "PO-Revision-Date: 2006-06-14 22:00-0300\n"
 "Last-Translator: Eduardo S. Dobay <edudobay at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar.conectiva.com.br>\n"
@@ -14,95 +14,95 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:75
+#: Src/WinPT.cpp:71
 msgid ""
 "The gpg.conf contains at least one argument which points to a non-existing "
 "file."
 msgstr ""
 
-#: Src/WinPT.cpp:196
+#: Src/WinPT.cpp:192
 msgid "Could not create GPG home directory"
 msgstr "Não foi possível criar o diretório pessoal GPG"
 
-#: Src/WinPT.cpp:197 Src/WinPT.cpp:298 Src/WinPT.cpp:302 Src/WinPT.cpp:543
-#: Src/WinPT.cpp:552 Src/WinPT.cpp:559 Src/WinPT.cpp:582 Src/WinPT.cpp:592
-#: Src/WinPT.cpp:608 Src/WinPT.cpp:617 Src/WinPT.cpp:621 Src/WinPT.cpp:638
-#: Src/WinPT.cpp:707 Src/WinPT.cpp:720 Src/WinPT.cpp:767 Src/WinPT.cpp:810
-#: Src/WinPT.cpp:828 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:144
+#: Src/WinPT.cpp:193 Src/WinPT.cpp:294 Src/WinPT.cpp:298 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:555 Src/WinPT.cpp:578 Src/WinPT.cpp:588
+#: Src/WinPT.cpp:604 Src/WinPT.cpp:613 Src/WinPT.cpp:617 Src/WinPT.cpp:634
+#: Src/WinPT.cpp:703 Src/WinPT.cpp:716 Src/WinPT.cpp:763 Src/WinPT.cpp:806
+#: Src/WinPT.cpp:824 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:151
 #: Src/wptGPG.cpp:929 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951 Src/wptGPG.cpp:962
-#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:519
+#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:520
 msgid "WinPT Error"
 msgstr "Erro WinPT"
 
-#: Src/WinPT.cpp:233
+#: Src/WinPT.cpp:229
 msgid "No useable secret key found."
 msgstr "Não foi encontrada nenhuma chave secreta utilizável."
 
-#: Src/WinPT.cpp:234 Src/WinPT.cpp:245 Src/wptKeyPropsDlg.cpp:370
+#: Src/WinPT.cpp:230 Src/WinPT.cpp:241 Src/wptKeyPropsDlg.cpp:370
 msgid "WinPT Warning"
 msgstr "Aviso do WinPT"
 
-#: Src/WinPT.cpp:244
+#: Src/WinPT.cpp:240
 msgid "Default secret key is unuseable"
 msgstr ""
 
-#: Src/WinPT.cpp:297
+#: Src/WinPT.cpp:293
 msgid "Could not read GnuPG version."
 msgstr "Não foi possível ler a versão do GnuPG"
 
-#: Src/WinPT.cpp:303
-#, c-format
+#: Src/WinPT.cpp:299
+#, fuzzy, c-format
 msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
+"A newer GPG version is needed.\n"
+"Current GPG version %d.%d.%d, required "
 msgstr ""
 "Desculpe, você precisa de uma versão mais nova do GPG.\n"
 "Versão GPG %d.%d.%d; versão requisitada do GPG "
 
-#: Src/WinPT.cpp:337
+#: Src/WinPT.cpp:333
 msgid "Failed to create WinPT directory"
 msgstr "Não foi possível criar o diretório do WinPT"
 
-#: Src/WinPT.cpp:338 Src/WinPT.cpp:355 Src/WinPT.cpp:366
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:642
+#: Src/WinPT.cpp:334 Src/WinPT.cpp:351 Src/WinPT.cpp:362
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:643
 #: Src/wptKeyserverDlg.cpp:71 Src/wptKeyserverDlg.cpp:73
 #: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
-#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:392
-#: Src/wptKeyserverDlg.cpp:398 Src/wptKeyserverDlg.cpp:500
-#: Src/wptKeyserverDlg.cpp:560 Src/wptKeyserverDlg.cpp:565
-#: Src/wptKeyserverDlg.cpp:759 Src/wptKeyserverDlg.cpp:784
-#: Src/wptKeyserverDlg.cpp:800 Src/wptKeyserverDlg.cpp:805
-#: Src/wptKeyserverDlg.cpp:811 Src/wptKeyserverDlg.cpp:817
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:394
+#: Src/wptKeyserverDlg.cpp:400 Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:567
+#: Src/wptKeyserverDlg.cpp:761 Src/wptKeyserverDlg.cpp:786
+#: Src/wptKeyserverDlg.cpp:802 Src/wptKeyserverDlg.cpp:807
+#: Src/wptKeyserverDlg.cpp:813 Src/wptKeyserverDlg.cpp:819
 msgid "Keyserver"
 msgstr "Servidor de chaves"
 
-#: Src/WinPT.cpp:354
+#: Src/WinPT.cpp:350
 msgid "Failed to copy the keyserver.conf"
 msgstr "Não foi possível copiar keyserver.conf"
 
-#: Src/WinPT.cpp:544
+#: Src/WinPT.cpp:540
 #, c-format
 msgid ""
 "The PTD.dll file has a different version than WinPT.exe\n"
 "Please update the PTD.dll to version %d.%d.%d"
 msgstr ""
 
-#: Src/WinPT.cpp:551
+#: Src/WinPT.cpp:547
 msgid "Cryptographic selftest failed."
 msgstr "Auto-teste criptográfico falhou."
 
-#: Src/WinPT.cpp:558
+#: Src/WinPT.cpp:554
 msgid "A newer GPGME version is needed; at least "
 msgstr "Uma versão mais nova do GPGME é necessária: pelo menos "
 
-#: Src/WinPT.cpp:579
+#: Src/WinPT.cpp:575
 msgid ""
 "The gpg.conf file contains the 'textmode' option\n"
 "which leads to broken binary output during decryption.\n"
 "If this is on purpose, just continue otherwise the option should be disabled."
 msgstr ""
 
-#: Src/WinPT.cpp:593
+#: Src/WinPT.cpp:589
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -113,16 +113,16 @@
 "Por favor verifique as configurações de registro do GPG:\n"
 "%s."
 
-#: Src/WinPT.cpp:597
+#: Src/WinPT.cpp:593
 msgid "Select GPG Public Keyring"
 msgstr "Selecionar chaveiro público do GPG"
 
-#: Src/WinPT.cpp:607
+#: Src/WinPT.cpp:603
 #, fuzzy
 msgid "GPG home directory could not be determined."
 msgstr "O diretório pessoal do GPG não pôde ser determinado."
 
-#: Src/WinPT.cpp:615
+#: Src/WinPT.cpp:611
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -130,7 +130,7 @@
 "Não foi possível achar o executável do GPG (gpg.exe).\n"
 "Você deseja verificar as preferências do GPG para corrigir este problema?"
 
-#: Src/WinPT.cpp:630
+#: Src/WinPT.cpp:626
 #, fuzzy
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
@@ -143,20 +143,20 @@
 "\n"
 "Continue se você quiser que o WinPT ofereça mais opções.\n"
 
-#: Src/WinPT.cpp:663 Src/wptFileManagerDlg.cpp:520
-#: Src/wptFileManagerDlg.cpp:861
+#: Src/WinPT.cpp:659 Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:856
 msgid "Wipe Free Space"
 msgstr "Triturar espaço livre"
 
-#: Src/WinPT.cpp:706
+#: Src/WinPT.cpp:702
 msgid "Could not register window class"
 msgstr "Não foi possível registrar a classe de janela"
 
-#: Src/WinPT.cpp:720
+#: Src/WinPT.cpp:716
 msgid "Could not create window"
 msgstr "Não foi possível criar a janela"
 
-#: Src/WinPT.cpp:808
+#: Src/WinPT.cpp:804
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -164,7 +164,7 @@
 "O cache de chaves não foi inicializado ou está vazio.\n"
 "Por favor verifique sua configuração do GPG (chaveiros, diretórios...)"
 
-#: Src/WinPT.cpp:811
+#: Src/WinPT.cpp:807
 #, fuzzy
 msgid ""
 "It seems that GPG is not configured properly.\n"
@@ -173,7 +173,7 @@
 "Parece que o GPG não está configurado corretamente.\n"
 "Você deseja iniciar a janela de preferências do GPG?"
 
-#: Src/WinPT.cpp:829
+#: Src/WinPT.cpp:825
 #, fuzzy, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found or is unuseable.\n"
@@ -197,7 +197,7 @@
 msgstr "Sobre o GnuPG"
 
 #: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptMainProc.cpp:568
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "Sobre o WinPT"
 
@@ -251,126 +251,115 @@
 msgid "&About GPG..."
 msgstr "&Sobre o GPG..."
 
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2178
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2173
 #: Src/wptKeyManagerDlg.cpp:1002
 msgid "&Help"
 msgstr "A&juda"
 
-#: Src/wptCardDlg.cpp:149 Src/wptMainProc.cpp:395
+#: Src/wptCardDlg.cpp:146 Src/wptMainProc.cpp:396
 msgid "Card Manager"
 msgstr "Gerenciador de cartões"
 
-#: Src/wptCardDlg.cpp:185
+#: Src/wptCardDlg.cpp:182
 msgid "No Fingerprint"
 msgstr "Nenhuma impressão digital"
 
-#: Src/wptCardDlg.cpp:216
+#: Src/wptCardDlg.cpp:213
 msgid "No OpenPGP smart card detected."
 msgstr "Nenhum smart card do OpenPGP detectado."
 
-#: Src/wptCardDlg.cpp:340
+#: Src/wptCardDlg.cpp:337
 msgid "No PINs found."
 msgstr "Nenhum PIN encontrado."
 
-#: Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:356
-#: Src/wptCardDlg.cpp:362 Src/wptCardDlg.cpp:374 Src/wptCardDlg.cpp:388
-#: Src/wptCardDlg.cpp:523 Src/wptCardDlg.cpp:624 Src/wptCardDlg.cpp:629
-#: Src/wptCardDlg.cpp:635 Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:648
-#: Src/wptCardDlg.cpp:656 Src/wptCardDlg.cpp:677 Src/wptCardDlg.cpp:703
-#: Src/wptCardDlg.cpp:708 Src/wptCardDlg.cpp:711 Src/wptCardDlg.cpp:737
-#: Src/wptCardDlg.cpp:739 Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749
-#: Src/wptCardDlg.cpp:813 Src/wptCardDlg.cpp:826 Src/wptCardDlg.cpp:829
+#: Src/wptCardDlg.cpp:337 Src/wptCardDlg.cpp:348 Src/wptCardDlg.cpp:353
+#: Src/wptCardDlg.cpp:359 Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:385
+#: Src/wptCardDlg.cpp:511 Src/wptCardDlg.cpp:612 Src/wptCardDlg.cpp:617
+#: Src/wptCardDlg.cpp:623 Src/wptCardDlg.cpp:630 Src/wptCardDlg.cpp:636
+#: Src/wptCardDlg.cpp:644 Src/wptCardDlg.cpp:665 Src/wptCardDlg.cpp:691
+#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:725
+#: Src/wptCardDlg.cpp:727 Src/wptCardDlg.cpp:732 Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:801 Src/wptCardDlg.cpp:814 Src/wptCardDlg.cpp:817
 #: Src/wptMainProc.cpp:265
 msgid "Card Edit"
 msgstr "Editar cartão"
 
-#: Src/wptCardDlg.cpp:350
+#: Src/wptCardDlg.cpp:347
 msgid "Only plain ASCII is currently allowed."
 msgstr "Apenas ASCII puro é permitido atualmente."
 
-#: Src/wptCardDlg.cpp:355
+#: Src/wptCardDlg.cpp:352
 msgid "Only alphabetic characters are allowed."
 msgstr "Apenas caracteres alfabéticos são permitidos."
 
-#: Src/wptCardDlg.cpp:362
+#: Src/wptCardDlg.cpp:359
 msgid "Invalid URL."
 msgstr "URL inválida."
 
-#: Src/wptCardDlg.cpp:375
+#: Src/wptCardDlg.cpp:372
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "Não foi possível modificar o atributo do cartão: %s"
 
-#: Src/wptCardDlg.cpp:388
+#: Src/wptCardDlg.cpp:385
 msgid "Card attribute changed."
 msgstr "Atributo do cartão modificado."
 
-#: Src/wptCardDlg.cpp:428
+#: Src/wptCardDlg.cpp:423
 msgid "Please enter the 'Admin PIN'"
 msgstr "Por favor entre com o 'PIN do Administrador'"
 
-#: Src/wptCardDlg.cpp:430
+#: Src/wptCardDlg.cpp:425
 msgid "Please enter the 'User PIN'"
 msgstr "Por favor entre com o 'PIN do Usuário'"
 
-#: Src/wptCardDlg.cpp:432 Src/wptPINDlg.cpp:51
+#: Src/wptCardDlg.cpp:427 Src/wptPINDlg.cpp:51
 msgid "Please enter the PIN"
 msgstr "Por favor entre com o PIN"
 
-#: Src/wptCardDlg.cpp:436
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-"%s\n"
-"Nome: %s %s\n"
-"Nº Serial: %s\n"
-
-#: Src/wptCardDlg.cpp:479 Src/wptCardDlg.cpp:595 Src/wptKeyEditDlgs.cpp:503
+#: Src/wptCardDlg.cpp:467 Src/wptCardDlg.cpp:583 Src/wptKeyEditDlgs.cpp:498
 msgid "&Name"
 msgstr "&Nome"
 
-#: Src/wptCardDlg.cpp:480
+#: Src/wptCardDlg.cpp:468
 #, fuzzy
 msgid "&Language"
 msgstr "&Alterar"
 
-#: Src/wptCardDlg.cpp:481
+#: Src/wptCardDlg.cpp:469
 msgid "&Key-URL"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:482
+#: Src/wptCardDlg.cpp:470
 msgid "&Login"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:483
+#: Src/wptCardDlg.cpp:471
 #, fuzzy
 msgid "&Sex"
 msgstr "&Salvar"
 
-#: Src/wptCardDlg.cpp:484 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2180
-#: Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
+#: Src/wptCardDlg.cpp:472 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2175
+#: Src/wptPassphraseDlg.cpp:96 Src/wptPINDlg.cpp:55
 msgid "&OK"
 msgstr "&OX"
 
-#: Src/wptCardDlg.cpp:485 Src/wptGPGOptDlg.cpp:51
+#: Src/wptCardDlg.cpp:473 Src/wptGPGOptDlg.cpp:51
 #, fuzzy
 msgid "&Exit"
 msgstr "Sair"
 
-#: Src/wptCardDlg.cpp:486
+#: Src/wptCardDlg.cpp:474
 #, fuzzy
 msgid "&New keys"
 msgstr "Novas subchaves"
 
-#: Src/wptCardDlg.cpp:487
+#: Src/wptCardDlg.cpp:475
 #, fuzzy
 msgid "Change &PIN"
 msgstr "Mudar PIN do cartão"
 
-#: Src/wptCardDlg.cpp:522
+#: Src/wptCardDlg.cpp:510
 #, fuzzy
 msgid ""
 "This operation will override the keys on the card.\n"
@@ -379,73 +368,73 @@
 "Esta operação irá sobrescrever as chaves no cartão.\n"
 "Prosseguir?"
 
-#: Src/wptCardDlg.cpp:594
+#: Src/wptCardDlg.cpp:582
 #, fuzzy
 msgid "Pubkey algorithm"
 msgstr "Algoritmo"
 
-#: Src/wptCardDlg.cpp:596 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:584 Src/wptKeygenDlg.cpp:375
 msgid "&Comment (optional)"
 msgstr "&Comentário (opcional)"
 
-#: Src/wptCardDlg.cpp:597 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:377
 msgid "&Expire date"
 msgstr "Data de &expiração"
 
-#: Src/wptCardDlg.cpp:598
+#: Src/wptCardDlg.cpp:586
 msgid "Off-card passphrase"
 msgstr "Frase secreta fora do cartão"
 
-#: Src/wptCardDlg.cpp:599 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:587 Src/wptKeyEditDlgs.cpp:635 Src/wptKeygenDlg.cpp:379
 msgid "&Never"
 msgstr "&Nunca"
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:588 Src/wptKeygenDlg.cpp:376
 msgid "Email &address"
 msgstr "Endereço de &e-mail"
 
-#: Src/wptCardDlg.cpp:601
+#: Src/wptCardDlg.cpp:589
 msgid "Overwrite old keys on the card"
 msgstr "Sobrescrever chaves antigas no cartão"
 
-#: Src/wptCardDlg.cpp:602
+#: Src/wptCardDlg.cpp:590
 msgid "Make off-card backup of encryption key"
 msgstr "Fazer backup da chave de cifragem fora do cartão"
 
-#: Src/wptCardDlg.cpp:603 Src/wptKeyManagerDlg.cpp:1833
+#: Src/wptCardDlg.cpp:591 Src/wptKeyManagerDlg.cpp:1833
 msgid "Card Key Generation"
 msgstr "Geração da chave do cartão"
 
-#: Src/wptCardDlg.cpp:624
+#: Src/wptCardDlg.cpp:612
 msgid "Please enter your name."
 msgstr "Por favor entre com seu nome."
 
-#: Src/wptCardDlg.cpp:628
+#: Src/wptCardDlg.cpp:616
 msgid "Name must be at least 5 characters long."
 msgstr "O nome deve ter pelo menos 5 caracteres."
 
-#: Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:622
 msgid "Please enter your e-mail address."
 msgstr "Por favor entre com seu endereço de e-mail."
 
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:629
 msgid "Please enter a valid e-mail address."
 msgstr "Por favor coloque um endereço de e-mail válido."
 
-#: Src/wptCardDlg.cpp:647
+#: Src/wptCardDlg.cpp:635
 msgid "Please enter an off-card passphrase."
 msgstr "Por favor coloque uma frase secreta fora do cartão."
 
-#: Src/wptCardDlg.cpp:655
+#: Src/wptCardDlg.cpp:643
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Por favor use caracteres ASCII puros para os campos."
 
-#: Src/wptCardDlg.cpp:676 Src/wptKeyEditDlgs.cpp:1389 Src/wptKeygenDlg.cpp:457
+#: Src/wptCardDlg.cpp:664 Src/wptKeyEditDlgs.cpp:1384 Src/wptKeygenDlg.cpp:457
 #, fuzzy
 msgid "The date you have chosen has already passed."
 msgstr "A data escolhida está no passado."
 
-#: Src/wptCardDlg.cpp:701
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -453,37 +442,37 @@
 "A operação foi cancelada. Parece que há chaves\n"
 "existentes nos cartões. Você precisa marcar a opção 'Sobrescrever'."
 
-#: Src/wptCardDlg.cpp:710
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "Chaves criadas com sucesso."
 
-#: Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:725
 msgid "Please enter the old card PIN."
 msgstr "Por favor coloque o PIN antigo do cartão."
 
-#: Src/wptCardDlg.cpp:739
+#: Src/wptCardDlg.cpp:727
 msgid "Please enter the new card PIN."
 msgstr "Por favor coloque o PIN novo do cartão."
 
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:732
 #, fuzzy
 msgid "Admin PIN must be at least 8 characters."
 msgstr "'PIN do administrador' deve ter pelo menos 8 caracteres."
 
-#: Src/wptCardDlg.cpp:749
+#: Src/wptCardDlg.cpp:737
 #, fuzzy
 msgid "PIN must be at least 6 characters."
 msgstr "'PIN do usuário' deve ter pelo menos 6 caracteres."
 
-#: Src/wptCardDlg.cpp:772
+#: Src/wptCardDlg.cpp:760
 msgid "Change Card PIN"
 msgstr "Mudar PIN do cartão"
 
-#: Src/wptCardDlg.cpp:812 Src/wptPassphraseDlg.cpp:256
+#: Src/wptCardDlg.cpp:800 Src/wptPassphraseDlg.cpp:247
 msgid "Passphrases do not match. Please try again."
 msgstr "Frases não coincidem. Por favor tente de novo."
 
-#: Src/wptCardDlg.cpp:828
+#: Src/wptCardDlg.cpp:816
 msgid "PIN successfully changed."
 msgstr "PIN alterado com sucesso."
 
@@ -495,7 +484,7 @@
 msgid "GPG Card Status"
 msgstr "Estado do cartão GPG"
 
-#: Src/wptCardManager.cpp:53
+#: Src/wptCardManager.cpp:48
 msgid ""
 "Please insert the OpenPGP smart card\n"
 "Press OK to continue or Cancel"
@@ -503,34 +492,34 @@
 "Por favor insira o smart card do OpenPGP\n"
 "Pressione OK para continuar ou Cancelar"
 
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:136
-#: Src/wptClipDecryptDlg.cpp:179 Src/wptKeyRevokersDlg.cpp:129
-#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:257
-#: Src/wptVerifyList.cpp:319
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:138
+#: Src/wptClipDecryptDlg.cpp:182 Src/wptKeyRevokersDlg.cpp:129
+#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:229
+#: Src/wptVerifyList.cpp:293
 msgid "user ID not found"
 msgstr "ID de usuário não encontrada"
 
-#: Src/wptClipDecryptDlg.cpp:105
+#: Src/wptClipDecryptDlg.cpp:106
 #, fuzzy
 msgid "Signature status: created with a fully trusted key"
 msgstr "Estado da assinatura: criada com uma chave totalmente confiável"
 
-#: Src/wptClipDecryptDlg.cpp:107
+#: Src/wptClipDecryptDlg.cpp:108
 #, fuzzy
 msgid "Signature status: created with a marginal trusted key"
 msgstr "Estado da assinatura: criada com uma chave pouco confiável"
 
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:112
 #, fuzzy
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "Estado da assinatura: criada com uma chave NÃO CONFIÁVEL"
 
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:115
 #, fuzzy
 msgid "Signature status: created with an undefined trusted key"
 msgstr "Estado da assinatura: criada com uma chave de confiança indefinida"
 
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:125
 #, c-format
 msgid ""
 "*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -542,17 +531,17 @@
 "*** BEGIN PGP DECRYPTED TEXT ***\r\n"
 msgstr ""
 
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:132
 msgid ""
 "\r\n"
 "*** END PGP DECRYPTED TEXT ***"
 msgstr ""
 
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Decrypt Verify"
 msgstr "Verificação de decifragem"
 
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:190
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -566,25 +555,25 @@
 "Assinatura faita: %s\n"
 "De \"%s\" usando chave de ID 0x%s%s %s"
 
-#: Src/wptClipDecryptDlg.cpp:218 Src/wptClipVerifyDlg.cpp:159
-#: Src/wptClipVerifyDlg.cpp:170 Src/wptClipVerifyDlg.cpp:186
-#: Src/wptClipVerifyDlg.cpp:203 Src/wptClipVerifyDlg.cpp:214
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipVerifyDlg.cpp:144
+#: Src/wptClipVerifyDlg.cpp:155 Src/wptClipVerifyDlg.cpp:171
+#: Src/wptClipVerifyDlg.cpp:188 Src/wptClipVerifyDlg.cpp:199
 #: Src/wptFileManager.cpp:1670 Src/wptFileManager.cpp:1735
-#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:597
-#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:276
-#: Src/wptKeyserverDlg.cpp:284 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
-#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:404
+#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:279
+#: Src/wptKeyserverDlg.cpp:286 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:405
 msgid "Verify"
 msgstr "Verificar"
 
-#: Src/wptClipDecryptDlg.cpp:225 Src/wptClipDecryptDlg.cpp:238
-#: Src/wptClipDecryptDlg.cpp:246 Src/wptClipDecryptDlg.cpp:253
-#: Src/wptClipDecryptDlg.cpp:255 Src/wptFileManager.cpp:1377
+#: Src/wptClipDecryptDlg.cpp:230 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptClipDecryptDlg.cpp:258
+#: Src/wptClipDecryptDlg.cpp:260 Src/wptFileManager.cpp:1377
 #: Src/wptFileManager.cpp:1428
 msgid "Decryption"
 msgstr "Decifragem"
 
-#: Src/wptClipDecryptDlg.cpp:239 Src/wptFileManager.cpp:1429
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptFileManager.cpp:1429
 #, fuzzy, c-format
 msgid ""
 "Encrypted with %s key, ID 0x%s.%s\n"
@@ -593,18 +582,18 @@
 "Cifrado com chave %s, ID %s.%s\n"
 "Decifragem falhou: chave privada indisponível."
 
-#: Src/wptClipDecryptDlg.cpp:246
+#: Src/wptClipDecryptDlg.cpp:251
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Algoritmo não suportado: %s"
 
-#: Src/wptClipDecryptDlg.cpp:252
+#: Src/wptClipDecryptDlg.cpp:257
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Mensagem OpenPGP quebrada (possivelmente: caracteres quoted-printable em "
 "guarda)."
 
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:267
 #, fuzzy
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
@@ -619,23 +608,23 @@
 "É possível que os dados tenham sidos corrompidos durante o transporte\n"
 "mas também é possível que isso seja parte de um ataque."
 
-#: Src/wptClipDecryptDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:272
 msgid "*** IMPORTANT ***"
 msgstr "*** IMPORTANTE ***"
 
-#: Src/wptClipDecryptDlg.cpp:271 Src/wptClipEncryptDlg.cpp:221
+#: Src/wptClipDecryptDlg.cpp:276 Src/wptClipEncryptDlg.cpp:216
 #: Src/wptClipSignDlg.cpp:118 Src/wptClipSignDlg.cpp:264
-#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:962 Src/wptSymEnc.cpp:94
+#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:296
+#: Src/wptKeyManager.cpp:762 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:88
 msgid "GnuPG Status: Finished"
 msgstr "Estado do GnuPG: Concluído"
 
 #: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
 #: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
 #: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
-#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:417
-#: Src/wptMainProc.cpp:500 Src/wptMainProc.cpp:505 Src/wptVerifyList.cpp:232
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:212
+#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:501 Src/wptMainProc.cpp:506 Src/wptVerifyList.cpp:202
 msgid "Clipboard"
 msgstr "Área de transferência"
 
@@ -674,7 +663,7 @@
 msgid "&Quote"
 msgstr "Sai&r"
 
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:502
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:497
 msgid "&Open..."
 msgstr "&Abrir..."
 
@@ -682,62 +671,62 @@
 msgid "&Save..."
 msgstr "&Salvar..."
 
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:515
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:510
 msgid "&Paste"
 msgstr "Co&lar"
 
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:503
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:498
 msgid "&Encrypt"
 msgstr "&Cifrar"
 
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:505
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:500
 msgid "&Decrypt"
 msgstr "&Decifrar"
 
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:562
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr "Editor da área de transferência"
 
-#: Src/wptClipEncryptDlg.cpp:104
+#: Src/wptClipEncryptDlg.cpp:106
 #, fuzzy
 msgid "key not found"
 msgstr "ID de usuário não encontrada"
 
-#: Src/wptClipEncryptDlg.cpp:123
+#: Src/wptClipEncryptDlg.cpp:122
 msgid "Recipients unsuable for encryption:\n"
 msgstr "Destinatários inutilizáveis para cifragem:\n"
 
-#: Src/wptClipEncryptDlg.cpp:139 Src/wptClipEncryptDlg.cpp:161
-#: Src/wptClipEncryptDlg.cpp:211 Src/wptClipEncryptDlg.cpp:218
-#: Src/wptClipEncryptDlg.cpp:244 Src/wptMainProc.cpp:172
+#: Src/wptClipEncryptDlg.cpp:135 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:172
 msgid "Encryption"
 msgstr "Cifragem"
 
-#: Src/wptClipEncryptDlg.cpp:162
+#: Src/wptClipEncryptDlg.cpp:157
 msgid "&Find"
 msgstr "&Localizar"
 
-#: Src/wptClipEncryptDlg.cpp:163 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
 #: Src/wptCommonDlg.cpp:80 Src/wptCommonDlg.cpp:257
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
-#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:283 Src/wptFileSaveDlg.cpp:59
 #: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
-#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
-#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
+#: Src/wptKeyEditDlgs.cpp:354 Src/wptKeyEditDlgs.cpp:435
+#: Src/wptKeyEditDlgs.cpp:501 Src/wptKeyEditDlgs.cpp:636
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
 #: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:95
-#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
+#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:418 Src/wptPassphraseCB.cpp:89
+#: Src/wptPassphraseDlg.cpp:95 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:120 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: Src/wptClipEncryptDlg.cpp:210 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
 msgid "You must select at least one key."
 msgstr "Você deve selecionar pelo menos uma chave."
 
-#: Src/wptClipEncryptDlg.cpp:245
+#: Src/wptClipEncryptDlg.cpp:240
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr "Nenhum destinatário encontrado com '%s'"
@@ -789,29 +778,29 @@
 msgid "Signing key:"
 msgstr "Chave para assinatura:"
 
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1225
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1198
 msgid "No key was selected."
 msgstr "Nenhuma chave foi selecionada."
 
-#: Src/wptClipVerifyDlg.cpp:139
+#: Src/wptClipVerifyDlg.cpp:125
 msgid "Signature Information"
 msgstr "Informações da assinatura"
 
-#: Src/wptClipVerifyDlg.cpp:160 Src/wptFileVerifyDlg.cpp:52
+#: Src/wptClipVerifyDlg.cpp:145 Src/wptFileVerifyDlg.cpp:52
 #: Src/wptGPGOptDlg.cpp:49
 msgid "&Save"
 msgstr "&Salvar"
 
-#: Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:188
 msgid "Invalid signature state."
 msgstr "Estado de assinatura inválido."
 
-#: Src/wptClipVerifyDlg.cpp:213
+#: Src/wptClipVerifyDlg.cpp:198
 #, fuzzy
 msgid "Error while adding signature information."
 msgstr "Não foi possível extrair as informações da chave ou da assinatura."
 
-#: Src/wptClipVerifyDlg.cpp:251 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:236 Src/wptFileSaveDlg.cpp:58
 #: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
 #: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
 #: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -823,7 +812,7 @@
 msgid "Please enter a valid URL."
 msgstr "Use uma URL válida."
 
-#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:516
+#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:508
 msgid "HTTP Key Import"
 msgstr "Importação de chave via HTTP"
 
@@ -831,34 +820,34 @@
 msgid "Enter URL to retrieve the public key"
 msgstr "Coloque a URL para recuperar a chave pública"
 
-#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:758
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:867
-#: Src/wptKeyEditDlgs.cpp:881 Src/wptKeyEditDlgs.cpp:883
-#: Src/wptKeyEditDlgs.cpp:909 Src/wptKeyEditDlgs.cpp:939
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyEditDlgs.cpp:1017
-#: Src/wptKeyEditDlgs.cpp:1024 Src/wptKeyEditDlgs.cpp:1044
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1310 Src/wptKeyEditDlgs.cpp:1326
-#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1394 Src/wptKeyEditDlgs.cpp:1433
-#: Src/wptKeyEditDlgs.cpp:1438 Src/wptKeyEditDlgs.cpp:1445
-#: Src/wptKeyEditDlgs.cpp:1451 Src/wptKeyEditDlgs.cpp:1456
-#: Src/wptKeyEditDlgs.cpp:1499 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1518
-#: Src/wptKeyEditDlgs.cpp:1521 Src/wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:1569 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1734
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1807
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeyEditDlgs.cpp:1822
-#: Src/wptKeyEditDlgs.cpp:1927 Src/wptKeyEditDlgs.cpp:1929
-#: Src/wptKeyEditDlgs.cpp:1945 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1982 Src/wptKeyEditDlgs.cpp:1990
-#: Src/wptKeyEditDlgs.cpp:2006 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2024 Src/wptKeyEditDlgs.cpp:2091
-#: Src/wptKeyEditDlgs.cpp:2154 Src/wptKeyEditDlgs.cpp:2168
-#: Src/wptKeyEditDlgs.cpp:2183 Src/wptKeyEditDlgs.cpp:2223
-#: Src/wptKeyEditDlgs.cpp:2228 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:753
+#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:862
+#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1012
+#: Src/wptKeyEditDlgs.cpp:1019 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1305 Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1355 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389 Src/wptKeyEditDlgs.cpp:1428
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1506 Src/wptKeyEditDlgs.cpp:1513
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1556
+#: Src/wptKeyEditDlgs.cpp:1564 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1620 Src/wptKeyEditDlgs.cpp:1729
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1922 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:2001 Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2019 Src/wptKeyEditDlgs.cpp:2086
+#: Src/wptKeyEditDlgs.cpp:2149 Src/wptKeyEditDlgs.cpp:2163
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyEditDlgs.cpp:2218
+#: Src/wptKeyEditDlgs.cpp:2223 Src/wptKeyManagerDlg.cpp:1031
 #: Src/wptKeyManagerDlg.cpp:1972
 msgid "Key Edit"
 msgstr "Editar chave"
@@ -867,7 +856,7 @@
 msgid "Enter preferred keyserver URL"
 msgstr "Insira URL do servidor de chaves preferido"
 
-#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:337
+#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:346
 msgid "Choose Locale Directory"
 msgstr "Escolha diretório de localizações"
 
@@ -883,12 +872,12 @@
 msgid "Please select a language"
 msgstr "Por favor selecione uma língua"
 
-#: Src/wptErrors.cpp:47
+#: Src/wptErrors.cpp:51
 #, c-format
 msgid "Could not locate GPG.exe in %s."
 msgstr "Não foi possível achar GPG.exe em %s."
 
-#: Src/wptErrors.cpp:52
+#: Src/wptErrors.cpp:56
 #, fuzzy, c-format
 msgid ""
 "Could not find keyring entries in the config file in %s or the file does NOT "
@@ -897,148 +886,148 @@
 "Não foi possível achar as entradas de chaveiro no arquivo de opções em %s ou "
 "o arquivo NÃO existe."
 
-#: Src/wptErrors.cpp:78
+#: Src/wptErrors.cpp:83
 msgid "General error occured"
 msgstr "Um erro geral ocorreu"
 
-#: Src/wptErrors.cpp:79
+#: Src/wptErrors.cpp:84
 msgid "Could not open file"
 msgstr "Não foi possível abrir o arquivo"
 
-#: Src/wptErrors.cpp:80
+#: Src/wptErrors.cpp:85
 msgid "Could not create file"
 msgstr "Não foi possível criar o arquivo"
 
-#: Src/wptErrors.cpp:81
+#: Src/wptErrors.cpp:86
 msgid "Could not read file"
 msgstr "Não foi possível ler o arquivo"
 
-#: Src/wptErrors.cpp:82
+#: Src/wptErrors.cpp:87
 msgid "Could not write file"
 msgstr "Não foi possível gravar o arquivo"
 
-#: Src/wptErrors.cpp:83
+#: Src/wptErrors.cpp:88
 msgid "Could not close file"
 msgstr "Não foi possível fechar o arquivo"
 
-#: Src/wptErrors.cpp:84
+#: Src/wptErrors.cpp:89
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
-#: Src/wptErrors.cpp:85
+#: Src/wptErrors.cpp:90
 msgid "Could not delete file"
 msgstr "Não foi possível excluir o arquivo"
 
-#: Src/wptErrors.cpp:86
+#: Src/wptErrors.cpp:91
 msgid "Could not open Clipboard"
 msgstr "Não foi possível abrir a área de transferência"
 
-#: Src/wptErrors.cpp:87
+#: Src/wptErrors.cpp:92
 msgid "Could not close Clipboard"
 msgstr "Não foi possível fechar a área de transferência"
 
-#: Src/wptErrors.cpp:88
+#: Src/wptErrors.cpp:93
 msgid "Could not empty Clipboard"
 msgstr "Não foi possível limpar a área de transferência"
 
-#: Src/wptErrors.cpp:89
+#: Src/wptErrors.cpp:94
 msgid "Could not set Clipboard data"
 msgstr "Não foi possível mudar os dados da área de transferência"
 
-#: Src/wptErrors.cpp:90
+#: Src/wptErrors.cpp:95
 msgid "Could not get Clipboard data"
 msgstr "Não foi possível recuperar os dados da área de transferência"
 
-#: Src/wptErrors.cpp:91
+#: Src/wptErrors.cpp:96
 msgid "There is no text in the Clipboard"
 msgstr "Não há texto na área de transferência"
 
-#: Src/wptErrors.cpp:92
+#: Src/wptErrors.cpp:97
 msgid "The Clipboard already contains GPG data"
 msgstr "A área de transferência já contém dados GPG"
 
-#: Src/wptErrors.cpp:93
+#: Src/wptErrors.cpp:98
 msgid "General Clipboard error"
 msgstr "Erro geral da área de transferência"
 
-#: Src/wptErrors.cpp:94
+#: Src/wptErrors.cpp:99
 msgid "Registry error: "
 msgstr "Erro do registro: "
 
-#: Src/wptErrors.cpp:97
+#: Src/wptErrors.cpp:102
 msgid "Could not startup Winsock 2 interface"
 msgstr "Não foi possível iniciar a interface do Winsock 2"
 
-#: Src/wptErrors.cpp:98
+#: Src/wptErrors.cpp:103
 msgid "Could not resolve hostname"
 msgstr "Não foi possível resolver o nome de host"
 
-#: Src/wptErrors.cpp:99
+#: Src/wptErrors.cpp:104
 msgid "Could not create new socket"
 msgstr "Não foi possível criar novo soquete"
 
-#: Src/wptErrors.cpp:100
+#: Src/wptErrors.cpp:105
 msgid "Could not connect to the host"
 msgstr "Não foi possível conectar-se ao servidor"
 
-#: Src/wptErrors.cpp:101
+#: Src/wptErrors.cpp:106
 msgid "Could not send the key to the keyserver"
 msgstr "Não foi possível enviar a chave ao servidor"
 
-#: Src/wptErrors.cpp:102
+#: Src/wptErrors.cpp:107
 msgid "Could not receive the key from the keyserver"
 msgstr "Não foi possível receber a chave do servidor"
 
-#: Src/wptErrors.cpp:103
+#: Src/wptErrors.cpp:108
 msgid "Socket timed out, no data"
 msgstr "Tempo limite atingido, sem dados"
 
-#: Src/wptErrors.cpp:104
+#: Src/wptErrors.cpp:109
 #, fuzzy
 msgid "Could not forward request to proxy"
 msgstr "Não foi possível criar o diretório"
 
-#: Src/wptErrors.cpp:105
+#: Src/wptErrors.cpp:110
 msgid "Keyserver returned: no matching keys in database"
 msgstr "Servidor retornou: nenhuma chave coincidente no banco de dados"
 
-#: Src/wptErrors.cpp:106
+#: Src/wptErrors.cpp:111
 msgid "Could not register hotkey: "
 msgstr "Não foi possível registrar a tecla de atalho: "
 
-#: Src/wptErrors.cpp:109
+#: Src/wptErrors.cpp:114
 msgid "Could not open directory"
 msgstr "Não foi possível abrir o diretório"
 
-#: Src/wptErrors.cpp:110
+#: Src/wptErrors.cpp:115
 msgid "Could not create directory"
 msgstr "Não foi possível criar o diretório"
 
-#: Src/wptErrors.cpp:111
+#: Src/wptErrors.cpp:116
 msgid "Could not extract data from the current window"
 msgstr "Não foi possível extrair dados da janela atual"
 
-#: Src/wptErrors.cpp:112
+#: Src/wptErrors.cpp:117
 msgid "Could not load config file"
 msgstr "Não foi possível carregar o arquivo de configuração"
 
-#: Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:121
 msgid "No data available"
 msgstr "Não há dados disponíveis"
 
-#: Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:122
 msgid "There is no card in the reader"
 msgstr "Não há cartão no leitor"
 
-#: Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:123
 msgid "There was no reader found"
 msgstr "Nenhum leitor encontrado"
 
-#: Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:124
 msgid "This is not an OpenPGP card"
 msgstr "Esse não é um cartão OpenPGP"
 
-#: Src/wptErrors.cpp:128
+#: Src/wptErrors.cpp:134
 #, c-format
 msgid "Unknown error=%d"
 msgstr "Erro desconhecido=%d"
@@ -1049,9 +1038,9 @@
 #: Src/wptFileManager.cpp:915 Src/wptFileManager.cpp:1045
 #: Src/wptFileManager.cpp:1579 Src/wptFileManager.cpp:1606
 #: Src/wptFileManager.cpp:1625 Src/wptFileManager.cpp:1910
-#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:530
-#: Src/wptFileManagerDlg.cpp:640 Src/wptFileStatDlg.cpp:152
-#: Src/wptMainProc.cpp:393 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:525
+#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:394 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
 msgid "File Manager"
 msgstr "Gerenciador de arquivos"
 
@@ -1090,14 +1079,14 @@
 "É possível desativar a compressão para esses arquivos.\n"
 "Você deseja desabilitá-la?"
 
-#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1080
-#: Src/wptVerifyList.cpp:169
+#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptVerifyList.cpp:139
 msgid "Status"
 msgstr "Status"
 
-#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1156
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:168
+#: Src/wptVerifyList.cpp:138
 msgid "Name"
 msgstr "Nome"
 
@@ -1138,22 +1127,22 @@
 msgstr "Não foi possível obter a chave secreta padrão."
 
 #: Src/wptFileManager.cpp:1217 Src/wptFileManager.cpp:1529
-#: Src/wptFileManagerDlg.cpp:595 Src/wptMainProc.cpp:156
-#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:408
+#: Src/wptFileManagerDlg.cpp:590 Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:409
 msgid "Sign"
 msgstr "Assinar"
 
-#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:593
-#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:405
+#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:588
+#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:406
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:92
+#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:66 Src/wptSymEnc.cpp:86
 msgid "Symmetric Encryption"
 msgstr "Cifragem simétrica"
 
 #: Src/wptFileManager.cpp:1290 Src/wptFileManager.cpp:1295
-#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:410
 msgid "Symmetric"
 msgstr "Simétrica"
 
@@ -1171,7 +1160,7 @@
 msgstr "Insira nome de arquivo de texto puro"
 
 #: Src/wptFileManager.cpp:1437 Src/wptFileManager.cpp:1457
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:589
 msgid "Decrypt"
 msgstr "Decifrar"
 
@@ -1221,11 +1210,11 @@
 msgstr "Nome de arquivo inválido. Saindo"
 
 #: Src/wptFileManager.cpp:1803 Src/wptFileManager.cpp:1814
-#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:406
-#: Src/wptImportList.cpp:413 Src/wptImportList.cpp:423
-#: Src/wptImportList.cpp:431 Src/wptImportList.cpp:440
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:469
-#: Src/wptKeyManager.cpp:567 Src/wptKeyManager.cpp:586
+#: Src/wptFileManagerDlg.cpp:240 Src/wptImportList.cpp:387
+#: Src/wptImportList.cpp:394 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:412 Src/wptImportList.cpp:421
+#: Src/wptKeyManager.cpp:450 Src/wptKeyManager.cpp:461
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:578
 #: Src/wptKeyserverDlg.cpp:220
 msgid "Import"
 msgstr "Importar"
@@ -1242,8 +1231,8 @@
 "\n"
 "Não foi possível importar essa(s) chave(s)!"
 
-#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:282
-#: Src/wptKeyManager.cpp:325 Src/wptKeyManager.cpp:360
+#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:317 Src/wptKeyManager.cpp:352
 msgid "No key was selected for export."
 msgstr "Nenhuma chave selecionada para exportação."
 
@@ -1257,8 +1246,8 @@
 msgid "Choose Name for Key File"
 msgstr "Escolher nome para arquivo de chaves"
 
-#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1060
-#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1412
+#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1055
+#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1407
 #: Src/wptKeyserverDlg.cpp:105
 msgid "GnuPG status"
 msgstr "Estado do GnuPG"
@@ -1297,55 +1286,55 @@
 msgid "Could not create zip archive."
 msgstr "Não foi possível criar o arquivo zip."
 
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
+#: Src/wptFileManagerDlg.cpp:86 Src/wptFileManagerDlg.cpp:148
 msgid "File Encrypt"
 msgstr "Cifrar arquivo"
 
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:87 Src/wptFileManagerDlg.cpp:277
 msgid "&Text Output"
 msgstr "Saída de &texto&"
 
-#: Src/wptFileManagerDlg.cpp:93
+#: Src/wptFileManagerDlg.cpp:88
 msgid "&Wipe Original"
 msgstr "&Triturar original"
 
-#: Src/wptFileManagerDlg.cpp:94
+#: Src/wptFileManagerDlg.cpp:89
 msgid "Anonymize (throw keyid)"
 msgstr "Anonimizar (jogar ID da chave)"
 
-#: Src/wptFileManagerDlg.cpp:95
+#: Src/wptFileManagerDlg.cpp:90
 msgid "&Select Key for signing"
 msgstr "&Selecione chave para assinar"
 
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:282
 msgid "Options"
 msgstr "Opções"
 
-#: Src/wptFileManagerDlg.cpp:152
+#: Src/wptFileManagerDlg.cpp:147
 msgid "Please select at least one recipient."
 msgstr "Por favor selecione ao menos um destinatário."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:426
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileStatDlg.cpp:281
+#: Src/wptKeyManager.cpp:418
 msgid "No valid OpenPGP data found."
 msgstr "Nenhum dado OpenPGP válido encontrado."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
-#: Src/wptKeyManager.cpp:451
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileManagerDlg.cpp:220
+#: Src/wptKeyManager.cpp:443
 msgid "Key Import"
 msgstr "Importat chave"
 
-#: Src/wptFileManagerDlg.cpp:216
+#: Src/wptFileManagerDlg.cpp:211
 #, c-format
 msgid "%s contain(s) %d key(s)."
 msgstr "%s contém(êm) %d chave(s)."
 
-#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:499
+#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:494
 #: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Arquivo"
 
-#: Src/wptFileManagerDlg.cpp:242
+#: Src/wptFileManagerDlg.cpp:237
 msgid ""
 "Some of the imported keys are secret keys.\n"
 "\n"
@@ -1357,30 +1346,30 @@
 "O valor de confiança dessas chaves deve ser\n"
 "configurado manualmente pelo diálogo de Propriedades da chave."
 
-#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
+#: Src/wptFileManagerDlg.cpp:276 Src/wptFileManagerDlg.cpp:323
 msgid "File Sign"
 msgstr "Assinar arquivo"
 
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:278
 msgid "&Normal Signature"
 msgstr "Assinatura &normal"
 
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:279
 msgid "&Detached Signature"
 msgstr "Assinatura &destacada"
 
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:280
 msgid "&Cleartext Signature"
 msgstr "Assinatura de &texto"
 
-#: Src/wptFileManagerDlg.cpp:286
+#: Src/wptFileManagerDlg.cpp:281
 msgid "Signature mode"
 msgstr "Modo de assinatura"
 
-#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyManager.cpp:690 Src/wptKeyManager.cpp:791
-#: Src/wptKeyManager.cpp:824 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptFileManagerDlg.cpp:323 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyManager.cpp:682 Src/wptKeyManager.cpp:783
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManagerDlg.cpp:1710
 #: Src/wptKeyManagerDlg.cpp:1726 Src/wptKeyManagerDlg.cpp:1754
 #: Src/wptKeyManagerDlg.cpp:1765 Src/wptKeyManagerDlg.cpp:1780
 #: Src/wptKeyManagerDlg.cpp:1893 Src/wptKeyManagerDlg.cpp:1912
@@ -1388,132 +1377,132 @@
 msgid "Please select a key."
 msgstr "Por favor selecione uma chave."
 
-#: Src/wptFileManagerDlg.cpp:387
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "0 Objetos marcados"
 
-#: Src/wptFileManagerDlg.cpp:391
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d Objeto(s) marcado(s)"
 
-#: Src/wptFileManagerDlg.cpp:496 Src/wptMainProc.cpp:532
+#: Src/wptFileManagerDlg.cpp:491 Src/wptMainProc.cpp:533
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Gerenciados de arquivos (arrastar & soltar para adicionar arquivos)"
 
-#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:495 Src/wptKeyManagerDlg.cpp:967
 #: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptMainProc.cpp:396
+#: Src/wptMainProc.cpp:397
 msgid "Edit"
 msgstr "Editar"
 
-#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptFileManagerDlg.cpp:496 Src/wptKeyManagerDlg.cpp:968
 msgid "View"
 msgstr "Exibir"
 
-#: Src/wptFileManagerDlg.cpp:504 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:499 Src/wptFileManagerDlg.cpp:587
 msgid "Encrypt into ZIP"
 msgstr "Cifrar para &ZIP"
 
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:984
 #: Src/wptKeyManagerDlg.cpp:1034
 msgid "&Sign"
 msgstr "As&sinar"
 
-#: Src/wptFileManagerDlg.cpp:507 Src/wptFileManagerDlg.cpp:596
-#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:406
+#: Src/wptFileManagerDlg.cpp:502 Src/wptFileManagerDlg.cpp:591
+#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
 msgid "Sign && Encrypt"
 msgstr "Assinar e cifrar"
 
-#: Src/wptFileManagerDlg.cpp:508
+#: Src/wptFileManagerDlg.cpp:503
 msgid "&Verify"
 msgstr "&Verificar"
 
-#: Src/wptFileManagerDlg.cpp:509
+#: Src/wptFileManagerDlg.cpp:504
 msgid "S&ymmetric"
 msgstr "Si&métrica"
 
-#: Src/wptFileManagerDlg.cpp:510
+#: Src/wptFileManagerDlg.cpp:505
 msgid "&Import"
 msgstr "&Importar"
 
-#: Src/wptFileManagerDlg.cpp:511
+#: Src/wptFileManagerDlg.cpp:506
 msgid "E&xport"
 msgstr "E&xportar"
 
-#: Src/wptFileManagerDlg.cpp:512 Src/wptMainProc.cpp:398
+#: Src/wptFileManagerDlg.cpp:507 Src/wptMainProc.cpp:399
 msgid "Exit"
 msgstr "Sair"
 
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:508
 msgid "&Reset"
 msgstr "&Reiniciar"
 
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:509
 msgid "Always on Top"
 msgstr "Sempre visível"
 
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:511
 msgid "&Select All"
 msgstr "&Selecionar tudo"
 
-#: Src/wptFileManagerDlg.cpp:517
+#: Src/wptFileManagerDlg.cpp:512
 msgid "&Preferences"
 msgstr "&Preferências"
 
-#: Src/wptFileManagerDlg.cpp:518 Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:594
 msgid "Send as Mail"
 msgstr "Enviar por e-mail"
 
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:514
 msgid "&List Packets"
 msgstr "&Listar pacotes"
 
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:516
 msgid "&Wipe"
 msgstr "&Triturar"
 
-#: Src/wptFileManagerDlg.cpp:598
+#: Src/wptFileManagerDlg.cpp:593
 msgid "Wipe"
 msgstr "Triturar"
 
-#: Src/wptFileManagerDlg.cpp:600
+#: Src/wptFileManagerDlg.cpp:595
 msgid "List Packets"
 msgstr "Listar pacotes"
 
-#: Src/wptFileManagerDlg.cpp:627
+#: Src/wptFileManagerDlg.cpp:622
 msgid "&Calc Digest"
 msgstr "&Calcular hash"
 
-#: Src/wptFileManagerDlg.cpp:639
+#: Src/wptFileManagerDlg.cpp:634
 msgid "This command requires admin privileges.\n"
 msgstr "Esse comando requer privilégios de administrador.\n"
 
-#: Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:785
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Tem certeza de que deseja triturar esses arquivos?"
 
-#: Src/wptFileManagerDlg.cpp:791 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:786 Src/wptMainProc.cpp:110
 msgid "&Yes"
 msgstr "&Sim"
 
-#: Src/wptFileManagerDlg.cpp:792 Src/wptMainProc.cpp:111
+#: Src/wptFileManagerDlg.cpp:787 Src/wptMainProc.cpp:111
 msgid "&No"
 msgstr "&Não"
 
-#: Src/wptFileManagerDlg.cpp:793
+#: Src/wptFileManagerDlg.cpp:788
 msgid "passes"
 msgstr ""
 
-#: Src/wptFileManagerDlg.cpp:858
+#: Src/wptFileManagerDlg.cpp:853
 msgid "Operation Status: Error"
 msgstr "Estado da operação: erro"
 
-#: Src/wptFileManagerDlg.cpp:859
+#: Src/wptFileManagerDlg.cpp:854
 msgid "Operation Status: Done."
 msgstr "Estado da operação: concluída."
 
-#: Src/wptFileManagerDlg.cpp:902
+#: Src/wptFileManagerDlg.cpp:897
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1606,11 +1595,11 @@
 msgid "GPG Warning"
 msgstr "Aviso do GPG"
 
-#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
-#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
-#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
-#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
-#: Src/wptKeyEditDlgs.cpp:1739 Src/wptMainProc.cpp:419
+#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:231 Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:259
+#: Src/wptGPGPrefsDlg.cpp:265 Src/wptGPGPrefsDlg.cpp:279
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptMainProc.cpp:420
 #: Src/wptPreferencesDlg.cpp:209 Src/wptPreferencesDlg.cpp:254
 #: Src/wptPreferencesDlg.cpp:266 Src/wptPreferencesDlg.cpp:287
 #: Src/wptPreferencesDlg.cpp:315 Src/wptRegistry.cpp:596
@@ -1769,7 +1758,7 @@
 msgstr "Não foi possível carregar o arquivo de configuração do GnuPG!"
 
 #: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1865
-#: Src/wptMainProc.cpp:580
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "Preferências do GnuPG"
 
@@ -1816,56 +1805,56 @@
 msgid "&Overwrite default settings"
 msgstr "&Sobrescrever opções padrão"
 
-#: Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter the GnuPG home directory."
 msgstr "Por favor insira o diretório pessoal do GnuPG."
 
-#: Src/wptGPGPrefsDlg.cpp:233
+#: Src/wptGPGPrefsDlg.cpp:242
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "Não foi possível salvar 'HomeDir' no registro."
 
-#: Src/wptGPGPrefsDlg.cpp:239
+#: Src/wptGPGPrefsDlg.cpp:248
 msgid "Please enter where GPG.exe is located."
 msgstr "Por favor insira a localização de GPG.exe."
 
-#: Src/wptGPGPrefsDlg.cpp:244
+#: Src/wptGPGPrefsDlg.cpp:253
 msgid "Could not find the GPG program in this directory."
 msgstr "Não foi possível localizar o programa GPG nesse diretório."
 
-#: Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:258
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "Não foi possível salvar 'gpgProgram' no registro"
 
-#: Src/wptGPGPrefsDlg.cpp:269
+#: Src/wptGPGPrefsDlg.cpp:278
 msgid "Could not get GPG config file"
 msgstr "Não foi possível obter o arquivo de configuração do GPG"
 
-#: Src/wptGPGPrefsDlg.cpp:319
+#: Src/wptGPGPrefsDlg.cpp:328
 msgid "Choose GPG Home Directory"
 msgstr "Escolher diretório pessoal do GPG"
 
-#: Src/wptGPGPrefsDlg.cpp:343
+#: Src/wptGPGPrefsDlg.cpp:352
 msgid "Choose GPG Binary"
 msgstr "Escolhar executável GPG"
 
 #: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:186 Src/wptKeyManager.cpp:191
-#: Src/wptKeyManager.cpp:240 Src/wptKeyManager.cpp:283
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:326
-#: Src/wptKeyManager.cpp:331 Src/wptKeyManager.cpp:338
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:370 Src/wptKeyManager.cpp:374
-#: Src/wptKeyManager.cpp:394 Src/wptKeyManager.cpp:419
-#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:427
-#: Src/wptKeyManager.cpp:432 Src/wptKeyManager.cpp:438
-#: Src/wptKeyManager.cpp:443 Src/wptKeyManager.cpp:690
-#: Src/wptKeyManager.cpp:718 Src/wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:738 Src/wptKeyManager.cpp:764
-#: Src/wptKeyManager.cpp:791 Src/wptKeyManager.cpp:796
-#: Src/wptKeyManager.cpp:819 Src/wptKeyManager.cpp:824
-#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:898
-#: Src/wptKeyManager.cpp:903 Src/wptKeyManager.cpp:960
-#: Src/wptKeyManager.cpp:993 Src/wptKeyManager.cpp:1077
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
+#: Src/wptKeyManager.cpp:232 Src/wptKeyManager.cpp:275
+#: Src/wptKeyManager.cpp:287 Src/wptKeyManager.cpp:318
+#: Src/wptKeyManager.cpp:323 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:332 Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:362 Src/wptKeyManager.cpp:366
+#: Src/wptKeyManager.cpp:386 Src/wptKeyManager.cpp:411
+#: Src/wptKeyManager.cpp:416 Src/wptKeyManager.cpp:419
+#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:430
+#: Src/wptKeyManager.cpp:435 Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:710 Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:730 Src/wptKeyManager.cpp:756
+#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:788
+#: Src/wptKeyManager.cpp:811 Src/wptKeyManager.cpp:816
+#: Src/wptKeyManager.cpp:830 Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:895 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManager.cpp:1068
 #: Src/wptKeyManagerDlg.cpp:1357 Src/wptKeyManagerDlg.cpp:1368
 #: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1688
 #: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyManagerDlg.cpp:1726
@@ -1878,7 +1867,7 @@
 #: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeyManagerDlg.cpp:2117
 #: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
 #: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
-#: Src/wptMainProc.cpp:394 Src/wptMainProc.cpp:543 Src/wptMainProc.cpp:551
+#: Src/wptMainProc.cpp:395 Src/wptMainProc.cpp:544 Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "Gerenciador de chaves"
 
@@ -1953,69 +1942,69 @@
 msgid "Unknown Hotkey"
 msgstr "Tecla de atalho desconhecida"
 
-#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1134 Src/wptKeyEditDlgs.cpp:1184
-#: Src/wptKeyEditDlgs.cpp:1450 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1509 Src/wptKeyEditDlgs.cpp:1540
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1784
-#: Src/wptKeyEditDlgs.cpp:1986 Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:252
+#: Src/wptKeyEditDlgs.cpp:1129 Src/wptKeyEditDlgs.cpp:1179
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1465
+#: Src/wptKeyEditDlgs.cpp:1504 Src/wptKeyEditDlgs.cpp:1535
+#: Src/wptKeyEditDlgs.cpp:1613 Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeylist.cpp:407 Src/wptKeylist.cpp:441
 #: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
 #: Src/wptKeysigDlg.cpp:215
 msgid "Revoked"
 msgstr "Revogada"
 
-#: Src/wptImportList.cpp:270 Src/wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1132 Src/wptKeyEditDlgs.cpp:1372
-#: Src/wptKeylist.cpp:427 Src/wptKeylist.cpp:457 Src/wptKeyPropsDlg.cpp:150
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:254
+#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeylist.cpp:409 Src/wptKeylist.cpp:439 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
 msgid "Expired"
 msgstr "Expirada"
 
-#: Src/wptImportList.cpp:274
+#: Src/wptImportList.cpp:271
 msgid "secret key"
 msgstr "chave privada"
 
-#: Src/wptImportList.cpp:276 Src/wptKeylist.cpp:463
+#: Src/wptImportList.cpp:271 Src/wptKeylist.cpp:450
 msgid "public key"
 msgstr "chave pública"
 
-#: Src/wptImportList.cpp:306 Src/wptKeyEditDlgs.cpp:1192
+#: Src/wptImportList.cpp:289 Src/wptKeyEditDlgs.cpp:1187
 msgid "Invalid user ID"
 msgstr "ID de usuário inválida"
 
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588
+#: Src/wptImportList.cpp:327 Src/wptKeylist.cpp:566 Src/wptKeylist.cpp:574
 #: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:173
+#: Src/wptVerifyList.cpp:143
 msgid "User ID"
 msgstr "ID de usuário"
 
-#: Src/wptImportList.cpp:347 Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591
+#: Src/wptImportList.cpp:328 Src/wptKeylist.cpp:568 Src/wptKeylist.cpp:577
 #: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "Tamanho"
 
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1077
-#: Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptImportList.cpp:329 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeylist.cpp:567 Src/wptKeylist.cpp:575 Src/wptKeyManagerDlg.cpp:911
 #: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:172
+#: Src/wptVerifyList.cpp:142
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: Src/wptImportList.cpp:349 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:595
+#: Src/wptImportList.cpp:330 Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:581
 #: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
 #: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "Criação"
 
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:590
+#: Src/wptImportList.cpp:331 Src/wptKeylist.cpp:576
 #: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
 msgid "Type"
 msgstr "Tipo"
 
-#: Src/wptImportList.cpp:421
+#: Src/wptImportList.cpp:402
 #, fuzzy
 msgid ""
 "It is possible that the ASCII-Armor is damaged\n"
@@ -2040,24 +2029,24 @@
 msgid "Key Cache"
 msgstr "Cache de chaves"
 
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:392
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeylist.cpp:374
 msgid "Ultimate"
 msgstr "Definitiva"
 
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1130
-#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:386
+#: Src/wptKeyEditDlgs.cpp:238 Src/wptKeyEditDlgs.cpp:1125
+#: Src/wptKeylist.cpp:230 Src/wptKeylist.cpp:368
 msgid "Never"
 msgstr "Nunca"
 
-#: Src/wptKeyEditDlgs.cpp:261 Src/wptKeyEditDlgs.cpp:1136
+#: Src/wptKeyEditDlgs.cpp:256 Src/wptKeyEditDlgs.cpp:1131
 msgid "OK"
 msgstr "OK"
 
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:278
 msgid "user ID"
 msgstr "ID do usuário"
 
-#: Src/wptKeyEditDlgs.cpp:284
+#: Src/wptKeyEditDlgs.cpp:279
 #, c-format
 msgid ""
 "Could not get key information for: \"%s\":\n"
@@ -2066,7 +2055,7 @@
 "Não foi possível obter informações da chave para \"%s\":\n"
 "%s"
 
-#: Src/wptKeyEditDlgs.cpp:356
+#: Src/wptKeyEditDlgs.cpp:351
 #, fuzzy
 msgid ""
 "Remember that the image is stored within your public key.  If you use a very "
@@ -2077,7 +2066,7 @@
 "figura muito grande, sua chave ficará muito grande também! Manter a imagem "
 "próxima de 240x288 é um bom tamanho para usar."
 
-#: Src/wptKeyEditDlgs.cpp:357
+#: Src/wptKeyEditDlgs.cpp:352
 msgid ""
 "Pick an image to use for your photo ID.\n"
 "The image must be a JPEG file."
@@ -2085,35 +2074,35 @@
 "Escolha uma imagem para usar para seu foto-ID.\n"
 "A imagem deve ser um arquivo JPEG."
 
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:361
+#: Src/wptKeyEditDlgs.cpp:353 Src/wptKeyEditDlgs.cpp:434
+#: Src/wptKeysignDlg.cpp:417
 msgid "Passphrase"
 msgstr "Frase secreta"
 
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:355
 msgid "Add Photo ID"
 msgstr "Adicionar foto-ID"
 
-#: Src/wptKeyEditDlgs.cpp:367
+#: Src/wptKeyEditDlgs.cpp:362
 msgid "Select Image File"
 msgstr "Selecionar arquivo de imagem"
 
-#: Src/wptKeyEditDlgs.cpp:371 Src/wptKeyEditDlgs.cpp:382
-#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyEditDlgs.cpp:400
-#: Src/wptKeyEditDlgs.cpp:903
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383 Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:898
 msgid "Add Photo"
 msgstr "Adicionar foto"
 
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:367
 #, c-format
 msgid "'%s' is not a valid JPEG file."
 msgstr "'%s' não é um arquivo JPEG válido."
 
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyRevokeDlg.cpp:166
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:166
 msgid "Please enter a file name."
 msgstr "Por favor insira um nome de arquivo."
 
-#: Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:381
 msgid ""
 "The JPEG is really large.\n"
 "Are you sure you want to use it?"
@@ -2121,143 +2110,143 @@
 "A imagem JPEG é realmente grande.\n"
 "Tem certeza de que quer usá-la?"
 
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:400
 msgid "Photo successfully added."
 msgstr "Foto adicionada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:469
-#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:725
-#: Src/wptKeyEditDlgs.cpp:1472 Src/wptKeyEditDlgs.cpp:1542
-#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1640
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeyEditDlgs.cpp:401 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:546 Src/wptKeyEditDlgs.cpp:720
+#: Src/wptKeyEditDlgs.cpp:1467 Src/wptKeyEditDlgs.cpp:1537
+#: Src/wptKeyEditDlgs.cpp:1587 Src/wptKeyEditDlgs.cpp:1635
+#: Src/wptKeyEditDlgs.cpp:1833 Src/wptKeygenDlg.cpp:499
 #: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:386
 #: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "Estado do GnuPG"
 
-#: Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:432
 msgid "Appointing a key as designated revoker cannot be undone."
 msgstr "Apontar uma chave como revogador autorizado não pode ser desfeito."
 
-#: Src/wptKeyEditDlgs.cpp:438
+#: Src/wptKeyEditDlgs.cpp:433
 msgid "Public key"
 msgstr "Chave pública"
 
-#: Src/wptKeyEditDlgs.cpp:441 Src/wptKeyEditDlgs.cpp:450
-#: Src/wptKeyEditDlgs.cpp:463 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:436 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:458 Src/wptKeyEditDlgs.cpp:929
 msgid "Add Revoker"
 msgstr "Adicionar revogador"
 
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1561 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1812
-#: Src/wptKeyEditDlgs.cpp:1982
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1556 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1977
 msgid "Please select a user ID."
 msgstr "Por favor selecione uma ID de usuário."
 
-#: Src/wptKeyEditDlgs.cpp:468
+#: Src/wptKeyEditDlgs.cpp:463
 msgid "Revoker successfully addded."
 msgstr "Revogador adidionado com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:502
+#: Src/wptKeyEditDlgs.cpp:497
 msgid "Add new User ID"
 msgstr "Adicionar nova ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:499
 msgid "&Email"
 msgstr "&E-mail"
 
-#: Src/wptKeyEditDlgs.cpp:505
+#: Src/wptKeyEditDlgs.cpp:500
 msgid "&Comment"
 msgstr "&Comentário"
 
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:512
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "Por favor insira um nome (mín. 5 caracts.)"
 
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:524
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:535
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:525 Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:544
 msgid "UserID"
 msgstr "ID do Usuário"
 
-#: Src/wptKeyEditDlgs.cpp:523
+#: Src/wptKeyEditDlgs.cpp:518
 msgid ""
 "Please enter the email address in the email field and not in the name field"
 msgstr ""
 "Por favor insira o endereço de e-mail no campo e-mail e não no campo de nome"
 
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:525
 msgid "Please enter an email address."
 msgstr "Por favor insira um endereço de e-mail."
 
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:530
 msgid "Invalid email address."
 msgstr "E-mail inválido."
 
-#: Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:546
 msgid "user ID successfully added."
 msgstr "ID de usuário adicionada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:636 Src/wptKeyEditDlgs.cpp:839
+#: Src/wptKeyEditDlgs.cpp:631 Src/wptKeyEditDlgs.cpp:834
 msgid "Add new Subkey"
 msgstr "Adicionar nova subchave"
 
-#: Src/wptKeyEditDlgs.cpp:637
+#: Src/wptKeyEditDlgs.cpp:632
 msgid "Key type"
 msgstr "Tipo de chave"
 
-#: Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:633
 msgid "Size in bits"
 msgstr "Tamanho em bits"
 
-#: Src/wptKeyEditDlgs.cpp:639
+#: Src/wptKeyEditDlgs.cpp:634
 msgid "Key expiration"
 msgstr "Expiração da data"
 
-#: Src/wptKeyEditDlgs.cpp:684
+#: Src/wptKeyEditDlgs.cpp:679
 msgid "Please select one entry."
 msgstr "Por favor selecione uma entrada."
 
-#: Src/wptKeyEditDlgs.cpp:685 Src/wptKeyEditDlgs.cpp:691
-#: Src/wptKeyEditDlgs.cpp:722 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:680 Src/wptKeyEditDlgs.cpp:686
+#: Src/wptKeyEditDlgs.cpp:717 Src/wptKeyEditDlgs.cpp:817
 msgid "Add Subkey"
 msgstr "Adicionar subchave"
 
-#: Src/wptKeyEditDlgs.cpp:690
+#: Src/wptKeyEditDlgs.cpp:685
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS usa um tamanho de chave fixo em 1024. Tamanho alterado."
 
-#: Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:719
 msgid "Subkey successfully added."
 msgstr "Subchave adicionada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:752 Src/wptKeyEditDlgs.cpp:821
-#: Src/wptKeyEditDlgs.cpp:902 Src/wptKeyEditDlgs.cpp:934
-#: Src/wptKeyEditDlgs.cpp:1016 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:747 Src/wptKeyEditDlgs.cpp:816
+#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
+#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1355
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1488
 #: Src/wptKeyManagerDlg.cpp:1743
 msgid "There is no secret key available!"
 msgstr "Não há chave secreta disponível!"
 
-#: Src/wptKeyEditDlgs.cpp:753 Src/wptKeyEditDlgs.cpp:772
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:767
 msgid "Add user ID"
 msgstr "Adicionar ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:875
 msgid "Preferred keyserver successfully set."
 msgstr "Servidor de chaves preferido selecionado com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:969 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
 #: Src/wptKeyPropsDlg.cpp:377
 msgid "Change Ownertrust"
 msgstr "Alterar confiança no proprietário"
 
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyManager.cpp:238
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyManager.cpp:230
 msgid "Key status changed."
 msgstr "Estado da chave alterado."
 
-#: Src/wptKeyEditDlgs.cpp:1022
+#: Src/wptKeyEditDlgs.cpp:1017
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
@@ -2265,47 +2254,47 @@
 "Não é possível mudar a frase secreta porque a chave\n"
 "está protegida com o algoritmo IDEA de cifragem."
 
-#: Src/wptKeyEditDlgs.cpp:1029
+#: Src/wptKeyEditDlgs.cpp:1024
 msgid "Current (old) Passphrase"
 msgstr "Atual (velha) frase secreta"
 
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1029
 msgid "New Passphrase"
 msgstr "Nova frase secreta"
 
-#: Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1037
 msgid ""
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, continue?"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1058
+#: Src/wptKeyEditDlgs.cpp:1053
 #, fuzzy
 msgid "Change Password"
 msgstr "Alterar &senha"
 
-#: Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1055
 msgid "Passphrase successfully changed."
 msgstr "Frase secreta alterada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
 msgid "Description"
 msgstr "Descrição"
 
-#: Src/wptKeyEditDlgs.cpp:1079
+#: Src/wptKeyEditDlgs.cpp:1074
 msgid "Expires"
 msgstr "Expira"
 
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeylist.cpp:584 Src/wptKeylist.cpp:593
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:570 Src/wptKeylist.cpp:579
 #: Src/wptKeyManagerDlg.cpp:915
 msgid "Validity"
 msgstr "Validade"
 
-#: Src/wptKeyEditDlgs.cpp:1162
+#: Src/wptKeyEditDlgs.cpp:1157
 msgid "Email"
 msgstr "E-mail"
 
-#: Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1245
 #, fuzzy
 msgid ""
 "ADDUID      add a user ID\r\n"
@@ -2351,27 +2340,27 @@
 "CLEAN     \t\tremover assinaturas inutilizáveis da chave\r\n"
 "MINIMIZE  \t\tremover todas as assinaturas da chave\r\n"
 
-#: Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1266
 msgid "Key Edit Help"
 msgstr "Ajuda de edição de chave"
 
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1310
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1305
 msgid "Primary key can not be deleted!"
 msgstr "A chave primária não pode ser deletada!"
 
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1313
 msgid ""
 "Anything encrypted to the selected subkey cannot be\n"
 "decrypted any longer."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid ""
 "Anything signed by the selected subkey cannot be\n"
 "verified any longer."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1327
+#: Src/wptKeyEditDlgs.cpp:1322
 #, fuzzy, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -2384,15 +2373,15 @@
 "\n"
 "%s"
 
-#: Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1331
 msgid "Delete Subkey"
 msgstr "Excluir subchave"
 
-#: Src/wptKeyEditDlgs.cpp:1340
+#: Src/wptKeyEditDlgs.cpp:1335
 msgid "Subkey successfully deleted."
 msgstr "Subchave excluída com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1368
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -2402,19 +2391,19 @@
 "\n"
 "Você deseja alterar a data de expiração?"
 
-#: Src/wptKeyEditDlgs.cpp:1382 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1380
 msgid "Key Expiration Date"
 msgstr "Data de expiração da chave"
 
-#: Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyEditDlgs.cpp:1401
 msgid "Expire Subkey"
 msgstr "Expirar subchave"
 
-#: Src/wptKeyEditDlgs.cpp:1411
+#: Src/wptKeyEditDlgs.cpp:1406
 msgid "Subkey expire date successfully set."
 msgstr "Data de expiração da subchave definida com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1437
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -2427,31 +2416,31 @@
 "\n"
 "Este comando está disponível apenas para revogar subchaves sozinhas"
 
-#: Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1446
 msgid "Key already revoked."
 msgstr "Chave já revogada."
 
-#: Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1463
 msgid "Revoke Subkey"
 msgstr "Revogar subchave"
 
-#: Src/wptKeyEditDlgs.cpp:1472
+#: Src/wptKeyEditDlgs.cpp:1467
 msgid "Subkey successfully revoked."
 msgstr "Subchave revogada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:1494
+#: Src/wptKeyEditDlgs.cpp:1489
 msgid "Revoke user ID"
 msgstr "Revogar ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1494
 msgid "Key has only one user ID."
 msgstr "A chave tem apenas uma ID de usuário."
 
-#: Src/wptKeyEditDlgs.cpp:1510
+#: Src/wptKeyEditDlgs.cpp:1505
 msgid "This user ID has been already revoked."
 msgstr "Esta ID de usuário já foi revogada."
 
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1511
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2462,53 +2451,53 @@
 "\n"
 "Você realmente deseja revogar essa ID de usuário?"
 
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1533
 msgid "Revoke User ID"
 msgstr "Revogar ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:1542
+#: Src/wptKeyEditDlgs.cpp:1537
 msgid "User ID successfully revoked"
 msgstr "ID de usuário revogada com sucesso"
 
-#: Src/wptKeyEditDlgs.cpp:1589
+#: Src/wptKeyEditDlgs.cpp:1584
 #, fuzzy
 msgid "Set user ID preferences"
 msgstr "Não foi possível definir as preferências da ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1587
 #, fuzzy
 msgid "User ID preferences successfully updated"
 msgstr "ID de usuário excluída com sucesso"
 
-#: Src/wptKeyEditDlgs.cpp:1637
+#: Src/wptKeyEditDlgs.cpp:1632
 msgid "Primary"
 msgstr "Primária"
 
-#: Src/wptKeyEditDlgs.cpp:1640
+#: Src/wptKeyEditDlgs.cpp:1635
 msgid "User ID successfully flagged"
 msgstr "ID de usuário marcada com sucesso"
 
-#: Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1729
 msgid "No preferences available."
 msgstr "Nenhuma preferência disponível."
 
-#: Src/wptKeyEditDlgs.cpp:1738
+#: Src/wptKeyEditDlgs.cpp:1733
 msgid "MDC feature"
 msgstr "Funcionalidade MDC"
 
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1735
 msgid "user ID:"
 msgstr "ID do usuário"
 
-#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr "Preferências da chave"
 
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1801
 msgid "Primary user ID can not be deleted!"
 msgstr "A ID de usuário primária não pode ser excluída!"
 
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1812
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2523,28 +2512,28 @@
 "\n"
 "Você realmente deseja excluir esta ID de usuário?"
 
-#: Src/wptKeyEditDlgs.cpp:1834
+#: Src/wptKeyEditDlgs.cpp:1829
 #, fuzzy
 msgid "Delete User ID"
 msgstr "Excluir ID de usuário"
 
-#: Src/wptKeyEditDlgs.cpp:1838
+#: Src/wptKeyEditDlgs.cpp:1833
 msgid "User ID successfully deleted"
 msgstr "ID de usuário excluída com sucesso"
 
-#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1924 Src/wptKeyEditDlgs.cpp:1942
 msgid "Finished to compact key."
 msgstr "Compactação da chave concluída."
 
-#: Src/wptKeyEditDlgs.cpp:1989
+#: Src/wptKeyEditDlgs.cpp:1984
 msgid "Do you really want to make this sig exportable?"
 msgstr "Você realmente deseja tornar esta assinatura exportável?"
 
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyEditDlgs.cpp:2015 Src/wptKeysignDlg.cpp:385
 msgid "Key successfully signed."
 msgstr "Chave assinada com sucesso."
 
-#: Src/wptKeyEditDlgs.cpp:2083
+#: Src/wptKeyEditDlgs.cpp:2078
 #, fuzzy, c-format
 msgid ""
 "Your keys is listed as a designated revoker for the key\n"
@@ -2561,28 +2550,28 @@
 "Você tem certeza de que deseja criar um certificado de revogação\n"
 "que permita revogar a chave listada acima?"
 
-#: Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyEditDlgs.cpp:2116
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:2176
+#: Src/wptKeyEditDlgs.cpp:2171
 msgid "Command>"
 msgstr "Comando>"
 
-#: Src/wptKeyEditDlgs.cpp:2177 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyEditDlgs.cpp:2172 Src/wptKeyserverDlg.cpp:691
 #: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Fechar"
 
-#: Src/wptKeyEditDlgs.cpp:2179
+#: Src/wptKeyEditDlgs.cpp:2174
 msgid "&Revoke..."
 msgstr "&Revogar..."
 
-#: Src/wptKeyEditDlgs.cpp:2223
+#: Src/wptKeyEditDlgs.cpp:2218
 msgid "Please select a command."
 msgstr "Por favor selecione um comando."
 
-#: Src/wptKeyEditDlgs.cpp:2227
+#: Src/wptKeyEditDlgs.cpp:2222
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "Esse comando não pode ser usado com chaves PGP 2 (v3).\n"
 
@@ -2646,8 +2635,8 @@
 #: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
 #: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
 #: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
-#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:147
-#: Src/wptPassphraseDlg.cpp:157
+#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:138
+#: Src/wptPassphraseDlg.cpp:148
 msgid "Key Generation"
 msgstr "Geração de chave"
 
@@ -2859,60 +2848,60 @@
 msgid "No keys updated."
 msgstr "Nenhuma chave atualizada."
 
-#: Src/wptKeylist.cpp:261
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair"
 msgstr "Par de chaves"
 
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:245
 msgid "Key Pair (Card)"
 msgstr "Par de chaves (cartão)"
 
-#: Src/wptKeylist.cpp:264
+#: Src/wptKeylist.cpp:246
 msgid "Public Key"
 msgstr "Chave pública"
 
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:366
 msgid "None"
 msgstr "Nenhuma"
 
-#: Src/wptKeylist.cpp:388
+#: Src/wptKeylist.cpp:370
 msgid "Marginal"
 msgstr "Pouca"
 
-#: Src/wptKeylist.cpp:390
+#: Src/wptKeylist.cpp:372
 msgid "Full"
 msgstr "Total"
 
-#: Src/wptKeylist.cpp:429 Src/wptKeylist.cpp:455 Src/wptKeyPropsDlg.cpp:154
+#: Src/wptKeylist.cpp:411 Src/wptKeylist.cpp:437 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "Desativada"
 
-#: Src/wptKeylist.cpp:465
+#: Src/wptKeylist.cpp:452
 msgid "key pair"
 msgstr "par de chaves"
 
-#: Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeylist.cpp:569 Src/wptKeylist.cpp:578 Src/wptKeyManagerDlg.cpp:914
 #: Src/wptKeyManagerDlg.cpp:1005
 msgid "Cipher"
 msgstr "Cifragem"
 
-#: Src/wptKeylist.cpp:594 Src/wptKeyManagerDlg.cpp:916
-#: Src/wptVerifyList.cpp:171
+#: Src/wptKeylist.cpp:580 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:141
 msgid "Trust"
 msgstr "Confiança"
 
-#: Src/wptKeylist.cpp:782 Src/wptPassphraseCB.cpp:126
+#: Src/wptKeylist.cpp:768 Src/wptPassphraseCB.cpp:120
 msgid "Invalid User ID"
 msgstr "ID de usuário inválida"
 
-#: Src/wptKeylist.cpp:1051
-#, c-format
+#: Src/wptKeylist.cpp:1031
+#, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
 "named in the user ID.  If you *really* know what you are\n"
 "doing, you may answer the next question with yes\n"
 "\n"
-"Use \"%s\" anyway?"
+"Still proceed?"
 msgstr ""
 "NÃO é certo que a chave pertence à pessoa nomeada na\n"
 "ID de usuário. Se você *realmente* sabe o que está fazendo,\n"
@@ -2920,11 +2909,11 @@
 "\n"
 "Usar \"%s\" de qualquer jeito?"
 
-#: Src/wptKeylist.cpp:1059 Src/wptKeylist.cpp:1122
+#: Src/wptKeylist.cpp:1100
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: Src/wptKeylist.cpp:1123
+#: Src/wptKeylist.cpp:1101
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -2933,11 +2922,11 @@
 "ID de chave %s.\n"
 "Você realmente deseja exportar uma chave revogada?"
 
-#: Src/wptKeylist.cpp:1225
+#: Src/wptKeylist.cpp:1198
 msgid "Secret Key List"
 msgstr "Lista de chaves privadas"
 
-#: Src/wptKeyManager.cpp:185
+#: Src/wptKeyManager.cpp:177
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -2945,7 +2934,7 @@
 "Essa chave expirou!\n"
 "Verificação de chave falhou."
 
-#: Src/wptKeyManager.cpp:190
+#: Src/wptKeyManager.cpp:182
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -2953,25 +2942,25 @@
 "Essa chave foi revogada pelo proprietário!\n"
 "Verificação de chave falhou."
 
-#: Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:322
 msgid "Only one secret key can be exported."
 msgstr "Apenas uma chave secreta pode ser exportada."
 
-#: Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:333
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "Chave secreta salva com sucesso em '%s'."
 
-#: Src/wptKeyManager.cpp:375
+#: Src/wptKeyManager.cpp:367
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "Chave(s) salva com sucesso em '%s'."
 
-#: Src/wptKeyManager.cpp:431
+#: Src/wptKeyManager.cpp:423
 msgid "No valid OpenPGP keys found."
 msgstr "Nenhuma chave OpenPGP válida encontrada."
 
-#: Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:428
 #, fuzzy
 msgid ""
 "The key you want to import is dash escaped.\n"
@@ -2980,11 +2969,11 @@
 "A chave que você deseja importar contém caracteres de escape.\n"
 "Você deseja extrair a chave?"
 
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:434
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "Não é possível importar chaves com caracteres de escape."
 
-#: Src/wptKeyManager.cpp:467 Src/wptKeyManager.cpp:584
+#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:576
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -2992,37 +2981,37 @@
 "Chave sem auto-assinatura detectada!\n"
 "(Esta chave NÃO é utilizável para cifragem, etc)\n"
 
-#: Src/wptKeyManager.cpp:496 Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:488 Src/wptKeyManager.cpp:495
 msgid "Key Import HTTP"
 msgstr "Importação de chave via HTTP"
 
-#: Src/wptKeyManager.cpp:496
+#: Src/wptKeyManager.cpp:488
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "URL HTTP inválida: %s"
 
-#: Src/wptKeyManager.cpp:517
+#: Src/wptKeyManager.cpp:509
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "Não foi possível obter a chave da URL: %s"
 
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "Escolher nome do arquivo de chaves"
 
-#: Src/wptKeyManager.cpp:558
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "Importar arquivo"
 
-#: Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:687
 msgid "Do you really want to confirm each key?"
 msgstr "Você realmente quer confirmar cada chave?"
 
-#: Src/wptKeyManager.cpp:696
+#: Src/wptKeyManager.cpp:688
 msgid "Delete Confirmation"
 msgstr "Confirmação de exclusão"
 
-#: Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:711
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -3033,7 +3022,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:728
+#: Src/wptKeyManager.cpp:720
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -3050,7 +3039,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:735
+#: Src/wptKeyManager.cpp:727
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -3060,49 +3049,49 @@
 "Apenas o lugar reservado para as chaves pública e\n"
 "privada será excluído.\n"
 
-#: Src/wptKeyManager.cpp:797
+#: Src/wptKeyManager.cpp:789
 #, c-format
 msgid "Do you really want to send '0x%s' to keyserver %s?"
 msgstr "Você realmente deseja enviar '0x%s' para o servidor %s?"
 
-#: Src/wptKeyManager.cpp:818
+#: Src/wptKeyManager.cpp:810
 msgid "Please only select one key."
 msgstr "Por favor selecione apenas uma chave."
 
-#: Src/wptKeyManager.cpp:897
+#: Src/wptKeyManager.cpp:889
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "Você realmente deseja atualizar todas as chaves do chaveiro?"
 
-#: Src/wptKeyManager.cpp:902
+#: Src/wptKeyManager.cpp:894
 msgid "Could not connect to keyserver, abort procedure."
 msgstr "Não foi possível conectar-se ao servidor, abortando procedimento."
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "Localizar"
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "Procurar por:"
 
-#: Src/wptKeyManager.cpp:988
-#, c-format
-msgid "String pattern \"%s\" not found."
+#: Src/wptKeyManager.cpp:982
+#, fuzzy
+msgid "String pattern not found:"
 msgstr "Padrão \"%s\" não encontrado."
 
-#: Src/wptKeyManager.cpp:1054 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:85
 msgid "0. No reason specified"
 msgstr "0. Nenhuma razão especificada"
 
-#: Src/wptKeyManager.cpp:1055 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:86
 msgid "1. Key has been compromised"
 msgstr "1. Chave foi comprometida"
 
-#: Src/wptKeyManager.cpp:1056 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:87
 msgid "2. Key is superseded"
 msgstr "2. Chave foi substituída"
 
-#: Src/wptKeyManager.cpp:1057 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:88
 msgid "3. Key is no longer used"
 msgstr "3. Chave não é mais usada"
 
@@ -3388,10 +3377,10 @@
 msgid "Could not access public keyring"
 msgstr "Não foi possível acessar o chaveiro público"
 
-#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:351
-#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
-#: Src/wptKeysignDlg.cpp:455 Src/wptKeysignDlg.cpp:461
-#: Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:378 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:385 Src/wptKeysignDlg.cpp:407
+#: Src/wptKeysignDlg.cpp:421
 msgid "Key Signing"
 msgstr "Assinar chave"
 
@@ -3428,11 +3417,11 @@
 msgid "Smart Card support is not available."
 msgstr "Suporte a Smart Card indisponível."
 
-#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:680
+#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:682
 msgid "Keyserver Access"
 msgstr "Acesso ao servidor de chaves"
 
-#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:574
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:575
 #: Src/wptPreferencesDlg.cpp:125
 msgid "WinPT Preferences"
 msgstr "Preferências do WinPT"
@@ -3484,8 +3473,9 @@
 msgid "I trust ultimately (implicit)"
 msgstr "Eu confio definitivamente (implícito)"
 
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
-#: Src/wptVerifyList.cpp:311
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:215
+#: Src/wptVerifyList.cpp:218 Src/wptVerifyList.cpp:277
+#: Src/wptVerifyList.cpp:279 Src/wptVerifyList.cpp:285
 msgid "Unknown"
 msgstr "Desconhecida"
 
@@ -3617,41 +3607,41 @@
 msgid "Do you want to retrieve %s via the default keyserver?"
 msgstr "Você deseja obter %s pelo servidor de chaves padrão?"
 
-#: Src/wptKeyserver.cpp:443
+#: Src/wptKeyserver.cpp:444
 msgid "Network unreachable"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:446
+#: Src/wptKeyserver.cpp:447
 #, fuzzy
 msgid "Host unreachable"
 msgstr "Servidor:"
 
-#: Src/wptKeyserver.cpp:449
+#: Src/wptKeyserver.cpp:450
 #, fuzzy
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver o nome de host"
 
-#: Src/wptKeyserver.cpp:452
+#: Src/wptKeyserver.cpp:453
 msgid "Connection refused"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:456
+#: Src/wptKeyserver.cpp:457
 msgid "Connection timeout"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:460
+#: Src/wptKeyserver.cpp:461
 msgid "Connection resetted by peer"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:463
+#: Src/wptKeyserver.cpp:464
 msgid "Socket has been shutdown"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:642
 msgid "Could not save keyserver.conf file"
 msgstr "Não foi possível salvar o arquivo keyserver.conf"
 
-#: Src/wptKeyserver.cpp:727
+#: Src/wptKeyserver.cpp:728
 #, fuzzy
 msgid ""
 "Invalid proxy configuration. You need to set a user and a password to use "
@@ -3660,11 +3650,11 @@
 "Configuração de proxy inválida. Você precisa definir um usuário e uma senha "
 "para usar a autenticação de proxy!"
 
-#: Src/wptKeyserver.cpp:730
+#: Src/wptKeyserver.cpp:731
 msgid "Proxy Error"
 msgstr "Erro do proxy"
 
-#: Src/wptKeyserver.cpp:755
+#: Src/wptKeyserver.cpp:756
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3672,15 +3662,15 @@
 "Todas as entradas deste arquivo devem ter um prefixo válido.\n"
 "Atualmente, são suportados HKP/HTTP, LDAP e FINGER.\n"
 
-#: Src/wptKeyserver.cpp:757
+#: Src/wptKeyserver.cpp:758
 msgid "Keyserver Error"
 msgstr "Erro do servidor de chaves"
 
-#: Src/wptKeyserver.cpp:776
+#: Src/wptKeyserver.cpp:777
 msgid "The keyserver limit is exceeded"
 msgstr "O limite do servidor de chaves foi excedido"
 
-#: Src/wptKeyserver.cpp:777
+#: Src/wptKeyserver.cpp:778
 msgid "Keyserver Warning"
 msgstr "Aviso do servidor de chaves"
 
@@ -3728,7 +3718,7 @@
 msgid "This is not a valid OpenPGP key."
 msgstr "Essa não é uma chave OpenPGP válida."
 
-#: Src/wptKeyserverDlg.cpp:277
+#: Src/wptKeyserverDlg.cpp:280
 #, c-format
 msgid ""
 "Signature made %s using %s key ID 0x%s\n"
@@ -3741,102 +3731,102 @@
 "\n"
 "Você deseja tentar recuperar a chave do servidor?"
 
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:393
 msgid "Please select one of the servers."
 msgstr "Por favor selecione um dos servidores."
 
-#: Src/wptKeyserverDlg.cpp:397
+#: Src/wptKeyserverDlg.cpp:399
 #, fuzzy
 msgid "Only HKP keyserver can be used."
 msgstr "Apenas servidores de chaves HTTP podem ser usados."
 
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:416
 msgid "DNS Name"
 msgstr "Nome DNS"
 
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:417
 msgid "Port"
 msgstr "Porta"
 
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:501
 msgid "No space for new keyserver entry"
 msgstr "Sem espaço para nova entrada de servidor de chaves"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:522
 msgid "HKP Keyserver"
 msgstr "Servidor de chaves HKP"
 
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:523
 msgid "LDAP Keyserver"
 msgstr "Servidor de chaves LDAP"
 
-#: Src/wptKeyserverDlg.cpp:522
+#: Src/wptKeyserverDlg.cpp:524
 msgid "Finger Keyserver"
 msgstr "Servidor de chaves Finger"
 
-#: Src/wptKeyserverDlg.cpp:547 Src/wptKeyserverDlg.cpp:840
-#: Src/wptKeyserverDlg.cpp:860
+#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverDlg.cpp:842
+#: Src/wptKeyserverDlg.cpp:862
 msgid "Edit Keyserver"
 msgstr "Editar servidor de chaves"
 
-#: Src/wptKeyserverDlg.cpp:548 Src/wptKeyserverDlg.cpp:713
+#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:715
 msgid "&Add"
 msgstr "&Adicionar"
 
-#: Src/wptKeyserverDlg.cpp:550
+#: Src/wptKeyserverDlg.cpp:552
 msgid "Type:"
 msgstr "Tipo:"
 
-#: Src/wptKeyserverDlg.cpp:551
+#: Src/wptKeyserverDlg.cpp:553
 msgid "Port:"
 msgstr "Porta:"
 
-#: Src/wptKeyserverDlg.cpp:552
+#: Src/wptKeyserverDlg.cpp:554
 msgid "Host name:"
 msgstr "Servidor:"
 
-#: Src/wptKeyserverDlg.cpp:560
+#: Src/wptKeyserverDlg.cpp:562
 msgid "Please enter a host name"
 msgstr "Por favor insira um nome de servidor"
 
-#: Src/wptKeyserverDlg.cpp:565
+#: Src/wptKeyserverDlg.cpp:567
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "Porta inválida; números válidos são < 65535"
 
-#: Src/wptKeyserverDlg.cpp:681 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "&Receber"
 
-#: Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:685
 msgid "Send key (default is receiving)"
 msgstr "Enviar chave (padrão é receber)"
 
-#: Src/wptKeyserverDlg.cpp:685
+#: Src/wptKeyserverDlg.cpp:687
 #, fuzzy
 msgid "Key ID or email address you want to search for"
 msgstr "Por favor insira o ID ou o e-mail da chave que você procura"
 
-#: Src/wptKeyserverDlg.cpp:686
+#: Src/wptKeyserverDlg.cpp:688
 msgid "&Search"
 msgstr "&Localizar"
 
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:689
 msgid "C&hange proxy"
 msgstr "&Mudar proxy"
 
-#: Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:690
 msgid "Set &default"
 msgstr "Definir como &padrão"
 
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
 msgid "&Remove"
 msgstr "&Remover"
 
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:717
 msgid "&Edit"
 msgstr "&Editar"
 
-#: Src/wptKeyserverDlg.cpp:750 Src/wptProxySettingsDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:752 Src/wptProxySettingsDlg.cpp:105
 #: Src/wptProxySettingsDlg.cpp:115 Src/wptProxySettingsDlg.cpp:120
 #: Src/wptProxySettingsDlg.cpp:127 Src/wptProxySettingsDlg.cpp:132
 #: Src/wptProxySettingsDlg.cpp:137 Src/wptProxySettingsDlg.cpp:198
@@ -3844,23 +3834,23 @@
 msgid "Proxy Settings"
 msgstr "Configurações de proxy"
 
-#: Src/wptKeyserverDlg.cpp:758 Src/wptKeyserverDlg.cpp:799
+#: Src/wptKeyserverDlg.cpp:760 Src/wptKeyserverDlg.cpp:801
 msgid "Please enter the search pattern."
 msgstr "Por favor insira o padrão de busca."
 
-#: Src/wptKeyserverDlg.cpp:783
+#: Src/wptKeyserverDlg.cpp:785
 msgid "Please select one of the keyservers."
 msgstr "Por favor selecione um dos servidores."
 
-#: Src/wptKeyserverDlg.cpp:804
+#: Src/wptKeyserverDlg.cpp:806
 msgid "Only keyids are allowed."
 msgstr "Apenas IDs de chave são permitidos."
 
-#: Src/wptKeyserverDlg.cpp:810
+#: Src/wptKeyserverDlg.cpp:812
 msgid "Only enter the name of the user."
 msgstr "Insira apenas o nome do usuário."
 
-#: Src/wptKeyserverDlg.cpp:816
+#: Src/wptKeyserverDlg.cpp:818
 msgid "Only email addresses or keyids are allowed."
 msgstr "Apenas e-mails ou IDs de chave são permitidos."
 
@@ -3991,21 +3981,21 @@
 msgid "&Receive Key"
 msgstr "&Receber chave"
 
-#: Src/wptKeysignDlg.cpp:78
+#: Src/wptKeysignDlg.cpp:75
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr ""
 
-#: Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:174
 #, c-format
 msgid "Photo of %s"
 msgstr ""
 
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
+#: Src/wptKeysignDlg.cpp:216 Src/wptKeysignDlg.cpp:333
 msgid "Choose Signature Class"
 msgstr "Escolher classe da assinatura"
 
-#: Src/wptKeysignDlg.cpp:224
+#: Src/wptKeysignDlg.cpp:218
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -4013,28 +4003,28 @@
 "Com quanto cuidado você verificou que a chave que você está para assinar "
 "realmente pertence à pessoa? Se você não sabe o que responder, use \"0\"."
 
-#: Src/wptKeysignDlg.cpp:226
+#: Src/wptKeysignDlg.cpp:220
 msgid "(0) I will not answer (default)"
 msgstr "(0) Eu não responderei (padrão)"
 
-#: Src/wptKeysignDlg.cpp:228
+#: Src/wptKeysignDlg.cpp:222
 msgid "(1) I have not checked at all."
 msgstr "(1) Eu não verifiquei."
 
-#: Src/wptKeysignDlg.cpp:230
+#: Src/wptKeysignDlg.cpp:224
 msgid "(2) I have done causal checking."
 msgstr "(2) Eu realizei uma verificação trivial."
 
-#: Src/wptKeysignDlg.cpp:232
+#: Src/wptKeysignDlg.cpp:226
 #, fuzzy
 msgid "(3) I have done very careful checking."
 msgstr "(3) Eu verifiquei muito cuidadosamente."
 
-#: Src/wptKeysignDlg.cpp:271
+#: Src/wptKeysignDlg.cpp:265
 msgid "never"
 msgstr "nunca"
 
-#: Src/wptKeysignDlg.cpp:304
+#: Src/wptKeysignDlg.cpp:297
 #, fuzzy, c-format
 msgid ""
 "pub %d/0x%s   created: %s    expires: %s\n"
@@ -4052,7 +4042,7 @@
 "Você tem realmente certeza de que você deseja assinar esta chave com a SUA "
 "chave?\n"
 
-#: Src/wptKeysignDlg.cpp:321
+#: Src/wptKeysignDlg.cpp:312
 #, fuzzy
 msgid ""
 "\n"
@@ -4070,43 +4060,42 @@
 "chave?\n"
 
 #: Src/wptKeysignDlg.cpp:351
+msgid "You cannot select today as the expiration date."
+msgstr "Você não pode selecionar o dia de hoje como data de expiração."
+
+#: Src/wptKeysignDlg.cpp:382
+msgid "This key is already signed by your key"
+msgstr "Essa chave já está assinada pela sua chave"
+
+#: Src/wptKeysignDlg.cpp:407
 msgid "No valid secret key found."
 msgstr "Nenhuma chave privada válida encontrada."
 
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:413
 msgid "Sign local only (non exportable signature)"
 msgstr "Assinar apenas localmente (assinatura não-exportável)"
 
-#: Src/wptKeysignDlg.cpp:358
+#: Src/wptKeysignDlg.cpp:414
 msgid "Signature expires on"
 msgstr "Assinatura expira em"
 
-#: Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:415
 msgid "Sign non-revocably"
 msgstr "Assinar não-revogavelmente"
 
-#: Src/wptKeysignDlg.cpp:360
+#: Src/wptKeysignDlg.cpp:416
 msgid "&Ask for certification level"
 msgstr "&Perguntar por nível de certeza"
 
-#: Src/wptKeysignDlg.cpp:363
+#: Src/wptKeysignDlg.cpp:419
 msgid "&Show photo"
 msgstr "&Mostrar a fotografia"
 
-#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:98
-#: Src/wptPassphraseCB.cpp:104 Src/wptPassphraseDlg.cpp:103
-#: Src/wptPINDlg.cpp:53
+#: Src/wptKeysignDlg.cpp:420 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:98 Src/wptPassphraseDlg.cpp:94 Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "&Esconder digitação"
 
-#: Src/wptKeysignDlg.cpp:425
-msgid "You cannot select today as the expiration date."
-msgstr "Você não pode selecionar o dia de hoje como data de expiração."
-
-#: Src/wptKeysignDlg.cpp:460
-msgid "This key is already signed by your key"
-msgstr "Essa chave já está assinada pela sua chave"
-
 #: Src/wptKeyTrustPathDlg.cpp:136
 msgid "Trustlist"
 msgstr "Lista de confiança"
@@ -4139,31 +4128,31 @@
 msgid "Could not set current window mode hooks."
 msgstr ""
 
-#: Src/wptMainProc.cpp:397
+#: Src/wptMainProc.cpp:398
 msgid "About..."
 msgstr "Sobre..."
 
-#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
+#: Src/wptMainProc.cpp:404 Src/wptMainProc.cpp:408
 msgid "Decrypt/Verify"
 msgstr "Decifrar/Verificar"
 
-#: Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:419
 msgid "Current Window"
 msgstr "Janela atual"
 
-#: Src/wptMainProc.cpp:476
+#: Src/wptMainProc.cpp:477
 msgid "Remove all passphrases from cache?"
 msgstr "Remover todas as frases secretas do cache?"
 
-#: Src/wptMainProc.cpp:477 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
+#: Src/wptMainProc.cpp:478 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
 msgid "WinPT"
 msgstr ""
 
-#: Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:488
 msgid "Could not access public keyring, exit WinPT?"
 msgstr "Não foi possível acessar o chaveiro público. Sair do WinPT?"
 
-#: Src/wptMainProc.cpp:520
+#: Src/wptMainProc.cpp:521
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4237,33 +4226,34 @@
 msgid "Ownertrust successfully imported."
 msgstr "Confiança importada com sucesso."
 
-#: Src/wptPassphraseCB.cpp:100
+#: Src/wptPassphraseCB.cpp:94
 msgid "Encrypted with the following public key(s)"
 msgstr "Cifrado com a(s) seguinte(s) chave(s) pública(s)"
 
-#: Src/wptPassphraseCB.cpp:144
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr "ID de chave desconhecida (%s, 0x%s)"
+#: Src/wptPassphraseCB.cpp:127
+#, fuzzy
+msgid "Unknown key ID"
+msgstr "Tecla de atalho desconhecida"
 
-#: Src/wptPassphraseCB.cpp:156
+#: Src/wptPassphraseCB.cpp:140
 msgid "Bad passphrase; Enter passphrase again"
 msgstr "Frase secreta incorreta; tente novamente"
 
-#: Src/wptPassphraseCB.cpp:157
+#: Src/wptPassphraseCB.cpp:141
 msgid "Please enter your passphrase"
 msgstr "Por favor insira sua frase secreta"
 
-#: Src/wptPassphraseCB.cpp:161
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
-msgstr ""
-"Cifragem simétrica.\n"
-"Dados cifrados por %s."
+#: Src/wptPassphraseCB.cpp:147
+#, fuzzy
+msgid "Symmetric encryption."
+msgstr "Cifragem simétrica"
 
-#: Src/wptPassphraseCB.cpp:300
+#: Src/wptPassphraseCB.cpp:149
+#, fuzzy
+msgid "encrypted data."
+msgstr "Dados cifrados GPG"
+
+#: Src/wptPassphraseCB.cpp:281
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4274,7 +4264,7 @@
 "o usuário: \"%s\"\n"
 "chave %s, ID %s (ID da chave principal %s)\n"
 
-#: Src/wptPassphraseCB.cpp:306
+#: Src/wptPassphraseCB.cpp:287
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4285,7 +4275,7 @@
 "o usuário: \"%s\"\n"
 "chave %s, ID %s\n"
 
-#: Src/wptPassphraseCB.cpp:395
+#: Src/wptPassphraseCB.cpp:376
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -4294,23 +4284,23 @@
 "Por favor insira o PIN para destravar sua chave privada do cartão\n"
 "Cartão: %s"
 
-#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
+#: Src/wptPassphraseDlg.cpp:82 Src/wptPassphraseDlg.cpp:128
 msgid "Passphrase Dialog"
 msgstr "Frase secreta"
 
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:87
 msgid "Repeat Passphrase"
 msgstr "Repita a frase secreta"
 
-#: Src/wptPassphraseDlg.cpp:98
+#: Src/wptPassphraseDlg.cpp:89
 msgid "Enter Passphrase"
 msgstr "Insira a frase secreta"
 
-#: Src/wptPassphraseDlg.cpp:136
+#: Src/wptPassphraseDlg.cpp:127
 msgid "Please enter a passphrase."
 msgstr "Por favor insira uma frase secreta."
 
-#: Src/wptPassphraseDlg.cpp:144
+#: Src/wptPassphraseDlg.cpp:135
 #, fuzzy
 msgid ""
 "Your passphrase should be at least 8 characters long\n"
@@ -4323,7 +4313,7 @@
 "\n"
 "Proceder mesmo assim?"
 
-#: Src/wptPassphraseDlg.cpp:154
+#: Src/wptPassphraseDlg.cpp:145
 #, fuzzy
 msgid ""
 "The passphrase contains 8-bit characters.\n"
@@ -4588,26 +4578,45 @@
 msgid "Text Input from File"
 msgstr "Entrada de texto do arquivo"
 
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:79
 #, c-format
 msgid "PKA: Verified signer's address is '%s'"
 msgstr "PKA: Endereço verificado do signatário é '%s'"
 
-#: Src/wptVerifyList.cpp:139
+#: Src/wptVerifyList.cpp:109
 msgid ""
 "WARNING: This key is not certified with a trusted signature!\r\n"
 "                   There is no indication that the signature belongs to the "
 "owner.\r\n"
 msgstr ""
 
-#: Src/wptVerifyList.cpp:144
+#: Src/wptVerifyList.cpp:114
 msgid "The signature is expired!"
 msgstr "A assinatura expirou!"
 
-#: Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:140
 msgid "Signed"
 msgstr "Assinada"
 
+#~ msgid ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serial-No: %s\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Nome: %s %s\n"
+#~ "Nº Serial: %s\n"
+
+#~ msgid "Unknown key ID (%s, 0x%s)"
+#~ msgstr "ID de chave desconhecida (%s, 0x%s)"
+
+#~ msgid ""
+#~ "Symmetric encryption.\n"
+#~ "%s encrypted data."
+#~ msgstr ""
+#~ "Cifragem simétrica.\n"
+#~ "Dados cifrados por %s."
+
 #~ msgid "Select &wipe mode"
 #~ msgstr "Modo de &trituração"
 

Modified: trunk/Po/sk.po
===================================================================
--- trunk/Po/sk.po	2007-01-15 22:02:32 UTC (rev 279)
+++ trunk/Po/sk.po	2007-01-15 22:03:31 UTC (rev 280)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: winpt 1.2.0\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-12-07 14:51+0100\n"
+"POT-Creation-Date: 2007-01-15 22:58+0100\n"
 "PO-Revision-Date: 2006-12-15 16:01+0100\n"
 "Last-Translator: Martin Lukac <ma3n5c at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=cp1250\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:75
+#: Src/WinPT.cpp:71
 msgid ""
 "The gpg.conf contains at least one argument which points to a non-existing "
 "file."
@@ -23,67 +23,67 @@
 "Súbor gpg.conf obsahuje najmenej jeden argument, ktorý ukazuje na "
 "neexistujúci súbor."
 
-#: Src/WinPT.cpp:196
+#: Src/WinPT.cpp:192
 msgid "Could not create GPG home directory"
 msgstr "Domáci adresár GPG sa nepodarilo vytvori"
 
-#: Src/WinPT.cpp:197 Src/WinPT.cpp:298 Src/WinPT.cpp:302 Src/WinPT.cpp:543
-#: Src/WinPT.cpp:552 Src/WinPT.cpp:559 Src/WinPT.cpp:582 Src/WinPT.cpp:592
-#: Src/WinPT.cpp:608 Src/WinPT.cpp:617 Src/WinPT.cpp:621 Src/WinPT.cpp:638
-#: Src/WinPT.cpp:707 Src/WinPT.cpp:720 Src/WinPT.cpp:767 Src/WinPT.cpp:810
-#: Src/WinPT.cpp:828 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:144
+#: Src/WinPT.cpp:193 Src/WinPT.cpp:294 Src/WinPT.cpp:298 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:555 Src/WinPT.cpp:578 Src/WinPT.cpp:588
+#: Src/WinPT.cpp:604 Src/WinPT.cpp:613 Src/WinPT.cpp:617 Src/WinPT.cpp:634
+#: Src/WinPT.cpp:703 Src/WinPT.cpp:716 Src/WinPT.cpp:763 Src/WinPT.cpp:806
+#: Src/WinPT.cpp:824 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:151
 #: Src/wptGPG.cpp:929 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951 Src/wptGPG.cpp:962
-#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:519
+#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:520
 msgid "WinPT Error"
 msgstr "Chyba WinPT"
 
-#: Src/WinPT.cpp:233
+#: Src/WinPT.cpp:229
 msgid "No useable secret key found."
 msgstr "Nenájdený žiaden použite¾ný tajný k¾úè."
 
-#: Src/WinPT.cpp:234 Src/WinPT.cpp:245 Src/wptKeyPropsDlg.cpp:370
+#: Src/WinPT.cpp:230 Src/WinPT.cpp:241 Src/wptKeyPropsDlg.cpp:370
 msgid "WinPT Warning"
 msgstr "Varovanie WinPT"
 
-#: Src/WinPT.cpp:244
+#: Src/WinPT.cpp:240
 msgid "Default secret key is unuseable"
 msgstr "Predvolený tajný k¾úè je nepoužite¾ný"
 
-#: Src/WinPT.cpp:297
+#: Src/WinPT.cpp:293
 msgid "Could not read GnuPG version."
 msgstr "Nedá sa naèíta verzia GnuPG."
 
-#: Src/WinPT.cpp:303
-#, c-format
+#: Src/WinPT.cpp:299
+#, fuzzy, c-format
 msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
+"A newer GPG version is needed.\n"
+"Current GPG version %d.%d.%d, required "
 msgstr ""
 "Prepáète, potrebujete novšiu verziu GPG.\n"
 "Verzia GPG %d.%d.%d požadovaná verzia GPG "
 
-#: Src/WinPT.cpp:337
+#: Src/WinPT.cpp:333
 msgid "Failed to create WinPT directory"
 msgstr "Nepodarilo sa vytvori adresár WinPT"
 
-#: Src/WinPT.cpp:338 Src/WinPT.cpp:355 Src/WinPT.cpp:366
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:642
+#: Src/WinPT.cpp:334 Src/WinPT.cpp:351 Src/WinPT.cpp:362
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:643
 #: Src/wptKeyserverDlg.cpp:71 Src/wptKeyserverDlg.cpp:73
 #: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
-#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:392
-#: Src/wptKeyserverDlg.cpp:398 Src/wptKeyserverDlg.cpp:500
-#: Src/wptKeyserverDlg.cpp:560 Src/wptKeyserverDlg.cpp:565
-#: Src/wptKeyserverDlg.cpp:759 Src/wptKeyserverDlg.cpp:784
-#: Src/wptKeyserverDlg.cpp:800 Src/wptKeyserverDlg.cpp:805
-#: Src/wptKeyserverDlg.cpp:811 Src/wptKeyserverDlg.cpp:817
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:394
+#: Src/wptKeyserverDlg.cpp:400 Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:567
+#: Src/wptKeyserverDlg.cpp:761 Src/wptKeyserverDlg.cpp:786
+#: Src/wptKeyserverDlg.cpp:802 Src/wptKeyserverDlg.cpp:807
+#: Src/wptKeyserverDlg.cpp:813 Src/wptKeyserverDlg.cpp:819
 msgid "Keyserver"
 msgstr "Server s k¾úèmi"
 
-#: Src/WinPT.cpp:354
+#: Src/WinPT.cpp:350
 msgid "Failed to copy the keyserver.conf"
 msgstr "Nepodarilo sa skopírova keyserver.conf"
 
-#: Src/WinPT.cpp:544
+#: Src/WinPT.cpp:540
 #, c-format
 msgid ""
 "The PTD.dll file has a different version than WinPT.exe\n"
@@ -92,15 +92,15 @@
 "Súbor PTD.dll má iné èíslo verzie než súbor WinPT.exe\n"
 "Prosím aktualizujte súbor PTD.dll na verziu %d.%d.%d"
 
-#: Src/WinPT.cpp:551
+#: Src/WinPT.cpp:547
 msgid "Cryptographic selftest failed."
 msgstr "Kryptografický test seba samého zlyhal."
 
-#: Src/WinPT.cpp:558
+#: Src/WinPT.cpp:554
 msgid "A newer GPGME version is needed; at least "
 msgstr "Je potrebná novšia verzia GPGME; aspoò "
 
-#: Src/WinPT.cpp:579
+#: Src/WinPT.cpp:575
 msgid ""
 "The gpg.conf file contains the 'textmode' option\n"
 "which leads to broken binary output during decryption.\n"
@@ -110,7 +110,7 @@
 "ktorá vedie k poškodeniu binárneho výstupu poèas dešifrovania.\n"
 "Ak je toto úmyselne, tak pokraèujte, ináè by mala by vo¾ba vypnutá."
 
-#: Src/WinPT.cpp:593
+#: Src/WinPT.cpp:589
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -121,15 +121,15 @@
 "Prosím skontrolujte nastavenia GPG v registri:\n"
 "%s."
 
-#: Src/WinPT.cpp:597
+#: Src/WinPT.cpp:593
 msgid "Select GPG Public Keyring"
 msgstr "Vybra súbor s verejnými k¾úèmi GPG"
 
-#: Src/WinPT.cpp:607
+#: Src/WinPT.cpp:603
 msgid "GPG home directory could not be determined."
 msgstr "Domáci adresár GPG sa nedal urèi."
 
-#: Src/WinPT.cpp:615
+#: Src/WinPT.cpp:611
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -137,7 +137,7 @@
 "Nedá sa nájs spustite¾ný súbor GPG (gpg.exe).\n"
 "Chcete spusti predvo¾by GPG pre opravenie  tohto problému?"
 
-#: Src/WinPT.cpp:630
+#: Src/WinPT.cpp:626
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -149,20 +149,20 @@
 "\n"
 "Pokraèujte ak chcete aby WinPT ponúklo viac možností.\n"
 
-#: Src/WinPT.cpp:663 Src/wptFileManagerDlg.cpp:520
-#: Src/wptFileManagerDlg.cpp:861
+#: Src/WinPT.cpp:659 Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:856
 msgid "Wipe Free Space"
 msgstr "Úplne vymaza vo¾né miesto"
 
-#: Src/WinPT.cpp:706
+#: Src/WinPT.cpp:702
 msgid "Could not register window class"
 msgstr "Nepodarilo sa zaregistrova triedu okna"
 
-#: Src/WinPT.cpp:720
+#: Src/WinPT.cpp:716
 msgid "Could not create window"
 msgstr "Nepodarilo sa vytvori okno"
 
-#: Src/WinPT.cpp:808
+#: Src/WinPT.cpp:804
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -170,7 +170,7 @@
 "Pamä k¾úèov nebola inicializovaná alebo je prázdna.\n"
 "Prosím skontrolujte vašu konfiguráciu GPG (súbory s k¾úèmi, cesty...)"
 
-#: Src/WinPT.cpp:811
+#: Src/WinPT.cpp:807
 msgid ""
 "It seems that GPG is not configured properly.\n"
 "Do you want to start the GPG preferences dialog?"
@@ -178,7 +178,7 @@
 "Zdá sa, že GPG nie je nastavené správne.\n"
 "Chcete spusti dialóg predvolieb GPG?"
 
-#: Src/WinPT.cpp:829
+#: Src/WinPT.cpp:825
 #, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found or is unuseable.\n"
@@ -187,7 +187,8 @@
 "\n"
 "%s: secret key not found."
 msgstr ""
-"Predvolený k¾úè (z konfiguraèného súboru GPG) sa nenašiel alebo je nepoužite¾ný.\n"
+"Predvolený k¾úè (z konfiguraèného súboru GPG) sa nenašiel alebo je "
+"nepoužite¾ný.\n"
 "Predvolený k¾úè bude znovu nastavený a môže by opä nastavený v Správcovi "
 "k¾úèov.\n"
 "\n"
@@ -202,7 +203,7 @@
 msgstr "O GnuPG"
 
 #: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptMainProc.cpp:568
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "O WinPT"
 
@@ -255,121 +256,110 @@
 msgid "&About GPG..."
 msgstr "&O GPG..."
 
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2178
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2173
 #: Src/wptKeyManagerDlg.cpp:1002
 msgid "&Help"
 msgstr "&Pomocník"
 
-#: Src/wptCardDlg.cpp:149 Src/wptMainProc.cpp:395
+#: Src/wptCardDlg.cpp:146 Src/wptMainProc.cpp:396
 msgid "Card Manager"
 msgstr "Správca kariet"
 
-#: Src/wptCardDlg.cpp:185
+#: Src/wptCardDlg.cpp:182
 msgid "No Fingerprint"
 msgstr "Žiaden odtlaèok"
 
-#: Src/wptCardDlg.cpp:216
+#: Src/wptCardDlg.cpp:213
 msgid "No OpenPGP smart card detected."
 msgstr "Nebola detekovaná karta OpenPGP."
 
-#: Src/wptCardDlg.cpp:340
+#: Src/wptCardDlg.cpp:337
 msgid "No PINs found."
 msgstr "Nenájdené žiadne PIN."
 
-#: Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:356
-#: Src/wptCardDlg.cpp:362 Src/wptCardDlg.cpp:374 Src/wptCardDlg.cpp:388
-#: Src/wptCardDlg.cpp:523 Src/wptCardDlg.cpp:624 Src/wptCardDlg.cpp:629
-#: Src/wptCardDlg.cpp:635 Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:648
-#: Src/wptCardDlg.cpp:656 Src/wptCardDlg.cpp:677 Src/wptCardDlg.cpp:703
-#: Src/wptCardDlg.cpp:708 Src/wptCardDlg.cpp:711 Src/wptCardDlg.cpp:737
-#: Src/wptCardDlg.cpp:739 Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749
-#: Src/wptCardDlg.cpp:813 Src/wptCardDlg.cpp:826 Src/wptCardDlg.cpp:829
+#: Src/wptCardDlg.cpp:337 Src/wptCardDlg.cpp:348 Src/wptCardDlg.cpp:353
+#: Src/wptCardDlg.cpp:359 Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:385
+#: Src/wptCardDlg.cpp:511 Src/wptCardDlg.cpp:612 Src/wptCardDlg.cpp:617
+#: Src/wptCardDlg.cpp:623 Src/wptCardDlg.cpp:630 Src/wptCardDlg.cpp:636
+#: Src/wptCardDlg.cpp:644 Src/wptCardDlg.cpp:665 Src/wptCardDlg.cpp:691
+#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:725
+#: Src/wptCardDlg.cpp:727 Src/wptCardDlg.cpp:732 Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:801 Src/wptCardDlg.cpp:814 Src/wptCardDlg.cpp:817
 #: Src/wptMainProc.cpp:265
 msgid "Card Edit"
 msgstr "Editácia karty"
 
-#: Src/wptCardDlg.cpp:350
+#: Src/wptCardDlg.cpp:347
 msgid "Only plain ASCII is currently allowed."
 msgstr "V súèasnosti je povolené iba obyèajné ASCII."
 
-#: Src/wptCardDlg.cpp:355
+#: Src/wptCardDlg.cpp:352
 msgid "Only alphabetic characters are allowed."
 msgstr "Sú povolené iba abecedné znaky."
 
-#: Src/wptCardDlg.cpp:362
+#: Src/wptCardDlg.cpp:359
 msgid "Invalid URL."
 msgstr "Neplatné URL."
 
-#: Src/wptCardDlg.cpp:375
+#: Src/wptCardDlg.cpp:372
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "Nepodarilo sa modifikova atribút karty: %s"
 
-#: Src/wptCardDlg.cpp:388
+#: Src/wptCardDlg.cpp:385
 msgid "Card attribute changed."
 msgstr "Atribút karty zmenený."
 
-#: Src/wptCardDlg.cpp:428
+#: Src/wptCardDlg.cpp:423
 msgid "Please enter the 'Admin PIN'"
 msgstr "Prosím zadajte 'Administrátorské PIN'"
 
-#: Src/wptCardDlg.cpp:430
+#: Src/wptCardDlg.cpp:425
 msgid "Please enter the 'User PIN'"
 msgstr "Prosím zadajte 'Používate¾ské PIN'"
 
-#: Src/wptCardDlg.cpp:432 Src/wptPINDlg.cpp:51
+#: Src/wptCardDlg.cpp:427 Src/wptPINDlg.cpp:51
 msgid "Please enter the PIN"
 msgstr "Prosím zadajte PIN"
 
-#: Src/wptCardDlg.cpp:436
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-"%s\n"
-"Meno: %s %s\n"
-"Sériové èíslo: %s\n"
-
-#: Src/wptCardDlg.cpp:479 Src/wptCardDlg.cpp:595 Src/wptKeyEditDlgs.cpp:503
+#: Src/wptCardDlg.cpp:467 Src/wptCardDlg.cpp:583 Src/wptKeyEditDlgs.cpp:498
 msgid "&Name"
 msgstr "Me&no"
 
-#: Src/wptCardDlg.cpp:480
+#: Src/wptCardDlg.cpp:468
 msgid "&Language"
 msgstr "&Jazyk"
 
-#: Src/wptCardDlg.cpp:481
+#: Src/wptCardDlg.cpp:469
 msgid "&Key-URL"
 msgstr "URL-&k¾úèa"
 
-#: Src/wptCardDlg.cpp:482
+#: Src/wptCardDlg.cpp:470
 msgid "&Login"
 msgstr "Prih&lásenie"
 
-#: Src/wptCardDlg.cpp:483
+#: Src/wptCardDlg.cpp:471
 msgid "&Sex"
 msgstr "&Pohlavie"
 
-#: Src/wptCardDlg.cpp:484 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2180
-#: Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
+#: Src/wptCardDlg.cpp:472 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2175
+#: Src/wptPassphraseDlg.cpp:96 Src/wptPINDlg.cpp:55
 msgid "&OK"
 msgstr "&OK"
 
-#: Src/wptCardDlg.cpp:485 Src/wptGPGOptDlg.cpp:51
+#: Src/wptCardDlg.cpp:473 Src/wptGPGOptDlg.cpp:51
 msgid "&Exit"
 msgstr "Koni&ec"
 
-#: Src/wptCardDlg.cpp:486
+#: Src/wptCardDlg.cpp:474
 msgid "&New keys"
 msgstr "&Nové k¾úèe"
 
-#: Src/wptCardDlg.cpp:487
+#: Src/wptCardDlg.cpp:475
 msgid "Change &PIN"
 msgstr "Zmeni &PIN"
 
-#: Src/wptCardDlg.cpp:522
+#: Src/wptCardDlg.cpp:510
 msgid ""
 "This operation will override the keys on the card.\n"
 "Continue?"
@@ -377,71 +367,71 @@
 "Táto operácia má prednos pred k¾úèmi na karte.\n"
 "Aj tak pokraèova?"
 
-#: Src/wptCardDlg.cpp:594
+#: Src/wptCardDlg.cpp:582
 msgid "Pubkey algorithm"
 msgstr "Algoritmus verejného k¾úèa"
 
-#: Src/wptCardDlg.cpp:596 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:584 Src/wptKeygenDlg.cpp:375
 msgid "&Comment (optional)"
 msgstr "&Komentár (volite¾né)"
 
-#: Src/wptCardDlg.cpp:597 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:377
 msgid "&Expire date"
 msgstr "Dátum &expirácie"
 
-#: Src/wptCardDlg.cpp:598
+#: Src/wptCardDlg.cpp:586
 msgid "Off-card passphrase"
 msgstr "Heslo mimo karty"
 
-#: Src/wptCardDlg.cpp:599 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:587 Src/wptKeyEditDlgs.cpp:635 Src/wptKeygenDlg.cpp:379
 msgid "&Never"
 msgstr "&Nikdy"
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:588 Src/wptKeygenDlg.cpp:376
 msgid "Email &address"
 msgstr "E-mailová &adresa"
 
-#: Src/wptCardDlg.cpp:601
+#: Src/wptCardDlg.cpp:589
 msgid "Overwrite old keys on the card"
 msgstr "Prepísa staré k¾úèe na karte"
 
-#: Src/wptCardDlg.cpp:602
+#: Src/wptCardDlg.cpp:590
 msgid "Make off-card backup of encryption key"
 msgstr "Zálohova šifrovací k¾úè mimo kartu"
 
-#: Src/wptCardDlg.cpp:603 Src/wptKeyManagerDlg.cpp:1833
+#: Src/wptCardDlg.cpp:591 Src/wptKeyManagerDlg.cpp:1833
 msgid "Card Key Generation"
 msgstr "Generovanie k¾úèa na karte"
 
-#: Src/wptCardDlg.cpp:624
+#: Src/wptCardDlg.cpp:612
 msgid "Please enter your name."
 msgstr "Prosím zadajte svoje meno."
 
-#: Src/wptCardDlg.cpp:628
+#: Src/wptCardDlg.cpp:616
 msgid "Name must be at least 5 characters long."
 msgstr "Meno musí by aspoò 5 znakov dlhé."
 
-#: Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:622
 msgid "Please enter your e-mail address."
 msgstr "Prosím zadajte vašu e-mailovú adresu."
 
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:629
 msgid "Please enter a valid e-mail address."
 msgstr "Prosím zadajte platnú e-mailovú adresu."
 
-#: Src/wptCardDlg.cpp:647
+#: Src/wptCardDlg.cpp:635
 msgid "Please enter an off-card passphrase."
 msgstr "Prosím zadajte heslo pre \"off-card\"."
 
-#: Src/wptCardDlg.cpp:655
+#: Src/wptCardDlg.cpp:643
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Prosím použijte sadu znakov obyèajného ASCII pre polia."
 
-#: Src/wptCardDlg.cpp:676 Src/wptKeyEditDlgs.cpp:1389 Src/wptKeygenDlg.cpp:457
+#: Src/wptCardDlg.cpp:664 Src/wptKeyEditDlgs.cpp:1384 Src/wptKeygenDlg.cpp:457
 msgid "The date you have chosen has already passed."
 msgstr "Dátum, ktorý ste vybrali je v minulosti."
 
-#: Src/wptCardDlg.cpp:701
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -449,35 +439,35 @@
 "Operácia bola zrušená. Zdá sa, že na kartách sú\n"
 "existujúce k¾úèe. Potrebujete oznaèi znaèku 'Prepísa'."
 
-#: Src/wptCardDlg.cpp:710
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "K¾úèe úspešne vytvorené."
 
-#: Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:725
 msgid "Please enter the old card PIN."
 msgstr "Prosím zadajte staré PIN karty."
 
-#: Src/wptCardDlg.cpp:739
+#: Src/wptCardDlg.cpp:727
 msgid "Please enter the new card PIN."
 msgstr "Prosím zadajte nové PIN karty."
 
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:732
 msgid "Admin PIN must be at least 8 characters."
 msgstr "'Administrátorské PIN' musí ma aspoò 8 znakov."
 
-#: Src/wptCardDlg.cpp:749
+#: Src/wptCardDlg.cpp:737
 msgid "PIN must be at least 6 characters."
 msgstr "PIN musí ma aspoò 6 znakov."
 
-#: Src/wptCardDlg.cpp:772
+#: Src/wptCardDlg.cpp:760
 msgid "Change Card PIN"
 msgstr "Zmeni PIN karty"
 
-#: Src/wptCardDlg.cpp:812 Src/wptPassphraseDlg.cpp:256
+#: Src/wptCardDlg.cpp:800 Src/wptPassphraseDlg.cpp:247
 msgid "Passphrases do not match. Please try again."
 msgstr "Heslá sa nezhodujú. Prosím skúste znova."
 
-#: Src/wptCardDlg.cpp:828
+#: Src/wptCardDlg.cpp:816
 msgid "PIN successfully changed."
 msgstr "PIN úspešne zmenené."
 
@@ -489,7 +479,7 @@
 msgid "GPG Card Status"
 msgstr "Stav karty GPG"
 
-#: Src/wptCardManager.cpp:53
+#: Src/wptCardManager.cpp:48
 msgid ""
 "Please insert the OpenPGP smart card\n"
 "Press OK to continue or Cancel"
@@ -497,30 +487,30 @@
 "Prosím vložte smart kartu OpenPGP\n"
 "Stlaète OK pre pokraèovanie alebo Zruši"
 
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:136
-#: Src/wptClipDecryptDlg.cpp:179 Src/wptKeyRevokersDlg.cpp:129
-#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:257
-#: Src/wptVerifyList.cpp:319
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:138
+#: Src/wptClipDecryptDlg.cpp:182 Src/wptKeyRevokersDlg.cpp:129
+#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:229
+#: Src/wptVerifyList.cpp:293
 msgid "user ID not found"
 msgstr "ID používate¾a nenájdené"
 
-#: Src/wptClipDecryptDlg.cpp:105
+#: Src/wptClipDecryptDlg.cpp:106
 msgid "Signature status: created with a fully trusted key"
 msgstr "Stav podpisu: Vytvorený s úplne dôveryhodným k¾úèom"
 
-#: Src/wptClipDecryptDlg.cpp:107
+#: Src/wptClipDecryptDlg.cpp:108
 msgid "Signature status: created with a marginal trusted key"
 msgstr "Stav podpisu: Vytvorený s okrajovo dôveryhodným k¾úèom"
 
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:112
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "Stav podpisu: Vytvorený s NEDÔVERYHODNÝM k¾úèom"
 
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:115
 msgid "Signature status: created with an undefined trusted key"
 msgstr "Stav podpisu: Vytvorený s nedefinovane dôveryhodným k¾úèom"
 
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:125
 #, c-format
 msgid ""
 "*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -539,7 +529,7 @@
 "*** Podpísal: %s (0x%s)\r\n"
 "*** ZAÈIATOK PGP DEŠIFROVANÉHO TEXTU ***\r\n"
 
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:132
 msgid ""
 "\r\n"
 "*** END PGP DECRYPTED TEXT ***"
@@ -547,11 +537,11 @@
 "\r\n"
 "*** KONIEC PGP DEŠIFROVANÉHO TEXTU ***"
 
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Decrypt Verify"
 msgstr "Dešifrova Overi"
 
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:190
 #, c-format
 msgid ""
 "%s\n"
@@ -566,25 +556,25 @@
 "Od \"%s\" s použitím ID k¾úèa 0x%s%s %s\n"
 "%s"
 
-#: Src/wptClipDecryptDlg.cpp:218 Src/wptClipVerifyDlg.cpp:159
-#: Src/wptClipVerifyDlg.cpp:170 Src/wptClipVerifyDlg.cpp:186
-#: Src/wptClipVerifyDlg.cpp:203 Src/wptClipVerifyDlg.cpp:214
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipVerifyDlg.cpp:144
+#: Src/wptClipVerifyDlg.cpp:155 Src/wptClipVerifyDlg.cpp:171
+#: Src/wptClipVerifyDlg.cpp:188 Src/wptClipVerifyDlg.cpp:199
 #: Src/wptFileManager.cpp:1670 Src/wptFileManager.cpp:1735
-#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:597
-#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:276
-#: Src/wptKeyserverDlg.cpp:284 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
-#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:404
+#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:279
+#: Src/wptKeyserverDlg.cpp:286 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:405
 msgid "Verify"
 msgstr "Overi"
 
-#: Src/wptClipDecryptDlg.cpp:225 Src/wptClipDecryptDlg.cpp:238
-#: Src/wptClipDecryptDlg.cpp:246 Src/wptClipDecryptDlg.cpp:253
-#: Src/wptClipDecryptDlg.cpp:255 Src/wptFileManager.cpp:1377
+#: Src/wptClipDecryptDlg.cpp:230 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptClipDecryptDlg.cpp:258
+#: Src/wptClipDecryptDlg.cpp:260 Src/wptFileManager.cpp:1377
 #: Src/wptFileManager.cpp:1428
 msgid "Decryption"
 msgstr "Dešifrovanie"
 
-#: Src/wptClipDecryptDlg.cpp:239 Src/wptFileManager.cpp:1429
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptFileManager.cpp:1429
 #, c-format
 msgid ""
 "Encrypted with %s key, ID 0x%s.%s\n"
@@ -593,17 +583,17 @@
 "Zašifrované s k¾úèom %s, ID 0x%s.%s\n"
 "Dešifrovanie zlyhalo: tajný k¾úè nie je dostupný. "
 
-#: Src/wptClipDecryptDlg.cpp:246
+#: Src/wptClipDecryptDlg.cpp:251
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Nepodporovaný algoritmus: %s"
 
-#: Src/wptClipDecryptDlg.cpp:252
+#: Src/wptClipDecryptDlg.cpp:257
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Poškodená správa OpenPGP (možno: znak \"quoted printable\" v ASCII formáte)."
 
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:267
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -617,23 +607,23 @@
 "Je pravdepodobné, že dáta boli poškodené poèas prenosu\n"
 "ale môže by tiež možné, že toto je èasou útoku."
 
-#: Src/wptClipDecryptDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:272
 msgid "*** IMPORTANT ***"
 msgstr "*** DÔLEŽITÉ ***"
 
-#: Src/wptClipDecryptDlg.cpp:271 Src/wptClipEncryptDlg.cpp:221
+#: Src/wptClipDecryptDlg.cpp:276 Src/wptClipEncryptDlg.cpp:216
 #: Src/wptClipSignDlg.cpp:118 Src/wptClipSignDlg.cpp:264
-#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:962 Src/wptSymEnc.cpp:94
+#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:296
+#: Src/wptKeyManager.cpp:762 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:88
 msgid "GnuPG Status: Finished"
 msgstr "Stav GnuPG: Skonèené"
 
 #: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
 #: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
 #: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
-#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:417
-#: Src/wptMainProc.cpp:500 Src/wptMainProc.cpp:505 Src/wptVerifyList.cpp:232
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:212
+#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:501 Src/wptMainProc.cpp:506 Src/wptVerifyList.cpp:202
 msgid "Clipboard"
 msgstr "Schránka"
 
@@ -669,7 +659,7 @@
 msgid "&Quote"
 msgstr "&Citova"
 
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:502
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:497
 msgid "&Open..."
 msgstr "&Otvori..."
 
@@ -677,61 +667,61 @@
 msgid "&Save..."
 msgstr "&Uloži..."
 
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:515
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:510
 msgid "&Paste"
 msgstr "&Prilepi"
 
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:503
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:498
 msgid "&Encrypt"
 msgstr "&Šifrova"
 
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:505
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:500
 msgid "&Decrypt"
 msgstr "&Dešifrova"
 
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:562
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr "Editor schránky"
 
-#: Src/wptClipEncryptDlg.cpp:104
+#: Src/wptClipEncryptDlg.cpp:106
 msgid "key not found"
 msgstr "k¾úè nenájdený"
 
-#: Src/wptClipEncryptDlg.cpp:123
+#: Src/wptClipEncryptDlg.cpp:122
 msgid "Recipients unsuable for encryption:\n"
 msgstr "Príjemcovia nepoužite¾ní pre šifrovanie:\n"
 
-#: Src/wptClipEncryptDlg.cpp:139 Src/wptClipEncryptDlg.cpp:161
-#: Src/wptClipEncryptDlg.cpp:211 Src/wptClipEncryptDlg.cpp:218
-#: Src/wptClipEncryptDlg.cpp:244 Src/wptMainProc.cpp:172
+#: Src/wptClipEncryptDlg.cpp:135 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:172
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: Src/wptClipEncryptDlg.cpp:162
+#: Src/wptClipEncryptDlg.cpp:157
 msgid "&Find"
 msgstr "&H¾ada"
 
-#: Src/wptClipEncryptDlg.cpp:163 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
 #: Src/wptCommonDlg.cpp:80 Src/wptCommonDlg.cpp:257
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
-#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:283 Src/wptFileSaveDlg.cpp:59
 #: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
-#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
-#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
+#: Src/wptKeyEditDlgs.cpp:354 Src/wptKeyEditDlgs.cpp:435
+#: Src/wptKeyEditDlgs.cpp:501 Src/wptKeyEditDlgs.cpp:636
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
 #: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:95
-#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
+#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:418 Src/wptPassphraseCB.cpp:89
+#: Src/wptPassphraseDlg.cpp:95 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:120 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
 msgstr "&Zruši"
 
-#: Src/wptClipEncryptDlg.cpp:210 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
 msgid "You must select at least one key."
 msgstr "Musíte vybra aspoò jeden k¾úè."
 
-#: Src/wptClipEncryptDlg.cpp:245
+#: Src/wptClipEncryptDlg.cpp:240
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr "Nebol nájdený žiaden príjemca s '%s'"
@@ -783,28 +773,28 @@
 msgid "Signing key:"
 msgstr "Podpisovací k¾úè:"
 
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1225
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1198
 msgid "No key was selected."
 msgstr "Nebol vybraný žiaden k¾úè."
 
-#: Src/wptClipVerifyDlg.cpp:139
+#: Src/wptClipVerifyDlg.cpp:125
 msgid "Signature Information"
 msgstr "Informácie o podpise"
 
-#: Src/wptClipVerifyDlg.cpp:160 Src/wptFileVerifyDlg.cpp:52
+#: Src/wptClipVerifyDlg.cpp:145 Src/wptFileVerifyDlg.cpp:52
 #: Src/wptGPGOptDlg.cpp:49
 msgid "&Save"
 msgstr "&Uloži"
 
-#: Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:188
 msgid "Invalid signature state."
 msgstr "Neplatný stav podpisu."
 
-#: Src/wptClipVerifyDlg.cpp:213
+#: Src/wptClipVerifyDlg.cpp:198
 msgid "Error while adding signature information."
 msgstr "Chyba poèas pridávania informácie o podpise"
 
-#: Src/wptClipVerifyDlg.cpp:251 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:236 Src/wptFileSaveDlg.cpp:58
 #: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
 #: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
 #: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -816,7 +806,7 @@
 msgid "Please enter a valid URL."
 msgstr "Prosím zadajte platné URL."
 
-#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:516
+#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:508
 msgid "HTTP Key Import"
 msgstr "Import k¾úèa cez HTTP"
 
@@ -824,34 +814,34 @@
 msgid "Enter URL to retrieve the public key"
 msgstr "Zadajte URL pre získanie verejného k¾úèa"
 
-#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:758
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:867
-#: Src/wptKeyEditDlgs.cpp:881 Src/wptKeyEditDlgs.cpp:883
-#: Src/wptKeyEditDlgs.cpp:909 Src/wptKeyEditDlgs.cpp:939
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyEditDlgs.cpp:1017
-#: Src/wptKeyEditDlgs.cpp:1024 Src/wptKeyEditDlgs.cpp:1044
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1310 Src/wptKeyEditDlgs.cpp:1326
-#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1394 Src/wptKeyEditDlgs.cpp:1433
-#: Src/wptKeyEditDlgs.cpp:1438 Src/wptKeyEditDlgs.cpp:1445
-#: Src/wptKeyEditDlgs.cpp:1451 Src/wptKeyEditDlgs.cpp:1456
-#: Src/wptKeyEditDlgs.cpp:1499 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1518
-#: Src/wptKeyEditDlgs.cpp:1521 Src/wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:1569 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1734
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1807
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeyEditDlgs.cpp:1822
-#: Src/wptKeyEditDlgs.cpp:1927 Src/wptKeyEditDlgs.cpp:1929
-#: Src/wptKeyEditDlgs.cpp:1945 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1982 Src/wptKeyEditDlgs.cpp:1990
-#: Src/wptKeyEditDlgs.cpp:2006 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2024 Src/wptKeyEditDlgs.cpp:2091
-#: Src/wptKeyEditDlgs.cpp:2154 Src/wptKeyEditDlgs.cpp:2168
-#: Src/wptKeyEditDlgs.cpp:2183 Src/wptKeyEditDlgs.cpp:2223
-#: Src/wptKeyEditDlgs.cpp:2228 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:753
+#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:862
+#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1012
+#: Src/wptKeyEditDlgs.cpp:1019 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1305 Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1355 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389 Src/wptKeyEditDlgs.cpp:1428
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1506 Src/wptKeyEditDlgs.cpp:1513
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1556
+#: Src/wptKeyEditDlgs.cpp:1564 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1620 Src/wptKeyEditDlgs.cpp:1729
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1922 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:2001 Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2019 Src/wptKeyEditDlgs.cpp:2086
+#: Src/wptKeyEditDlgs.cpp:2149 Src/wptKeyEditDlgs.cpp:2163
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyEditDlgs.cpp:2218
+#: Src/wptKeyEditDlgs.cpp:2223 Src/wptKeyManagerDlg.cpp:1031
 #: Src/wptKeyManagerDlg.cpp:1972
 msgid "Key Edit"
 msgstr "Editácia k¾úèa"
@@ -860,7 +850,7 @@
 msgid "Enter preferred keyserver URL"
 msgstr "Zadajte URL preferovaného servera s k¾úèmi"
 
-#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:337
+#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:346
 msgid "Choose Locale Directory"
 msgstr "Vybra adresár s lokalizáciou"
 
@@ -876,12 +866,12 @@
 msgid "Please select a language"
 msgstr "Prosím vyberte jazyk"
 
-#: Src/wptErrors.cpp:47
+#: Src/wptErrors.cpp:51
 #, c-format
 msgid "Could not locate GPG.exe in %s."
 msgstr "Nepodarilo sa nájs GPG.exe v %s."
 
-#: Src/wptErrors.cpp:52
+#: Src/wptErrors.cpp:56
 #, c-format
 msgid ""
 "Could not find keyring entries in the config file in %s or the file does NOT "
@@ -890,147 +880,147 @@
 "Nepodarilo sa nájs položky súboru s k¾úèmi v súbore volieb v %s alebo súbor "
 "NEexistuje."
 
-#: Src/wptErrors.cpp:78
+#: Src/wptErrors.cpp:83
 msgid "General error occured"
 msgstr "Objavila sa všeobecná chyba"
 
-#: Src/wptErrors.cpp:79
+#: Src/wptErrors.cpp:84
 msgid "Could not open file"
 msgstr "Nepodarilo sa otvori súbor"
 
-#: Src/wptErrors.cpp:80
+#: Src/wptErrors.cpp:85
 msgid "Could not create file"
 msgstr "Nepodarilo sa vytvori súbor"
 
-#: Src/wptErrors.cpp:81
+#: Src/wptErrors.cpp:86
 msgid "Could not read file"
 msgstr "Nepodarilo sa naèíta súbor"
 
-#: Src/wptErrors.cpp:82
+#: Src/wptErrors.cpp:87
 msgid "Could not write file"
 msgstr "Nepodarilo sa zapísa do súboru"
 
-#: Src/wptErrors.cpp:83
+#: Src/wptErrors.cpp:88
 msgid "Could not close file"
 msgstr "Nepodarilo sa zatvori súbor"
 
-#: Src/wptErrors.cpp:84
+#: Src/wptErrors.cpp:89
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
-#: Src/wptErrors.cpp:85
+#: Src/wptErrors.cpp:90
 msgid "Could not delete file"
 msgstr "Nepodarilo sa zmaza súbor"
 
-#: Src/wptErrors.cpp:86
+#: Src/wptErrors.cpp:91
 msgid "Could not open Clipboard"
 msgstr "Nepodarilo sa otvori schránku"
 
-#: Src/wptErrors.cpp:87
+#: Src/wptErrors.cpp:92
 msgid "Could not close Clipboard"
 msgstr "Schránka nemohla by zatvorená"
 
-#: Src/wptErrors.cpp:88
+#: Src/wptErrors.cpp:93
 msgid "Could not empty Clipboard"
 msgstr "Nepodarilo sa vyprázdni schránku"
 
-#: Src/wptErrors.cpp:89
+#: Src/wptErrors.cpp:94
 msgid "Could not set Clipboard data"
 msgstr "Nepodarilo sa nastavi dáta v schránke"
 
-#: Src/wptErrors.cpp:90
+#: Src/wptErrors.cpp:95
 msgid "Could not get Clipboard data"
 msgstr "Nepodarilo sa získa dáta zo schránky"
 
-#: Src/wptErrors.cpp:91
+#: Src/wptErrors.cpp:96
 msgid "There is no text in the Clipboard"
 msgstr "V schránke nie je žiaden text"
 
-#: Src/wptErrors.cpp:92
+#: Src/wptErrors.cpp:97
 msgid "The Clipboard already contains GPG data"
 msgstr "Schránka už obsahuje dáta GPG"
 
-#: Src/wptErrors.cpp:93
+#: Src/wptErrors.cpp:98
 msgid "General Clipboard error"
 msgstr "Všeobecná chyba schránky"
 
-#: Src/wptErrors.cpp:94
+#: Src/wptErrors.cpp:99
 msgid "Registry error: "
 msgstr "Chyba registra: "
 
-#: Src/wptErrors.cpp:97
+#: Src/wptErrors.cpp:102
 msgid "Could not startup Winsock 2 interface"
 msgstr "Nepodarilo sa spusti rozhranie Winsock 2"
 
-#: Src/wptErrors.cpp:98
+#: Src/wptErrors.cpp:103
 msgid "Could not resolve hostname"
 msgstr "Nepodarilo sa získa meno hostite¾a"
 
-#: Src/wptErrors.cpp:99
+#: Src/wptErrors.cpp:104
 msgid "Could not create new socket"
 msgstr "Nepodarilo sa vytvori nový socket"
 
-#: Src/wptErrors.cpp:100
+#: Src/wptErrors.cpp:105
 msgid "Could not connect to the host"
 msgstr "Nepodarilo sa spoji s hostite¾om"
 
-#: Src/wptErrors.cpp:101
+#: Src/wptErrors.cpp:106
 msgid "Could not send the key to the keyserver"
 msgstr "Nepodarilo sa posla k¾úè na server s k¾úèmi"
 
-#: Src/wptErrors.cpp:102
+#: Src/wptErrors.cpp:107
 msgid "Could not receive the key from the keyserver"
 msgstr "Nepodarilo sa získa k¾úè zo servera s k¾úèmi"
 
-#: Src/wptErrors.cpp:103
+#: Src/wptErrors.cpp:108
 msgid "Socket timed out, no data"
 msgstr "Socket vypršal èas, žiadne dáta"
 
-#: Src/wptErrors.cpp:104
+#: Src/wptErrors.cpp:109
 msgid "Could not forward request to proxy"
 msgstr "Nepodarilo sa odosla požiadavku na proxy"
 
-#: Src/wptErrors.cpp:105
+#: Src/wptErrors.cpp:110
 msgid "Keyserver returned: no matching keys in database"
 msgstr "Server s k¾úèmi vrátil: žiadne zodpovedajúce k¾úèe v databáze"
 
-#: Src/wptErrors.cpp:106
+#: Src/wptErrors.cpp:111
 msgid "Could not register hotkey: "
 msgstr "Nepodarilo sa zaregistrova klávesovú skratku: "
 
-#: Src/wptErrors.cpp:109
+#: Src/wptErrors.cpp:114
 msgid "Could not open directory"
 msgstr "Nepodarilo sa otvori adresár"
 
-#: Src/wptErrors.cpp:110
+#: Src/wptErrors.cpp:115
 msgid "Could not create directory"
 msgstr "Nepodarilo sa vytvori adresár"
 
-#: Src/wptErrors.cpp:111
+#: Src/wptErrors.cpp:116
 msgid "Could not extract data from the current window"
 msgstr "Nepodarilo sa extrahova dáta z aktuálneho okna"
 
-#: Src/wptErrors.cpp:112
+#: Src/wptErrors.cpp:117
 msgid "Could not load config file"
 msgstr "Nepodarilo sa naèíta súbor config"
 
-#: Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:121
 msgid "No data available"
 msgstr "Žiadne dáta k dispozícii"
 
-#: Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:122
 msgid "There is no card in the reader"
 msgstr "V èítaèke nie je žiadna karta"
 
-#: Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:123
 msgid "There was no reader found"
 msgstr "Nebola nájdená žiadna èítaèka"
 
-#: Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:124
 msgid "This is not an OpenPGP card"
 msgstr "Toto nie je karta OpenPGP"
 
-#: Src/wptErrors.cpp:128
+#: Src/wptErrors.cpp:134
 #, c-format
 msgid "Unknown error=%d"
 msgstr "Neznáma chyba=%d"
@@ -1041,9 +1031,9 @@
 #: Src/wptFileManager.cpp:915 Src/wptFileManager.cpp:1045
 #: Src/wptFileManager.cpp:1579 Src/wptFileManager.cpp:1606
 #: Src/wptFileManager.cpp:1625 Src/wptFileManager.cpp:1910
-#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:530
-#: Src/wptFileManagerDlg.cpp:640 Src/wptFileStatDlg.cpp:152
-#: Src/wptMainProc.cpp:393 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:525
+#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:394 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
 msgid "File Manager"
 msgstr "Správca súborov"
 
@@ -1081,14 +1071,14 @@
 "Je možné vypnú kompresiu pre tieto súbory.\n"
 "Chcete ju vypnú?"
 
-#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1080
-#: Src/wptVerifyList.cpp:169
+#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptVerifyList.cpp:139
 msgid "Status"
 msgstr "Stav"
 
-#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1156
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:168
+#: Src/wptVerifyList.cpp:138
 msgid "Name"
 msgstr "Meno"
 
@@ -1128,22 +1118,22 @@
 msgstr "Nepodarilo sa získa predvolený tajný k¾úè."
 
 #: Src/wptFileManager.cpp:1217 Src/wptFileManager.cpp:1529
-#: Src/wptFileManagerDlg.cpp:595 Src/wptMainProc.cpp:156
-#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:408
+#: Src/wptFileManagerDlg.cpp:590 Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:409
 msgid "Sign"
 msgstr "Podpísa"
 
-#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:593
-#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:405
+#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:588
+#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:406
 msgid "Encrypt"
 msgstr "Šifrova"
 
-#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:92
+#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:66 Src/wptSymEnc.cpp:86
 msgid "Symmetric Encryption"
 msgstr "Symetrické šifrovanie"
 
 #: Src/wptFileManager.cpp:1290 Src/wptFileManager.cpp:1295
-#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:410
 msgid "Symmetric"
 msgstr "Symetrické"
 
@@ -1160,7 +1150,7 @@
 msgstr "Zadajte názov súboru pre súbor v obyèajnom texte"
 
 #: Src/wptFileManager.cpp:1437 Src/wptFileManager.cpp:1457
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:589
 msgid "Decrypt"
 msgstr "Dešifrova"
 
@@ -1209,11 +1199,11 @@
 msgstr "Neplatný názov súboru. Koniec"
 
 #: Src/wptFileManager.cpp:1803 Src/wptFileManager.cpp:1814
-#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:406
-#: Src/wptImportList.cpp:413 Src/wptImportList.cpp:423
-#: Src/wptImportList.cpp:431 Src/wptImportList.cpp:440
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:469
-#: Src/wptKeyManager.cpp:567 Src/wptKeyManager.cpp:586
+#: Src/wptFileManagerDlg.cpp:240 Src/wptImportList.cpp:387
+#: Src/wptImportList.cpp:394 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:412 Src/wptImportList.cpp:421
+#: Src/wptKeyManager.cpp:450 Src/wptKeyManager.cpp:461
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:578
 #: Src/wptKeyserverDlg.cpp:220
 msgid "Import"
 msgstr "Import"
@@ -1230,8 +1220,8 @@
 "\n"
 "Tento k¾úè(e) nemožno importova!"
 
-#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:282
-#: Src/wptKeyManager.cpp:325 Src/wptKeyManager.cpp:360
+#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:317 Src/wptKeyManager.cpp:352
 msgid "No key was selected for export."
 msgstr "Nebol vybraný žiaden k¾úè na export."
 
@@ -1245,8 +1235,8 @@
 msgid "Choose Name for Key File"
 msgstr "Vybra názov pre súbor k¾úèa"
 
-#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1060
-#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1412
+#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1055
+#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1407
 #: Src/wptKeyserverDlg.cpp:105
 msgid "GnuPG status"
 msgstr "Stav GnuPG"
@@ -1285,55 +1275,55 @@
 msgid "Could not create zip archive."
 msgstr "Nepodarilo sa vytvori zip archív."
 
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
+#: Src/wptFileManagerDlg.cpp:86 Src/wptFileManagerDlg.cpp:148
 msgid "File Encrypt"
 msgstr "Šifrovanie súboru"
 
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:87 Src/wptFileManagerDlg.cpp:277
 msgid "&Text Output"
 msgstr "&Textový výstup"
 
-#: Src/wptFileManagerDlg.cpp:93
+#: Src/wptFileManagerDlg.cpp:88
 msgid "&Wipe Original"
 msgstr "&Skartova originál"
 
-#: Src/wptFileManagerDlg.cpp:94
+#: Src/wptFileManagerDlg.cpp:89
 msgid "Anonymize (throw keyid)"
 msgstr "Anonymizova (odhodi id k¾úèa)"
 
-#: Src/wptFileManagerDlg.cpp:95
+#: Src/wptFileManagerDlg.cpp:90
 msgid "&Select Key for signing"
 msgstr "&Vybra k¾úè pre podpis"
 
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:282
 msgid "Options"
 msgstr "Vo¾by"
 
-#: Src/wptFileManagerDlg.cpp:152
+#: Src/wptFileManagerDlg.cpp:147
 msgid "Please select at least one recipient."
 msgstr "Prosím vyberte aspoò jedného príjemcu."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:426
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileStatDlg.cpp:281
+#: Src/wptKeyManager.cpp:418
 msgid "No valid OpenPGP data found."
 msgstr "Nenájdené žiadne platné dáta OpenPGP."
 
-#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
-#: Src/wptKeyManager.cpp:451
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileManagerDlg.cpp:220
+#: Src/wptKeyManager.cpp:443
 msgid "Key Import"
 msgstr "Import k¾úèa"
 
-#: Src/wptFileManagerDlg.cpp:216
+#: Src/wptFileManagerDlg.cpp:211
 #, c-format
 msgid "%s contain(s) %d key(s)."
 msgstr "%s obsahuje(ú) %d k¾úè(e/ov)."
 
-#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:499
+#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:494
 #: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Súbor"
 
-#: Src/wptFileManagerDlg.cpp:242
+#: Src/wptFileManagerDlg.cpp:237
 msgid ""
 "Some of the imported keys are secret keys.\n"
 "\n"
@@ -1345,30 +1335,30 @@
 "Stupeò dôvery týchto k¾úèov musí by nastavený\n"
 "ruène cez dialóg Vlastnosti k¾úèa."
 
-#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
+#: Src/wptFileManagerDlg.cpp:276 Src/wptFileManagerDlg.cpp:323
 msgid "File Sign"
 msgstr "Podpis súboru"
 
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:278
 msgid "&Normal Signature"
 msgstr "&Normálny podpis"
 
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:279
 msgid "&Detached Signature"
 msgstr "&Oddelený podpis"
 
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:280
 msgid "&Cleartext Signature"
 msgstr "&Podpis priamo do textu"
 
-#: Src/wptFileManagerDlg.cpp:286
+#: Src/wptFileManagerDlg.cpp:281
 msgid "Signature mode"
 msgstr "Mód podpisu"
 
-#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1306
-#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyManager.cpp:690 Src/wptKeyManager.cpp:791
-#: Src/wptKeyManager.cpp:824 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptFileManagerDlg.cpp:323 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyManager.cpp:682 Src/wptKeyManager.cpp:783
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManagerDlg.cpp:1710
 #: Src/wptKeyManagerDlg.cpp:1726 Src/wptKeyManagerDlg.cpp:1754
 #: Src/wptKeyManagerDlg.cpp:1765 Src/wptKeyManagerDlg.cpp:1780
 #: Src/wptKeyManagerDlg.cpp:1893 Src/wptKeyManagerDlg.cpp:1912
@@ -1376,132 +1366,132 @@
 msgid "Please select a key."
 msgstr "Prosím vyberte k¾úè."
 
-#: Src/wptFileManagerDlg.cpp:387
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "0 Objektov oznaèených"
 
-#: Src/wptFileManagerDlg.cpp:391
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d Oznaèený(é) objekt(y)"
 
-#: Src/wptFileManagerDlg.cpp:496 Src/wptMainProc.cpp:532
+#: Src/wptFileManagerDlg.cpp:491 Src/wptMainProc.cpp:533
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Správca súborov (použijte \"ahaj a pus\" pre pridanie súborov)"
 
-#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:495 Src/wptKeyManagerDlg.cpp:967
 #: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptMainProc.cpp:396
+#: Src/wptMainProc.cpp:397
 msgid "Edit"
 msgstr "Editova"
 
-#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptFileManagerDlg.cpp:496 Src/wptKeyManagerDlg.cpp:968
 msgid "View"
 msgstr "Zobrazi"
 
-#: Src/wptFileManagerDlg.cpp:504 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:499 Src/wptFileManagerDlg.cpp:587
 msgid "Encrypt into ZIP"
 msgstr "Šifrova do ZIP archívu"
 
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:984
 #: Src/wptKeyManagerDlg.cpp:1034
 msgid "&Sign"
 msgstr "Podpí&sa"
 
-#: Src/wptFileManagerDlg.cpp:507 Src/wptFileManagerDlg.cpp:596
-#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:406
+#: Src/wptFileManagerDlg.cpp:502 Src/wptFileManagerDlg.cpp:591
+#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
 msgid "Sign && Encrypt"
 msgstr "Podpísa && Šifrova"
 
-#: Src/wptFileManagerDlg.cpp:508
+#: Src/wptFileManagerDlg.cpp:503
 msgid "&Verify"
 msgstr "O&veri"
 
-#: Src/wptFileManagerDlg.cpp:509
+#: Src/wptFileManagerDlg.cpp:504
 msgid "S&ymmetric"
 msgstr "S&ymetrické"
 
-#: Src/wptFileManagerDlg.cpp:510
+#: Src/wptFileManagerDlg.cpp:505
 msgid "&Import"
 msgstr "&Import"
 
-#: Src/wptFileManagerDlg.cpp:511
+#: Src/wptFileManagerDlg.cpp:506
 msgid "E&xport"
 msgstr "E&xport"
 
-#: Src/wptFileManagerDlg.cpp:512 Src/wptMainProc.cpp:398
+#: Src/wptFileManagerDlg.cpp:507 Src/wptMainProc.cpp:399
 msgid "Exit"
 msgstr "Koniec"
 
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:508
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:509
 msgid "Always on Top"
 msgstr "Vždy navrchu"
 
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:511
 msgid "&Select All"
 msgstr "Vybra &všetko"
 
-#: Src/wptFileManagerDlg.cpp:517
+#: Src/wptFileManagerDlg.cpp:512
 msgid "&Preferences"
 msgstr "&Predvo¾by"
 
-#: Src/wptFileManagerDlg.cpp:518 Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:594
 msgid "Send as Mail"
 msgstr "Posla ako e-mail"
 
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:514
 msgid "&List Packets"
 msgstr "Vypísa ba&líèky"
 
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:516
 msgid "&Wipe"
 msgstr "&Skartova"
 
-#: Src/wptFileManagerDlg.cpp:598
+#: Src/wptFileManagerDlg.cpp:593
 msgid "Wipe"
 msgstr "Úplne vymaza"
 
-#: Src/wptFileManagerDlg.cpp:600
+#: Src/wptFileManagerDlg.cpp:595
 msgid "List Packets"
 msgstr "Vypísa balíèky"
 
-#: Src/wptFileManagerDlg.cpp:627
+#: Src/wptFileManagerDlg.cpp:622
 msgid "&Calc Digest"
 msgstr "&Vypoèíta Digest"
 
-#: Src/wptFileManagerDlg.cpp:639
+#: Src/wptFileManagerDlg.cpp:634
 msgid "This command requires admin privileges.\n"
 msgstr "Tento príkaz vyžaduje práva správcu.\n"
 
-#: Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:785
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Ste si istí, že chcete bezpeène zmaza tieto súbory?"
 
-#: Src/wptFileManagerDlg.cpp:791 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:786 Src/wptMainProc.cpp:110
 msgid "&Yes"
 msgstr "Án&o"
 
-#: Src/wptFileManagerDlg.cpp:792 Src/wptMainProc.cpp:111
+#: Src/wptFileManagerDlg.cpp:787 Src/wptMainProc.cpp:111
 msgid "&No"
 msgstr "&Nie"
 
-#: Src/wptFileManagerDlg.cpp:793
+#: Src/wptFileManagerDlg.cpp:788
 msgid "passes"
 msgstr "prechody"
 
-#: Src/wptFileManagerDlg.cpp:858
+#: Src/wptFileManagerDlg.cpp:853
 msgid "Operation Status: Error"
 msgstr "Stav operácie: Chyba"
 
-#: Src/wptFileManagerDlg.cpp:859
+#: Src/wptFileManagerDlg.cpp:854
 msgid "Operation Status: Done."
 msgstr "Stav operácie: Ukonèené."
 
-#: Src/wptFileManagerDlg.cpp:902
+#: Src/wptFileManagerDlg.cpp:897
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1594,11 +1584,11 @@
 msgid "GPG Warning"
 msgstr "Varovanie GPG"
 
-#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
-#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
-#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
-#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
-#: Src/wptKeyEditDlgs.cpp:1739 Src/wptMainProc.cpp:419
+#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:231 Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:259
+#: Src/wptGPGPrefsDlg.cpp:265 Src/wptGPGPrefsDlg.cpp:279
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptMainProc.cpp:420
 #: Src/wptPreferencesDlg.cpp:209 Src/wptPreferencesDlg.cpp:254
 #: Src/wptPreferencesDlg.cpp:266 Src/wptPreferencesDlg.cpp:287
 #: Src/wptPreferencesDlg.cpp:315 Src/wptRegistry.cpp:596
@@ -1748,7 +1738,7 @@
 msgstr "Nepodarilo sa naèíta konfiguraèný súbor GnuPG."
 
 #: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1865
-#: Src/wptMainProc.cpp:580
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "Predvo¾by GnuPG"
 
@@ -1795,56 +1785,56 @@
 msgid "&Overwrite default settings"
 msgstr "&Prepísa predvolené nastavenia"
 
-#: Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter the GnuPG home directory."
 msgstr "Prosím zadajte domáci adresár GnuPG."
 
-#: Src/wptGPGPrefsDlg.cpp:233
+#: Src/wptGPGPrefsDlg.cpp:242
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "'HomeDir' sa nepodarilo uloži do registra."
 
-#: Src/wptGPGPrefsDlg.cpp:239
+#: Src/wptGPGPrefsDlg.cpp:248
 msgid "Please enter where GPG.exe is located."
 msgstr "Prosím zadajte umiestnenie súboru GPG.exe."
 
-#: Src/wptGPGPrefsDlg.cpp:244
+#: Src/wptGPGPrefsDlg.cpp:253
 msgid "Could not find the GPG program in this directory."
 msgstr "V tomto adresári sa nepodarilo nájs program GPG."
 
-#: Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:258
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "Nepodarilo sa uloži 'gpgProgram' do registra"
 
-#: Src/wptGPGPrefsDlg.cpp:269
+#: Src/wptGPGPrefsDlg.cpp:278
 msgid "Could not get GPG config file"
 msgstr "Nepodarilo sa získa konfiguraèný súbor GPG"
 
-#: Src/wptGPGPrefsDlg.cpp:319
+#: Src/wptGPGPrefsDlg.cpp:328
 msgid "Choose GPG Home Directory"
 msgstr "Vybra domáci prieèinok GPG"
 
-#: Src/wptGPGPrefsDlg.cpp:343
+#: Src/wptGPGPrefsDlg.cpp:352
 msgid "Choose GPG Binary"
 msgstr "Vybra spustite¾ný súbor GPG"
 
 #: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:186 Src/wptKeyManager.cpp:191
-#: Src/wptKeyManager.cpp:240 Src/wptKeyManager.cpp:283
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:326
-#: Src/wptKeyManager.cpp:331 Src/wptKeyManager.cpp:338
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:370 Src/wptKeyManager.cpp:374
-#: Src/wptKeyManager.cpp:394 Src/wptKeyManager.cpp:419
-#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:427
-#: Src/wptKeyManager.cpp:432 Src/wptKeyManager.cpp:438
-#: Src/wptKeyManager.cpp:443 Src/wptKeyManager.cpp:690
-#: Src/wptKeyManager.cpp:718 Src/wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:738 Src/wptKeyManager.cpp:764
-#: Src/wptKeyManager.cpp:791 Src/wptKeyManager.cpp:796
-#: Src/wptKeyManager.cpp:819 Src/wptKeyManager.cpp:824
-#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:898
-#: Src/wptKeyManager.cpp:903 Src/wptKeyManager.cpp:960
-#: Src/wptKeyManager.cpp:993 Src/wptKeyManager.cpp:1077
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
+#: Src/wptKeyManager.cpp:232 Src/wptKeyManager.cpp:275
+#: Src/wptKeyManager.cpp:287 Src/wptKeyManager.cpp:318
+#: Src/wptKeyManager.cpp:323 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:332 Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:362 Src/wptKeyManager.cpp:366
+#: Src/wptKeyManager.cpp:386 Src/wptKeyManager.cpp:411
+#: Src/wptKeyManager.cpp:416 Src/wptKeyManager.cpp:419
+#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:430
+#: Src/wptKeyManager.cpp:435 Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:710 Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:730 Src/wptKeyManager.cpp:756
+#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:788
+#: Src/wptKeyManager.cpp:811 Src/wptKeyManager.cpp:816
+#: Src/wptKeyManager.cpp:830 Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:895 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManager.cpp:1068
 #: Src/wptKeyManagerDlg.cpp:1357 Src/wptKeyManagerDlg.cpp:1368
 #: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1688
 #: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyManagerDlg.cpp:1726
@@ -1857,7 +1847,7 @@
 #: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeyManagerDlg.cpp:2117
 #: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
 #: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
-#: Src/wptMainProc.cpp:394 Src/wptMainProc.cpp:543 Src/wptMainProc.cpp:551
+#: Src/wptMainProc.cpp:395 Src/wptMainProc.cpp:544 Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "Správca k¾úèov"
 
@@ -1931,69 +1921,69 @@
 msgid "Unknown Hotkey"
 msgstr "Neznáma klávesová skratka"
 
-#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1134 Src/wptKeyEditDlgs.cpp:1184
-#: Src/wptKeyEditDlgs.cpp:1450 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1509 Src/wptKeyEditDlgs.cpp:1540
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1784
-#: Src/wptKeyEditDlgs.cpp:1986 Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:252
+#: Src/wptKeyEditDlgs.cpp:1129 Src/wptKeyEditDlgs.cpp:1179
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1465
+#: Src/wptKeyEditDlgs.cpp:1504 Src/wptKeyEditDlgs.cpp:1535
+#: Src/wptKeyEditDlgs.cpp:1613 Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeylist.cpp:407 Src/wptKeylist.cpp:441
 #: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
 #: Src/wptKeysigDlg.cpp:215
 msgid "Revoked"
 msgstr "Odvolaný"
 
-#: Src/wptImportList.cpp:270 Src/wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1132 Src/wptKeyEditDlgs.cpp:1372
-#: Src/wptKeylist.cpp:427 Src/wptKeylist.cpp:457 Src/wptKeyPropsDlg.cpp:150
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:254
+#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeylist.cpp:409 Src/wptKeylist.cpp:439 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
 msgid "Expired"
 msgstr "Expiroval"
 
-#: Src/wptImportList.cpp:274
+#: Src/wptImportList.cpp:271
 msgid "secret key"
 msgstr "tajný k¾úè"
 
-#: Src/wptImportList.cpp:276 Src/wptKeylist.cpp:463
+#: Src/wptImportList.cpp:271 Src/wptKeylist.cpp:450
 msgid "public key"
 msgstr "verejný k¾úè"
 
-#: Src/wptImportList.cpp:306 Src/wptKeyEditDlgs.cpp:1192
+#: Src/wptImportList.cpp:289 Src/wptKeyEditDlgs.cpp:1187
 msgid "Invalid user ID"
 msgstr "Neplatné ID používate¾a"
 
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588
+#: Src/wptImportList.cpp:327 Src/wptKeylist.cpp:566 Src/wptKeylist.cpp:574
 #: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:173
+#: Src/wptVerifyList.cpp:143
 msgid "User ID"
 msgstr "ID používate¾a"
 
-#: Src/wptImportList.cpp:347 Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591
+#: Src/wptImportList.cpp:328 Src/wptKeylist.cpp:568 Src/wptKeylist.cpp:577
 #: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "Ve¾kos"
 
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1077
-#: Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptImportList.cpp:329 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeylist.cpp:567 Src/wptKeylist.cpp:575 Src/wptKeyManagerDlg.cpp:911
 #: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:172
+#: Src/wptVerifyList.cpp:142
 msgid "Key ID"
 msgstr "ID k¾úèa"
 
-#: Src/wptImportList.cpp:349 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:595
+#: Src/wptImportList.cpp:330 Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:581
 #: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
 #: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "Vytvorenie"
 
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:590
+#: Src/wptImportList.cpp:331 Src/wptKeylist.cpp:576
 #: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
 msgid "Type"
 msgstr "Typ"
 
-#: Src/wptImportList.cpp:421
+#: Src/wptImportList.cpp:402
 msgid ""
 "It is possible that the ASCII-Armor is damaged\n"
 "and thus causing a CRC error."
@@ -2017,24 +2007,24 @@
 msgid "Key Cache"
 msgstr "Cache k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:392
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeylist.cpp:374
 msgid "Ultimate"
 msgstr "Absolútne"
 
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1130
-#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:386
+#: Src/wptKeyEditDlgs.cpp:238 Src/wptKeyEditDlgs.cpp:1125
+#: Src/wptKeylist.cpp:230 Src/wptKeylist.cpp:368
 msgid "Never"
 msgstr "Nikdy"
 
-#: Src/wptKeyEditDlgs.cpp:261 Src/wptKeyEditDlgs.cpp:1136
+#: Src/wptKeyEditDlgs.cpp:256 Src/wptKeyEditDlgs.cpp:1131
 msgid "OK"
 msgstr "OK"
 
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:278
 msgid "user ID"
 msgstr "ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:284
+#: Src/wptKeyEditDlgs.cpp:279
 #, c-format
 msgid ""
 "Could not get key information for: \"%s\":\n"
@@ -2043,7 +2033,7 @@
 "Nepodarilo sa získa informácie o k¾úèi pre \"%s\":\n"
 "%s"
 
-#: Src/wptKeyEditDlgs.cpp:356
+#: Src/wptKeyEditDlgs.cpp:351
 msgid ""
 "Remember that the image is stored within your public key.  If you use a very "
 "large picture, your key will become very large as well! Keeping the image "
@@ -2053,7 +2043,7 @@
 "ve¾ký obrázok, váš k¾úè bude tiež ve¾mi ve¾ký! Dodrža ve¾kos obrázka "
 "240x288 je dobré pre použitie."
 
-#: Src/wptKeyEditDlgs.cpp:357
+#: Src/wptKeyEditDlgs.cpp:352
 msgid ""
 "Pick an image to use for your photo ID.\n"
 "The image must be a JPEG file."
@@ -2061,35 +2051,35 @@
 "Vyberte obrázok pre vaše foto ID.\n"
 "Obrázok musí by vo formáte JPEG."
 
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:361
+#: Src/wptKeyEditDlgs.cpp:353 Src/wptKeyEditDlgs.cpp:434
+#: Src/wptKeysignDlg.cpp:417
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:355
 msgid "Add Photo ID"
 msgstr "Prida foto ID"
 
-#: Src/wptKeyEditDlgs.cpp:367
+#: Src/wptKeyEditDlgs.cpp:362
 msgid "Select Image File"
 msgstr "Vybra súbor obrázka"
 
-#: Src/wptKeyEditDlgs.cpp:371 Src/wptKeyEditDlgs.cpp:382
-#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyEditDlgs.cpp:400
-#: Src/wptKeyEditDlgs.cpp:903
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383 Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:898
 msgid "Add Photo"
 msgstr "Prida foto"
 
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:367
 #, c-format
 msgid "'%s' is not a valid JPEG file."
 msgstr "'%s' nie je platný súbor JPEG."
 
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyRevokeDlg.cpp:166
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:166
 msgid "Please enter a file name."
 msgstr "Prosím zadajte názov súboru."
 
-#: Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:381
 msgid ""
 "The JPEG is really large.\n"
 "Are you sure you want to use it?"
@@ -2097,142 +2087,142 @@
 "Obrázok JPEG je skutoène ve¾ký.\n"
 "Ste si istí, že ho chcete použi?"
 
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:400
 msgid "Photo successfully added."
 msgstr "Foto úspešne pridané."
 
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:469
-#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:725
-#: Src/wptKeyEditDlgs.cpp:1472 Src/wptKeyEditDlgs.cpp:1542
-#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1640
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeyEditDlgs.cpp:401 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:546 Src/wptKeyEditDlgs.cpp:720
+#: Src/wptKeyEditDlgs.cpp:1467 Src/wptKeyEditDlgs.cpp:1537
+#: Src/wptKeyEditDlgs.cpp:1587 Src/wptKeyEditDlgs.cpp:1635
+#: Src/wptKeyEditDlgs.cpp:1833 Src/wptKeygenDlg.cpp:499
 #: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:386
 #: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "Stav GnuPG"
 
-#: Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:432
 msgid "Appointing a key as designated revoker cannot be undone."
 msgstr "Ustanovenie k¾úèa za oznaèeného odvolávate¾a sa nedá zruši."
 
-#: Src/wptKeyEditDlgs.cpp:438
+#: Src/wptKeyEditDlgs.cpp:433
 msgid "Public key"
 msgstr "Verejný k¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:441 Src/wptKeyEditDlgs.cpp:450
-#: Src/wptKeyEditDlgs.cpp:463 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:436 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:458 Src/wptKeyEditDlgs.cpp:929
 msgid "Add Revoker"
 msgstr "Prida Odvolávate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1561 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1812
-#: Src/wptKeyEditDlgs.cpp:1982
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1556 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1977
 msgid "Please select a user ID."
 msgstr "Prosím vyberte ID používate¾a."
 
-#: Src/wptKeyEditDlgs.cpp:468
+#: Src/wptKeyEditDlgs.cpp:463
 msgid "Revoker successfully addded."
 msgstr "Odvolávate¾ úspešne pridaný."
 
-#: Src/wptKeyEditDlgs.cpp:502
+#: Src/wptKeyEditDlgs.cpp:497
 msgid "Add new User ID"
 msgstr "Prida nové ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:499
 msgid "&Email"
 msgstr "&E-mail"
 
-#: Src/wptKeyEditDlgs.cpp:505
+#: Src/wptKeyEditDlgs.cpp:500
 msgid "&Comment"
 msgstr "&Komentár"
 
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:512
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "Prosím zadajte meno (min. 5 znakov)"
 
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:524
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:535
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:525 Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:544
 msgid "UserID"
 msgstr "IDpoužívate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:523
+#: Src/wptKeyEditDlgs.cpp:518
 msgid ""
 "Please enter the email address in the email field and not in the name field"
 msgstr "Prosím zadajte e-mailovú adresu do po¾a e-mail a nie do po¾a meno"
 
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:525
 msgid "Please enter an email address."
 msgstr "Prosím zadajte e-mailovú adresu."
 
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:530
 msgid "Invalid email address."
 msgstr "Neplatná e-mailová adresa."
 
-#: Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:546
 msgid "user ID successfully added."
 msgstr "ID používate¾a úspešne pridané."
 
-#: Src/wptKeyEditDlgs.cpp:636 Src/wptKeyEditDlgs.cpp:839
+#: Src/wptKeyEditDlgs.cpp:631 Src/wptKeyEditDlgs.cpp:834
 msgid "Add new Subkey"
 msgstr "Prida nový podk¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:637
+#: Src/wptKeyEditDlgs.cpp:632
 msgid "Key type"
 msgstr "Typ k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:633
 msgid "Size in bits"
 msgstr "Ve¾kos v bitoch"
 
-#: Src/wptKeyEditDlgs.cpp:639
+#: Src/wptKeyEditDlgs.cpp:634
 msgid "Key expiration"
 msgstr "Expirácia k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:684
+#: Src/wptKeyEditDlgs.cpp:679
 msgid "Please select one entry."
 msgstr "Prosím vyberte jednu položku."
 
-#: Src/wptKeyEditDlgs.cpp:685 Src/wptKeyEditDlgs.cpp:691
-#: Src/wptKeyEditDlgs.cpp:722 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:680 Src/wptKeyEditDlgs.cpp:686
+#: Src/wptKeyEditDlgs.cpp:717 Src/wptKeyEditDlgs.cpp:817
 msgid "Add Subkey"
 msgstr "Prida podk¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:690
+#: Src/wptKeyEditDlgs.cpp:685
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS používa pevnú dåžku k¾úèa 1024. Ve¾kos zmenená."
 
-#: Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:719
 msgid "Subkey successfully added."
 msgstr "Podk¾úè úspešne pridaný."
 
-#: Src/wptKeyEditDlgs.cpp:752 Src/wptKeyEditDlgs.cpp:821
-#: Src/wptKeyEditDlgs.cpp:902 Src/wptKeyEditDlgs.cpp:934
-#: Src/wptKeyEditDlgs.cpp:1016 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:747 Src/wptKeyEditDlgs.cpp:816
+#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
+#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1355
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1488
 #: Src/wptKeyManagerDlg.cpp:1743
 msgid "There is no secret key available!"
 msgstr "Nie je k dispozícii žiaden tajný k¾úè!"
 
-#: Src/wptKeyEditDlgs.cpp:753 Src/wptKeyEditDlgs.cpp:772
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:767
 msgid "Add user ID"
 msgstr "Prida ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:875
 msgid "Preferred keyserver successfully set."
 msgstr "Preferovaný server s k¾úèmi úspešne nastavený."
 
-#: Src/wptKeyEditDlgs.cpp:969 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
 #: Src/wptKeyPropsDlg.cpp:377
 msgid "Change Ownertrust"
 msgstr "Zmeni úroveò dôvery"
 
-#: Src/wptKeyEditDlgs.cpp:972 Src/wptKeyManager.cpp:238
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyManager.cpp:230
 msgid "Key status changed."
 msgstr "Stav k¾úèa zmenený."
 
-#: Src/wptKeyEditDlgs.cpp:1022
+#: Src/wptKeyEditDlgs.cpp:1017
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
@@ -2240,15 +2230,15 @@
 "Heslo sa nedá zmeni lebo k¾úè\n"
 "je chránený šifrovacím algoritmom IDEA."
 
-#: Src/wptKeyEditDlgs.cpp:1029
+#: Src/wptKeyEditDlgs.cpp:1024
 msgid "Current (old) Passphrase"
 msgstr "Aktuálne (staré) heslo"
 
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1029
 msgid "New Passphrase"
 msgstr "Nové heslo"
 
-#: Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1037
 msgid ""
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, continue?"
@@ -2256,32 +2246,32 @@
 "Ste si istí, že skutoène nechcete heslo?\n"
 "Toto je pravdepodobne zlý nápad, aj tak pokraèova?"
 
-#: Src/wptKeyEditDlgs.cpp:1058
+#: Src/wptKeyEditDlgs.cpp:1053
 msgid "Change Password"
 msgstr "Zmeni &heslo"
 
-#: Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1055
 msgid "Passphrase successfully changed."
 msgstr "Heslo úspešne zmenené."
 
-#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
 msgid "Description"
 msgstr "Popis"
 
-#: Src/wptKeyEditDlgs.cpp:1079
+#: Src/wptKeyEditDlgs.cpp:1074
 msgid "Expires"
 msgstr "Vyprší"
 
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeylist.cpp:584 Src/wptKeylist.cpp:593
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:570 Src/wptKeylist.cpp:579
 #: Src/wptKeyManagerDlg.cpp:915
 msgid "Validity"
 msgstr "Platnos"
 
-#: Src/wptKeyEditDlgs.cpp:1162
+#: Src/wptKeyEditDlgs.cpp:1157
 msgid "Email"
 msgstr "E-mail"
 
-#: Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1245
 msgid ""
 "ADDUID      add a user ID\r\n"
 "ADDPHOTO    add a photo ID\r\n"
@@ -2325,15 +2315,15 @@
 "CLEAN       odstráni z k¾úèa nepoužite¾né podpisy\r\n"
 "MINIMIZE    odstráni z k¾úèa všetky podpisy\r\n"
 
-#: Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1266
 msgid "Key Edit Help"
 msgstr "Pomocník k editácii k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1310
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1305
 msgid "Primary key can not be deleted!"
 msgstr "Primárny k¾úè nemôže by zmazaný!"
 
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1313
 msgid ""
 "Anything encrypted to the selected subkey cannot be\n"
 "decrypted any longer."
@@ -2341,7 +2331,7 @@
 "Èoko¾vek zašifrované pre vybraný podk¾úè nemôže by\n"
 "už viac dešifrované."
 
-#: Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid ""
 "Anything signed by the selected subkey cannot be\n"
 "verified any longer."
@@ -2349,7 +2339,7 @@
 "Èoko¾vek podpísané vybraným podk¾úèom už viac\n"
 "nemožno overi."
 
-#: Src/wptKeyEditDlgs.cpp:1327
+#: Src/wptKeyEditDlgs.cpp:1322
 #, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -2364,15 +2354,15 @@
 "\n"
 "Skutoène chcete odstráni tento podk¾úè?"
 
-#: Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1331
 msgid "Delete Subkey"
 msgstr "Zmaza podk¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:1340
+#: Src/wptKeyEditDlgs.cpp:1335
 msgid "Subkey successfully deleted."
 msgstr "Podk¾úè úspešne zmazaný."
 
-#: Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1368
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -2382,19 +2372,19 @@
 "\n"
 "Chcete zmeni dátum skonèenia platnosti?"
 
-#: Src/wptKeyEditDlgs.cpp:1382 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1380
 msgid "Key Expiration Date"
 msgstr "Dátum expirácie k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyEditDlgs.cpp:1401
 msgid "Expire Subkey"
 msgstr "Expirova podk¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:1411
+#: Src/wptKeyEditDlgs.cpp:1406
 msgid "Subkey expire date successfully set."
 msgstr "Expiraèný dátum podk¾úèa úspešne nastavený."
 
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1437
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -2406,31 +2396,31 @@
 "\n"
 "Tento príkaz je dostupný iba na odvolanie jednotlivých podk¾úèov"
 
-#: Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1446
 msgid "Key already revoked."
 msgstr "K¾úè už bol odvolaný."
 
-#: Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1463
 msgid "Revoke Subkey"
 msgstr "Odvola podk¾úè"
 
-#: Src/wptKeyEditDlgs.cpp:1472
+#: Src/wptKeyEditDlgs.cpp:1467
 msgid "Subkey successfully revoked."
 msgstr "Podk¾úè úspešne odvolaný."
 
-#: Src/wptKeyEditDlgs.cpp:1494
+#: Src/wptKeyEditDlgs.cpp:1489
 msgid "Revoke user ID"
 msgstr "Odvola ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1494
 msgid "Key has only one user ID."
 msgstr "K¾úè má iba jedno ID používate¾a."
 
-#: Src/wptKeyEditDlgs.cpp:1510
+#: Src/wptKeyEditDlgs.cpp:1505
 msgid "This user ID has been already revoked."
 msgstr "Toto ID používate¾a už bolo odvolané."
 
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1511
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2441,51 +2431,51 @@
 "\n"
 "Skutoène chcete odvola toto ID používate¾a?"
 
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1533
 msgid "Revoke User ID"
 msgstr "Odvola ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:1542
+#: Src/wptKeyEditDlgs.cpp:1537
 msgid "User ID successfully revoked"
 msgstr "ID používate¾a úspešne odvolané"
 
-#: Src/wptKeyEditDlgs.cpp:1589
+#: Src/wptKeyEditDlgs.cpp:1584
 msgid "Set user ID preferences"
 msgstr "Nastavi predvo¾by ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1587
 msgid "User ID preferences successfully updated"
 msgstr "Predvo¾by ID používate¾a úspešne aktualizované"
 
-#: Src/wptKeyEditDlgs.cpp:1637
+#: Src/wptKeyEditDlgs.cpp:1632
 msgid "Primary"
 msgstr "Primárny"
 
-#: Src/wptKeyEditDlgs.cpp:1640
+#: Src/wptKeyEditDlgs.cpp:1635
 msgid "User ID successfully flagged"
 msgstr "ID používate¾a úspešne oznaèené"
 
-#: Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1729
 msgid "No preferences available."
 msgstr "Nie sú k dispozícii žiadne predvo¾by."
 
-#: Src/wptKeyEditDlgs.cpp:1738
+#: Src/wptKeyEditDlgs.cpp:1733
 msgid "MDC feature"
 msgstr "Vlastnos MDC"
 
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1735
 msgid "user ID:"
 msgstr "ID používate¾a:"
 
-#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr "Predvo¾by k¾úèa"
 
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1801
 msgid "Primary user ID can not be deleted!"
 msgstr "Primárne ID používate¾a nemôže by zmazané!"
 
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1812
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2500,27 +2490,27 @@
 "\n"
 "Skutoène chcete zmaza toto ID používate¾a?"
 
-#: Src/wptKeyEditDlgs.cpp:1834
+#: Src/wptKeyEditDlgs.cpp:1829
 msgid "Delete User ID"
 msgstr "Vymaza ID používate¾a"
 
-#: Src/wptKeyEditDlgs.cpp:1838
+#: Src/wptKeyEditDlgs.cpp:1833
 msgid "User ID successfully deleted"
 msgstr "ID používate¾a úspešne zmazané"
 
-#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1924 Src/wptKeyEditDlgs.cpp:1942
 msgid "Finished to compact key."
 msgstr "Ukonèená minimalizácia k¾úèa."
 
-#: Src/wptKeyEditDlgs.cpp:1989
+#: Src/wptKeyEditDlgs.cpp:1984
 msgid "Do you really want to make this sig exportable?"
 msgstr "Skutoène chcete aby bol tento podpis exportovate¾ný?"
 
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyEditDlgs.cpp:2015 Src/wptKeysignDlg.cpp:385
 msgid "Key successfully signed."
 msgstr "K¾úè úspešne podpísaný."
 
-#: Src/wptKeyEditDlgs.cpp:2083
+#: Src/wptKeyEditDlgs.cpp:2078
 #, c-format
 msgid ""
 "Your keys is listed as a designated revoker for the key\n"
@@ -2537,29 +2527,29 @@
 "Ste si istí, že chcete vytvori odvolávací certifikát\n"
 "ktorý vám umožní odvola k¾úè vypísaný vyššie?"
 
-#: Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyEditDlgs.cpp:2116
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr ""
 "Schopnosti: C = Certifikova, S = Podpísa, E = Šifrova, A = Autentifikova"
 
-#: Src/wptKeyEditDlgs.cpp:2176
+#: Src/wptKeyEditDlgs.cpp:2171
 msgid "Command>"
 msgstr "Príkaz>"
 
-#: Src/wptKeyEditDlgs.cpp:2177 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyEditDlgs.cpp:2172 Src/wptKeyserverDlg.cpp:691
 #: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Zatvori"
 
-#: Src/wptKeyEditDlgs.cpp:2179
+#: Src/wptKeyEditDlgs.cpp:2174
 msgid "&Revoke..."
 msgstr "&Odvola..."
 
-#: Src/wptKeyEditDlgs.cpp:2223
+#: Src/wptKeyEditDlgs.cpp:2218
 msgid "Please select a command."
 msgstr "Prosím vyberte príkaz."
 
-#: Src/wptKeyEditDlgs.cpp:2227
+#: Src/wptKeyEditDlgs.cpp:2222
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "Tento príkaz nemožno používa s k¾úèmi PGP2 (v3).\n"
 
@@ -2622,8 +2612,8 @@
 #: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
 #: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
 #: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
-#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:147
-#: Src/wptPassphraseDlg.cpp:157
+#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:138
+#: Src/wptPassphraseDlg.cpp:148
 msgid "Key Generation"
 msgstr "Generovanie k¾úèa"
 
@@ -2832,60 +2822,60 @@
 msgid "No keys updated."
 msgstr "Neboli aktualizované žiadne k¾úèe."
 
-#: Src/wptKeylist.cpp:261
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair"
 msgstr "Pár k¾úèov"
 
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:245
 msgid "Key Pair (Card)"
 msgstr "Pár k¾úèov (Karta)"
 
-#: Src/wptKeylist.cpp:264
+#: Src/wptKeylist.cpp:246
 msgid "Public Key"
 msgstr "Verejný k¾úè"
 
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:366
 msgid "None"
 msgstr "Žiadne"
 
-#: Src/wptKeylist.cpp:388
+#: Src/wptKeylist.cpp:370
 msgid "Marginal"
 msgstr "Okrajovo"
 
-#: Src/wptKeylist.cpp:390
+#: Src/wptKeylist.cpp:372
 msgid "Full"
 msgstr "Plne"
 
-#: Src/wptKeylist.cpp:429 Src/wptKeylist.cpp:455 Src/wptKeyPropsDlg.cpp:154
+#: Src/wptKeylist.cpp:411 Src/wptKeylist.cpp:437 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: Src/wptKeylist.cpp:465
+#: Src/wptKeylist.cpp:452
 msgid "key pair"
 msgstr "pár k¾úèov"
 
-#: Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeylist.cpp:569 Src/wptKeylist.cpp:578 Src/wptKeyManagerDlg.cpp:914
 #: Src/wptKeyManagerDlg.cpp:1005
 msgid "Cipher"
 msgstr "Šifra"
 
-#: Src/wptKeylist.cpp:594 Src/wptKeyManagerDlg.cpp:916
-#: Src/wptVerifyList.cpp:171
+#: Src/wptKeylist.cpp:580 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:141
 msgid "Trust"
 msgstr "Dôvera"
 
-#: Src/wptKeylist.cpp:782 Src/wptPassphraseCB.cpp:126
+#: Src/wptKeylist.cpp:768 Src/wptPassphraseCB.cpp:120
 msgid "Invalid User ID"
 msgstr "Neplatné ID používate¾a"
 
-#: Src/wptKeylist.cpp:1051
-#, c-format
+#: Src/wptKeylist.cpp:1031
+#, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
 "named in the user ID.  If you *really* know what you are\n"
 "doing, you may answer the next question with yes\n"
 "\n"
-"Use \"%s\" anyway?"
+"Still proceed?"
 msgstr ""
 "NIE je isté, že k¾úè patrí osobe\n"
 "oznaèenej v používate¾skom ID. Ak *skutoène* viete, èo\n"
@@ -2893,11 +2883,11 @@
 "\n"
 "Použi \"%s\" aj tak?"
 
-#: Src/wptKeylist.cpp:1059 Src/wptKeylist.cpp:1122
+#: Src/wptKeylist.cpp:1100
 msgid "Recipients"
 msgstr "Prijímatelia"
 
-#: Src/wptKeylist.cpp:1123
+#: Src/wptKeylist.cpp:1101
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -2906,11 +2896,11 @@
 "IDk¾úèa %s.\n"
 "Skutoène chcete exportova odvolaný k¾úè?"
 
-#: Src/wptKeylist.cpp:1225
+#: Src/wptKeylist.cpp:1198
 msgid "Secret Key List"
 msgstr "Zoznam tajných k¾úèov"
 
-#: Src/wptKeyManager.cpp:185
+#: Src/wptKeyManager.cpp:177
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -2918,7 +2908,7 @@
 "Platnos tohto k¾úèa sa skonèila!\n"
 "Kontrola k¾úèa zlyhala."
 
-#: Src/wptKeyManager.cpp:190
+#: Src/wptKeyManager.cpp:182
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -2926,25 +2916,25 @@
 "Vlastník odvolal platnos tohto k¾úèa\n"
 "Kontrola k¾úèa zlyhala."
 
-#: Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:322
 msgid "Only one secret key can be exported."
 msgstr "Iba jeden tajný k¾úè môže by exportovaný."
 
-#: Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:333
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "Tajný k¾úè úspešne uložený do '%s'."
 
-#: Src/wptKeyManager.cpp:375
+#: Src/wptKeyManager.cpp:367
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "K¾úè(e) úspešne uložený(é) v '%s'."
 
-#: Src/wptKeyManager.cpp:431
+#: Src/wptKeyManager.cpp:423
 msgid "No valid OpenPGP keys found."
 msgstr "Nenájdené žiadne platné k¾úèe OpenPGP."
 
-#: Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:428
 msgid ""
 "The key you want to import is dash escaped.\n"
 "Do you want to extract the key?"
@@ -2952,11 +2942,11 @@
 "K¾úè, ktorý chcete importova je \"dash escaped\".\n"
 "Chcete extrahova ten k¾úè?"
 
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:434
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "Nedajú sa importova \"dash escaped\" k¾úèe OpenPGP."
 
-#: Src/wptKeyManager.cpp:467 Src/wptKeyManager.cpp:584
+#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:576
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -2964,37 +2954,37 @@
 "Bol detekovaný k¾úè bez podpisu sebou samým!\n"
 "(Tento k¾úè NIE je použite¾ný pre šifrovanie, atï)\n"
 
-#: Src/wptKeyManager.cpp:496 Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:488 Src/wptKeyManager.cpp:495
 msgid "Key Import HTTP"
 msgstr "Import k¾úèa HTTP"
 
-#: Src/wptKeyManager.cpp:496
+#: Src/wptKeyManager.cpp:488
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "Neplatné HTTP URL: %s"
 
-#: Src/wptKeyManager.cpp:517
+#: Src/wptKeyManager.cpp:509
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "Nepodarilo sa získa k¾úè z URL: %s"
 
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "Vybra názov pre súbor k¾úèa"
 
-#: Src/wptKeyManager.cpp:558
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "Import súboru"
 
-#: Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:687
 msgid "Do you really want to confirm each key?"
 msgstr "Skutoène chcete potvrdi každý k¾úè?"
 
-#: Src/wptKeyManager.cpp:696
+#: Src/wptKeyManager.cpp:688
 msgid "Delete Confirmation"
 msgstr "Vymaza potvrdenie"
 
-#: Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:711
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -3005,7 +2995,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:728
+#: Src/wptKeyManager.cpp:720
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -3022,7 +3012,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:735
+#: Src/wptKeyManager.cpp:727
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -3032,49 +3022,49 @@
 "Iba náhrada za verejný k¾úè a tajný k¾úè \n"
 "bude zmazaná.\n"
 
-#: Src/wptKeyManager.cpp:797
+#: Src/wptKeyManager.cpp:789
 #, c-format
 msgid "Do you really want to send '0x%s' to keyserver %s?"
 msgstr "Skutoène chcete posla '0x%s' na server s k¾úèmi %s?"
 
-#: Src/wptKeyManager.cpp:818
+#: Src/wptKeyManager.cpp:810
 msgid "Please only select one key."
 msgstr "Prosím vyberte iba jeden k¾úè."
 
-#: Src/wptKeyManager.cpp:897
+#: Src/wptKeyManager.cpp:889
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "Skutoène chcete obnovi všetky k¾úèe v súbore s k¾úèmi?"
 
-#: Src/wptKeyManager.cpp:902
+#: Src/wptKeyManager.cpp:894
 msgid "Could not connect to keyserver, abort procedure."
 msgstr "Nedá sa spoji so serverom s k¾úèmi, zruši proces."
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "H¾ada"
 
-#: Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "Vyh¾ada:"
 
-#: Src/wptKeyManager.cpp:988
-#, c-format
-msgid "String pattern \"%s\" not found."
+#: Src/wptKeyManager.cpp:982
+#, fuzzy
+msgid "String pattern not found:"
 msgstr "Vzor \"%s\" nenájdený."
 
-#: Src/wptKeyManager.cpp:1054 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:85
 msgid "0. No reason specified"
 msgstr "0. Neuvedený žiaden dôvod"
 
-#: Src/wptKeyManager.cpp:1055 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:86
 msgid "1. Key has been compromised"
 msgstr "1. K¾úè bol kompromitovaný"
 
-#: Src/wptKeyManager.cpp:1056 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:87
 msgid "2. Key is superseded"
 msgstr "2. K¾úè je zastaralý"
 
-#: Src/wptKeyManager.cpp:1057 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:88
 msgid "3. Key is no longer used"
 msgstr "3. K¾úè sa už viac nepoužíva"
 
@@ -3353,10 +3343,10 @@
 msgid "Could not access public keyring"
 msgstr "Súbor s verejnými k¾úèmi nie je prístupný"
 
-#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:351
-#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
-#: Src/wptKeysignDlg.cpp:455 Src/wptKeysignDlg.cpp:461
-#: Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:378 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:385 Src/wptKeysignDlg.cpp:407
+#: Src/wptKeysignDlg.cpp:421
 msgid "Key Signing"
 msgstr "Podpisovanie k¾úèa"
 
@@ -3393,11 +3383,11 @@
 msgid "Smart Card support is not available."
 msgstr "Podpora pre Smart Card nie je k dispozícii."
 
-#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:680
+#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:682
 msgid "Keyserver Access"
 msgstr "Prístup k serveru s k¾úèmi"
 
-#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:574
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:575
 #: Src/wptPreferencesDlg.cpp:125
 msgid "WinPT Preferences"
 msgstr "Predvo¾by WinPT"
@@ -3448,8 +3438,9 @@
 msgid "I trust ultimately (implicit)"
 msgstr "Absolútne dôverujem (implicitné)"
 
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
-#: Src/wptVerifyList.cpp:311
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:215
+#: Src/wptVerifyList.cpp:218 Src/wptVerifyList.cpp:277
+#: Src/wptVerifyList.cpp:279 Src/wptVerifyList.cpp:285
 msgid "Unknown"
 msgstr "Neznáme"
 
@@ -3579,39 +3570,39 @@
 msgid "Do you want to retrieve %s via the default keyserver?"
 msgstr "Chcete získa %s cez predvolený server s k¾úèmi?"
 
-#: Src/wptKeyserver.cpp:443
+#: Src/wptKeyserver.cpp:444
 msgid "Network unreachable"
 msgstr "Sie sa nedá kontaktova"
 
-#: Src/wptKeyserver.cpp:446
+#: Src/wptKeyserver.cpp:447
 msgid "Host unreachable"
 msgstr "Hostite¾ sa nedá kontaktova"
 
-#: Src/wptKeyserver.cpp:449
+#: Src/wptKeyserver.cpp:450
 msgid "Could not resolve host name"
 msgstr "Nepodarilo sa zisti názov hostite¾a"
 
-#: Src/wptKeyserver.cpp:452
+#: Src/wptKeyserver.cpp:453
 msgid "Connection refused"
 msgstr "Spojenie odmietnuté"
 
-#: Src/wptKeyserver.cpp:456
+#: Src/wptKeyserver.cpp:457
 msgid "Connection timeout"
 msgstr "Èas pre spojenie vypršal"
 
-#: Src/wptKeyserver.cpp:460
+#: Src/wptKeyserver.cpp:461
 msgid "Connection resetted by peer"
 msgstr "Spojenie obnovené druhou stranou"
 
-#: Src/wptKeyserver.cpp:463
+#: Src/wptKeyserver.cpp:464
 msgid "Socket has been shutdown"
 msgstr "Socket bol zatvorený"
 
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:642
 msgid "Could not save keyserver.conf file"
 msgstr "Nepodarilo sa uloži súbor keyserver.conf"
 
-#: Src/wptKeyserver.cpp:727
+#: Src/wptKeyserver.cpp:728
 msgid ""
 "Invalid proxy configuration. You need to set a user and a password to use "
 "proxy authentication!"
@@ -3619,11 +3610,11 @@
 "Neplatná konfigurácia proxy. Potrebujete nastavi používate¾a a heslo aby "
 "ste mohli používa autentifikáciu proxy!"
 
-#: Src/wptKeyserver.cpp:730
+#: Src/wptKeyserver.cpp:731
 msgid "Proxy Error"
 msgstr "Chyba proxy"
 
-#: Src/wptKeyserver.cpp:755
+#: Src/wptKeyserver.cpp:756
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3631,15 +3622,15 @@
 "Všetky položky tohto súboru musia ma platný prefix.\n"
 "V súèasnosti sú podporované HKP/HTTP, LDAP a FINGER.\n"
 
-#: Src/wptKeyserver.cpp:757
+#: Src/wptKeyserver.cpp:758
 msgid "Keyserver Error"
 msgstr "Chyba servera s k¾úèmi"
 
-#: Src/wptKeyserver.cpp:776
+#: Src/wptKeyserver.cpp:777
 msgid "The keyserver limit is exceeded"
 msgstr "Limit servera s k¾úèmi je prekroèený"
 
-#: Src/wptKeyserver.cpp:777
+#: Src/wptKeyserver.cpp:778
 msgid "Keyserver Warning"
 msgstr "Varovanie servera s k¾úèmi"
 
@@ -3687,7 +3678,7 @@
 msgid "This is not a valid OpenPGP key."
 msgstr "Toto nie je platný k¾úè OpenPGP."
 
-#: Src/wptKeyserverDlg.cpp:277
+#: Src/wptKeyserverDlg.cpp:280
 #, c-format
 msgid ""
 "Signature made %s using %s key ID 0x%s\n"
@@ -3700,100 +3691,100 @@
 "\n"
 "Chcete skúsi získa k¾úè zo servera s k¾úèmi?"
 
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:393
 msgid "Please select one of the servers."
 msgstr "Prosím vyberte jeden zo serverov."
 
-#: Src/wptKeyserverDlg.cpp:397
+#: Src/wptKeyserverDlg.cpp:399
 msgid "Only HKP keyserver can be used."
 msgstr "Môže by použitý iba HKP server s k¾úèmi."
 
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:416
 msgid "DNS Name"
 msgstr "Meno DNS"
 
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:417
 msgid "Port"
 msgstr "Port"
 
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:501
 msgid "No space for new keyserver entry"
 msgstr "Nie je miesto pre novú položku servera s k¾úèmi"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:522
 msgid "HKP Keyserver"
 msgstr "HKP server s k¾úèmi"
 
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:523
 msgid "LDAP Keyserver"
 msgstr "Server s k¾úèmi LDAP"
 
-#: Src/wptKeyserverDlg.cpp:522
+#: Src/wptKeyserverDlg.cpp:524
 msgid "Finger Keyserver"
 msgstr "Finger server s k¾úèmi"
 
-#: Src/wptKeyserverDlg.cpp:547 Src/wptKeyserverDlg.cpp:840
-#: Src/wptKeyserverDlg.cpp:860
+#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverDlg.cpp:842
+#: Src/wptKeyserverDlg.cpp:862
 msgid "Edit Keyserver"
 msgstr "Editova server s k¾úèmi"
 
-#: Src/wptKeyserverDlg.cpp:548 Src/wptKeyserverDlg.cpp:713
+#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:715
 msgid "&Add"
 msgstr "Prid&a"
 
-#: Src/wptKeyserverDlg.cpp:550
+#: Src/wptKeyserverDlg.cpp:552
 msgid "Type:"
 msgstr "Typ:"
 
-#: Src/wptKeyserverDlg.cpp:551
+#: Src/wptKeyserverDlg.cpp:553
 msgid "Port:"
 msgstr "Port:"
 
-#: Src/wptKeyserverDlg.cpp:552
+#: Src/wptKeyserverDlg.cpp:554
 msgid "Host name:"
 msgstr "Meno hostite¾a:"
 
-#: Src/wptKeyserverDlg.cpp:560
+#: Src/wptKeyserverDlg.cpp:562
 msgid "Please enter a host name"
 msgstr "Prosím zadajte názov hostite¾a"
 
-#: Src/wptKeyserverDlg.cpp:565
+#: Src/wptKeyserverDlg.cpp:567
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "Neplatný port, platné èísla sú < 65535"
 
-#: Src/wptKeyserverDlg.cpp:681 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "P&rija"
 
-#: Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:685
 msgid "Send key (default is receiving)"
 msgstr "Posla k¾úè (predvolené je prijímanie)"
 
-#: Src/wptKeyserverDlg.cpp:685
+#: Src/wptKeyserverDlg.cpp:687
 msgid "Key ID or email address you want to search for"
 msgstr "ID k¾úèa alebo e-mailová adresa ktoré h¾adáte"
 
-#: Src/wptKeyserverDlg.cpp:686
+#: Src/wptKeyserverDlg.cpp:688
 msgid "&Search"
 msgstr "&H¾ada"
 
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:689
 msgid "C&hange proxy"
 msgstr "&Zmeni proxy"
 
-#: Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:690
 msgid "Set &default"
 msgstr "&Predvolené"
 
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
 msgid "&Remove"
 msgstr "Odst&ráni"
 
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:717
 msgid "&Edit"
 msgstr "&Editova"
 
-#: Src/wptKeyserverDlg.cpp:750 Src/wptProxySettingsDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:752 Src/wptProxySettingsDlg.cpp:105
 #: Src/wptProxySettingsDlg.cpp:115 Src/wptProxySettingsDlg.cpp:120
 #: Src/wptProxySettingsDlg.cpp:127 Src/wptProxySettingsDlg.cpp:132
 #: Src/wptProxySettingsDlg.cpp:137 Src/wptProxySettingsDlg.cpp:198
@@ -3801,23 +3792,23 @@
 msgid "Proxy Settings"
 msgstr "Nastavenia proxy"
 
-#: Src/wptKeyserverDlg.cpp:758 Src/wptKeyserverDlg.cpp:799
+#: Src/wptKeyserverDlg.cpp:760 Src/wptKeyserverDlg.cpp:801
 msgid "Please enter the search pattern."
 msgstr "Prosím zadajte vzor pre h¾adanie."
 
-#: Src/wptKeyserverDlg.cpp:783
+#: Src/wptKeyserverDlg.cpp:785
 msgid "Please select one of the keyservers."
 msgstr "Prosím vyberte jeden zo serverov s k¾úèmi."
 
-#: Src/wptKeyserverDlg.cpp:804
+#: Src/wptKeyserverDlg.cpp:806
 msgid "Only keyids are allowed."
 msgstr "Sú povolené iba id k¾úèov."
 
-#: Src/wptKeyserverDlg.cpp:810
+#: Src/wptKeyserverDlg.cpp:812
 msgid "Only enter the name of the user."
 msgstr "Iba zadajte meno používate¾a."
 
-#: Src/wptKeyserverDlg.cpp:816
+#: Src/wptKeyserverDlg.cpp:818
 msgid "Only email addresses or keyids are allowed."
 msgstr "Sú povolené iba e-mailové adresy alebo ID k¾úèov."
 
@@ -3944,21 +3935,21 @@
 msgid "&Receive Key"
 msgstr "P&rija k¾úè"
 
-#: Src/wptKeysignDlg.cpp:78
+#: Src/wptKeysignDlg.cpp:75
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr "%d-bitový %s k¾úè, ID 0x%s"
 
-#: Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:174
 #, c-format
 msgid "Photo of %s"
 msgstr "Foto %s"
 
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
+#: Src/wptKeysignDlg.cpp:216 Src/wptKeysignDlg.cpp:333
 msgid "Choose Signature Class"
 msgstr "Vybra triedu podpisu"
 
-#: Src/wptKeysignDlg.cpp:224
+#: Src/wptKeysignDlg.cpp:218
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -3966,27 +3957,27 @@
 "Ako starostlivo ste overili, že k¾úè ktorý chcete práve podpísa skutoène "
 "patrí danej osobe? Ak neviete ako odpoveda, použijte \"0\"."
 
-#: Src/wptKeysignDlg.cpp:226
+#: Src/wptKeysignDlg.cpp:220
 msgid "(0) I will not answer (default)"
 msgstr "(0) Nebudem odpoveda (predvolené)"
 
-#: Src/wptKeysignDlg.cpp:228
+#: Src/wptKeysignDlg.cpp:222
 msgid "(1) I have not checked at all."
 msgstr "(1) Vôbec som nekotroloval."
 
-#: Src/wptKeysignDlg.cpp:230
+#: Src/wptKeysignDlg.cpp:224
 msgid "(2) I have done causal checking."
 msgstr "(2) Zbežne som kontroloval."
 
-#: Src/wptKeysignDlg.cpp:232
+#: Src/wptKeysignDlg.cpp:226
 msgid "(3) I have done very careful checking."
 msgstr "(3) Ve¾mi pozorne som skontroloval."
 
-#: Src/wptKeysignDlg.cpp:271
+#: Src/wptKeysignDlg.cpp:265
 msgid "never"
 msgstr "nikdy"
 
-#: Src/wptKeysignDlg.cpp:304
+#: Src/wptKeysignDlg.cpp:297
 #, c-format
 msgid ""
 "pub %d/0x%s   created: %s    expires: %s\n"
@@ -3999,7 +3990,7 @@
 "Odtlaèok primárneho k¾úèa: %s\n"
 "\n"
 
-#: Src/wptKeysignDlg.cpp:321
+#: Src/wptKeysignDlg.cpp:312
 msgid ""
 "\n"
 "\n"
@@ -4010,43 +4001,42 @@
 "Skutoène ste si istí, že chcete podpísa tento k¾úè VAŠÍM k¾úèom?\n"
 
 #: Src/wptKeysignDlg.cpp:351
+msgid "You cannot select today as the expiration date."
+msgstr "Nemôžete vybra dnešok ako dátum expirácie."
+
+#: Src/wptKeysignDlg.cpp:382
+msgid "This key is already signed by your key"
+msgstr "Tento k¾úè je už podpísaný vaším k¾úèom"
+
+#: Src/wptKeysignDlg.cpp:407
 msgid "No valid secret key found."
 msgstr "Nenájdený žiaden platný tajný k¾úè."
 
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:413
 msgid "Sign local only (non exportable signature)"
 msgstr "Podpísa iba lokálne (neexportovate¾ný podpis)"
 
-#: Src/wptKeysignDlg.cpp:358
+#: Src/wptKeysignDlg.cpp:414
 msgid "Signature expires on"
 msgstr "Podpis vyprší"
 
-#: Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:415
 msgid "Sign non-revocably"
 msgstr "Podpísa neodvolate¾ne"
 
-#: Src/wptKeysignDlg.cpp:360
+#: Src/wptKeysignDlg.cpp:416
 msgid "&Ask for certification level"
 msgstr "Požiad&a o úroveò certifikácie"
 
-#: Src/wptKeysignDlg.cpp:363
+#: Src/wptKeysignDlg.cpp:419
 msgid "&Show photo"
 msgstr "Ukáza &foto"
 
-#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:98
-#: Src/wptPassphraseCB.cpp:104 Src/wptPassphraseDlg.cpp:103
-#: Src/wptPINDlg.cpp:53
+#: Src/wptKeysignDlg.cpp:420 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:98 Src/wptPassphraseDlg.cpp:94 Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "&Maskova znaky"
 
-#: Src/wptKeysignDlg.cpp:425
-msgid "You cannot select today as the expiration date."
-msgstr "Nemôžete vybra dnešok ako dátum expirácie."
-
-#: Src/wptKeysignDlg.cpp:460
-msgid "This key is already signed by your key"
-msgstr "Tento k¾úè je už podpísaný vaším k¾úèom"
-
 #: Src/wptKeyTrustPathDlg.cpp:136
 msgid "Trustlist"
 msgstr "Zoznam dôvery"
@@ -4079,31 +4069,31 @@
 msgid "Could not set current window mode hooks."
 msgstr "Nepodarilo sa nastavi \"current window mode hooks\"."
 
-#: Src/wptMainProc.cpp:397
+#: Src/wptMainProc.cpp:398
 msgid "About..."
 msgstr "O programe..."
 
-#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
+#: Src/wptMainProc.cpp:404 Src/wptMainProc.cpp:408
 msgid "Decrypt/Verify"
 msgstr "Dešifrova/Overi"
 
-#: Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:419
 msgid "Current Window"
 msgstr "Aktuálne okno"
 
-#: Src/wptMainProc.cpp:476
+#: Src/wptMainProc.cpp:477
 msgid "Remove all passphrases from cache?"
 msgstr "Odstráni všetky heslá z pamäte?"
 
-#: Src/wptMainProc.cpp:477 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
+#: Src/wptMainProc.cpp:478 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
 msgid "WinPT"
 msgstr "WinPT"
 
-#: Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:488
 msgid "Could not access public keyring, exit WinPT?"
 msgstr "Súbor s verejnými k¾úèmi nie je prístupný, ukonèi WinPT?"
 
-#: Src/wptMainProc.cpp:520
+#: Src/wptMainProc.cpp:521
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4170,33 +4160,34 @@
 msgid "Ownertrust successfully imported."
 msgstr "Databáza dôvery úspešne importovaná."
 
-#: Src/wptPassphraseCB.cpp:100
+#: Src/wptPassphraseCB.cpp:94
 msgid "Encrypted with the following public key(s)"
 msgstr "Zašifrované s nasledujúcimi verejnými k¾úèmi"
 
-#: Src/wptPassphraseCB.cpp:144
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr "Neznáme ID k¾úèa (%s, 0x%s)"
+#: Src/wptPassphraseCB.cpp:127
+#, fuzzy
+msgid "Unknown key ID"
+msgstr "Neznáma klávesová skratka"
 
-#: Src/wptPassphraseCB.cpp:156
+#: Src/wptPassphraseCB.cpp:140
 msgid "Bad passphrase; Enter passphrase again"
 msgstr "Zlé heslo; Zadajte heslo znova"
 
-#: Src/wptPassphraseCB.cpp:157
+#: Src/wptPassphraseCB.cpp:141
 msgid "Please enter your passphrase"
 msgstr "Prosím zadajte svoje heslo"
 
-#: Src/wptPassphraseCB.cpp:161
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
-msgstr ""
-"Symetrické šifrovanie.\n"
-"%s šifrované dáta."
+#: Src/wptPassphraseCB.cpp:147
+#, fuzzy
+msgid "Symmetric encryption."
+msgstr "Symetrické šifrovanie"
 
-#: Src/wptPassphraseCB.cpp:300
+#: Src/wptPassphraseCB.cpp:149
+#, fuzzy
+msgid "encrypted data."
+msgstr "Zašifrované dáta GPG"
+
+#: Src/wptPassphraseCB.cpp:281
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4207,7 +4198,7 @@
 "používate¾a: \"%s\"\n"
 "%s k¾úè, ID 0x%s (hlavné ID k¾úèa 0x%s)\n"
 
-#: Src/wptPassphraseCB.cpp:306
+#: Src/wptPassphraseCB.cpp:287
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4218,7 +4209,7 @@
 "používate¾a: \"%s\"\n"
 "%s k¾úè, ID 0x%s\n"
 
-#: Src/wptPassphraseCB.cpp:395
+#: Src/wptPassphraseCB.cpp:376
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -4227,23 +4218,23 @@
 "Prosím zadajte PIN pre odomknutie vášho tajného k¾úèa karty\n"
 "Karta: %s"
 
-#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
+#: Src/wptPassphraseDlg.cpp:82 Src/wptPassphraseDlg.cpp:128
 msgid "Passphrase Dialog"
 msgstr "Dialóg hesla"
 
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:87
 msgid "Repeat Passphrase"
 msgstr "Zopakova heslo"
 
-#: Src/wptPassphraseDlg.cpp:98
+#: Src/wptPassphraseDlg.cpp:89
 msgid "Enter Passphrase"
 msgstr "Zadajte heslo"
 
-#: Src/wptPassphraseDlg.cpp:136
+#: Src/wptPassphraseDlg.cpp:127
 msgid "Please enter a passphrase."
 msgstr "Prosím zadajte heslo."
 
-#: Src/wptPassphraseDlg.cpp:144
+#: Src/wptPassphraseDlg.cpp:135
 msgid ""
 "Your passphrase should be at least 8 characters long\n"
 "and should contain non-alphabetic characters.\n"
@@ -4255,7 +4246,7 @@
 "\n"
 "Pokraèova?"
 
-#: Src/wptPassphraseDlg.cpp:154
+#: Src/wptPassphraseDlg.cpp:145
 msgid ""
 "The passphrase contains 8-bit characters.\n"
 "It is not suggested to use charset specific characters.\n"
@@ -4515,12 +4506,12 @@
 msgid "Text Input from File"
 msgstr "Textový vstup zo súboru"
 
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:79
 #, c-format
 msgid "PKA: Verified signer's address is '%s'"
 msgstr "PKA: Overená adresa podpisovate¾a je '%s'"
 
-#: Src/wptVerifyList.cpp:139
+#: Src/wptVerifyList.cpp:109
 msgid ""
 "WARNING: This key is not certified with a trusted signature!\r\n"
 "                   There is no indication that the signature belongs to the "
@@ -4529,10 +4520,29 @@
 "VAROVANIE Tento k¾úè nie je certifikovaný dôveryhodným podpisom!\r\n"
 "                   Niè nenasvedèuje tomu, že k¾úè patrí vlastníkovi.\r\n"
 
-#: Src/wptVerifyList.cpp:144
+#: Src/wptVerifyList.cpp:114
 msgid "The signature is expired!"
 msgstr "Podpis vypršal!"
 
-#: Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:140
 msgid "Signed"
 msgstr "Podpísané"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serial-No: %s\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Meno: %s %s\n"
+#~ "Sériové èíslo: %s\n"
+
+#~ msgid "Unknown key ID (%s, 0x%s)"
+#~ msgstr "Neznáme ID k¾úèa (%s, 0x%s)"
+
+#~ msgid ""
+#~ "Symmetric encryption.\n"
+#~ "%s encrypted data."
+#~ msgstr ""
+#~ "Symetrické šifrovanie.\n"
+#~ "%s šifrované dáta."

Modified: trunk/Po/sv.po
===================================================================
--- trunk/Po/sv.po	2007-01-15 22:02:32 UTC (rev 279)
+++ trunk/Po/sv.po	2007-01-15 22:03:31 UTC (rev 280)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: WinPT\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-12-13 01:01+0100\n"
+"POT-Creation-Date: 2007-01-15 22:58+0100\n"
 "PO-Revision-Date: 2006-12-14 22:36+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,125 +15,97 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../Src/WinPT.cpp:75
-msgid "The gpg.conf contains at least one argument which points to a non-existing file."
-msgstr "Filen gpg.conf innehåller åtminstone ett argument som pekar till en icke-existerande fil."
+#: Src/WinPT.cpp:71
+msgid ""
+"The gpg.conf contains at least one argument which points to a non-existing "
+"file."
+msgstr ""
+"Filen gpg.conf innehåller åtminstone ett argument som pekar till en icke-"
+"existerande fil."
 
-#: ../Src/WinPT.cpp:196
+#: Src/WinPT.cpp:192
 msgid "Could not create GPG home directory"
 msgstr "Kunde inte skapa GPG-hemkatalog"
 
-#: ../Src/WinPT.cpp:197
-#: ../Src/WinPT.cpp:298
-#: ../Src/WinPT.cpp:302
-#: ../Src/WinPT.cpp:543
-#: ../Src/WinPT.cpp:552
-#: ../Src/WinPT.cpp:559
-#: ../Src/WinPT.cpp:582
-#: ../Src/WinPT.cpp:592
-#: ../Src/WinPT.cpp:608
-#: ../Src/WinPT.cpp:617
-#: ../Src/WinPT.cpp:621
-#: ../Src/WinPT.cpp:638
-#: ../Src/WinPT.cpp:707
-#: ../Src/WinPT.cpp:720
-#: ../Src/WinPT.cpp:767
-#: ../Src/WinPT.cpp:810
-#: ../Src/WinPT.cpp:828
-#: ../Src/wptCommonDlg.cpp:224
-#: ../Src/wptErrors.cpp:144
-#: ../Src/wptGPG.cpp:929
-#: ../Src/wptGPG.cpp:941
-#: ../Src/wptGPG.cpp:951
-#: ../Src/wptGPG.cpp:962
-#: ../Src/wptMainProc.cpp:346
-#: ../Src/wptMainProc.cpp:519
+#: Src/WinPT.cpp:193 Src/WinPT.cpp:294 Src/WinPT.cpp:298 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:555 Src/WinPT.cpp:578 Src/WinPT.cpp:588
+#: Src/WinPT.cpp:604 Src/WinPT.cpp:613 Src/WinPT.cpp:617 Src/WinPT.cpp:634
+#: Src/WinPT.cpp:703 Src/WinPT.cpp:716 Src/WinPT.cpp:763 Src/WinPT.cpp:806
+#: Src/WinPT.cpp:824 Src/wptCommonDlg.cpp:224 Src/wptErrors.cpp:151
+#: Src/wptGPG.cpp:929 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951 Src/wptGPG.cpp:962
+#: Src/wptMainProc.cpp:346 Src/wptMainProc.cpp:520
 msgid "WinPT Error"
 msgstr "WinPT-fel"
 
-#. Actually this is just a warning but we still continue.
-#: ../Src/WinPT.cpp:233
+#: Src/WinPT.cpp:229
 msgid "No useable secret key found."
 msgstr "Ingen användbar hemlig nyckel hittades."
 
-#: ../Src/WinPT.cpp:234
-#: ../Src/WinPT.cpp:245
-#: ../Src/wptKeyPropsDlg.cpp:370
+#: Src/WinPT.cpp:230 Src/WinPT.cpp:241 Src/wptKeyPropsDlg.cpp:370
 msgid "WinPT Warning"
 msgstr "WinPT-varning"
 
-#: ../Src/WinPT.cpp:244
+#: Src/WinPT.cpp:240
 msgid "Default secret key is unuseable"
 msgstr "Hemlig standardnyckel är oanvändbar"
 
-#: ../Src/WinPT.cpp:297
+#: Src/WinPT.cpp:293
 msgid "Could not read GnuPG version."
 msgstr "Kunde inte läsa av GnuPG-version."
 
-#: ../Src/WinPT.cpp:303
-#, c-format
+#: Src/WinPT.cpp:299
+#, fuzzy, c-format
 msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
+"A newer GPG version is needed.\n"
+"Current GPG version %d.%d.%d, required "
 msgstr ""
 "Tyvärr, du behöver en senare GPG-version.\n"
 "GPG-version %d.%d.%d kräver GPG-version "
 
-#: ../Src/WinPT.cpp:337
+#: Src/WinPT.cpp:333
 msgid "Failed to create WinPT directory"
 msgstr "Misslyckades med att skapa WinPT-katalog"
 
-#: ../Src/WinPT.cpp:338
-#: ../Src/WinPT.cpp:355
-#: ../Src/WinPT.cpp:366
-#: ../Src/wptKeyManagerDlg.cpp:996
-#: ../Src/wptKeyserver.cpp:642
-#: ../Src/wptKeyserverDlg.cpp:71
-#: ../Src/wptKeyserverDlg.cpp:73
-#: ../Src/wptKeyserverDlg.cpp:190
-#: ../Src/wptKeyserverDlg.cpp:198
-#: ../Src/wptKeyserverDlg.cpp:214
-#: ../Src/wptKeyserverDlg.cpp:392
-#: ../Src/wptKeyserverDlg.cpp:398
-#: ../Src/wptKeyserverDlg.cpp:500
-#: ../Src/wptKeyserverDlg.cpp:560
-#: ../Src/wptKeyserverDlg.cpp:565
-#: ../Src/wptKeyserverDlg.cpp:759
-#: ../Src/wptKeyserverDlg.cpp:784
-#: ../Src/wptKeyserverDlg.cpp:800
-#: ../Src/wptKeyserverDlg.cpp:805
-#: ../Src/wptKeyserverDlg.cpp:811
-#: ../Src/wptKeyserverDlg.cpp:817
+#: Src/WinPT.cpp:334 Src/WinPT.cpp:351 Src/WinPT.cpp:362
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:643
+#: Src/wptKeyserverDlg.cpp:71 Src/wptKeyserverDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:394
+#: Src/wptKeyserverDlg.cpp:400 Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:567
+#: Src/wptKeyserverDlg.cpp:761 Src/wptKeyserverDlg.cpp:786
+#: Src/wptKeyserverDlg.cpp:802 Src/wptKeyserverDlg.cpp:807
+#: Src/wptKeyserverDlg.cpp:813 Src/wptKeyserverDlg.cpp:819
 msgid "Keyserver"
 msgstr "Nyckelserver"
 
-#: ../Src/WinPT.cpp:354
+#: Src/WinPT.cpp:350
 msgid "Failed to copy the keyserver.conf"
 msgstr "Misslyckades med att kopiera keyserver.conf"
 
-#: ../Src/WinPT.cpp:544
+#: Src/WinPT.cpp:540
 #, c-format
 msgid ""
 "The PTD.dll file has a different version than WinPT.exe\n"
 "Please update the PTD.dll to version %d.%d.%d"
 msgstr ""
 
-#: ../Src/WinPT.cpp:551
+#: Src/WinPT.cpp:547
 msgid "Cryptographic selftest failed."
 msgstr "Kryptografisk självtest misslyckades."
 
-#: ../Src/WinPT.cpp:558
+#: Src/WinPT.cpp:554
 msgid "A newer GPGME version is needed; at least "
 msgstr "En senare GPGME-version behövs; åtminstone "
 
-#: ../Src/WinPT.cpp:579
+#: Src/WinPT.cpp:575
 msgid ""
 "The gpg.conf file contains the 'textmode' option\n"
 "which leads to broken binary output during decryption.\n"
 "If this is on purpose, just continue otherwise the option should be disabled."
 msgstr ""
 
-#: ../Src/WinPT.cpp:593
+#: Src/WinPT.cpp:589
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -141,21 +113,21 @@
 "%s."
 msgstr ""
 
-#: ../Src/WinPT.cpp:597
+#: Src/WinPT.cpp:593
 msgid "Select GPG Public Keyring"
 msgstr "Välj publik GPG-nyckelring"
 
-#: ../Src/WinPT.cpp:607
+#: Src/WinPT.cpp:603
 msgid "GPG home directory could not be determined."
 msgstr ""
 
-#: ../Src/WinPT.cpp:615
+#: Src/WinPT.cpp:611
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
 msgstr ""
 
-#: ../Src/WinPT.cpp:630
+#: Src/WinPT.cpp:626
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -163,387 +135,352 @@
 "Continue if you want WinPT to offer you more choices.\n"
 msgstr ""
 
-#: ../Src/WinPT.cpp:663
-#: ../Src/wptFileManagerDlg.cpp:520
-#: ../Src/wptFileManagerDlg.cpp:861
+#: Src/WinPT.cpp:659 Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:856
 msgid "Wipe Free Space"
 msgstr ""
 
-#: ../Src/WinPT.cpp:706
+#: Src/WinPT.cpp:702
 msgid "Could not register window class"
 msgstr "Kunde inte registrera fönsterklass"
 
-#: ../Src/WinPT.cpp:720
+#: Src/WinPT.cpp:716
 msgid "Could not create window"
 msgstr "Kunde inte skapa fönster"
 
-#: ../Src/WinPT.cpp:808
+#: Src/WinPT.cpp:804
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
 msgstr ""
 
-#: ../Src/WinPT.cpp:811
+#: Src/WinPT.cpp:807
 msgid ""
 "It seems that GPG is not configured properly.\n"
 "Do you want to start the GPG preferences dialog?"
 msgstr ""
 
-#: ../Src/WinPT.cpp:829
+#: Src/WinPT.cpp:825
 #, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found or is unuseable.\n"
-"The default key will be resetted and can be set later in the Key Manager again.\n"
+"The default key will be resetted and can be set later in the Key Manager "
+"again.\n"
 "\n"
 "%s: secret key not found."
 msgstr ""
 
-#: ../Src/wptAboutDlgs.cpp:53
-#: ../Src/wptAboutDlgs.cpp:130
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:130
 msgid "About the GNU Privacy Guard"
 msgstr "Om GNU Privacy Guard"
 
-#: ../Src/wptAboutDlgs.cpp:57
+#: Src/wptAboutDlgs.cpp:57
 msgid "About GnuPG"
 msgstr "Om GnuPG"
 
-#: ../Src/wptAboutDlgs.cpp:89
-#: ../Src/wptKeyManagerDlg.cpp:1943
-#: ../Src/wptMainProc.cpp:568
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1943
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "Om WinPT"
 
-#: ../Src/wptAboutDlgs.cpp:90
+#: Src/wptAboutDlgs.cpp:90
 msgid "Warranty"
 msgstr "Garanti"
 
-#: ../Src/wptAboutDlgs.cpp:92
+#: Src/wptAboutDlgs.cpp:92
 msgid "The AUTHORS files contains a list of all contributors and co-authors."
-msgstr "Filen AUTHORS innehåller en lista över alla bidragsgivare och andra upphovsmän."
+msgstr ""
+"Filen AUTHORS innehåller en lista över alla bidragsgivare och andra "
+"upphovsmän."
 
-#: ../Src/wptAboutDlgs.cpp:94
+#: Src/wptAboutDlgs.cpp:94
 msgid "A free open source privacy tray for Windows based on GnuPG."
 msgstr ""
 
-#: ../Src/wptAboutDlgs.cpp:96
+#: Src/wptAboutDlgs.cpp:96
 msgid "For more information you can visit the homepage: http://www.winpt.org"
 msgstr "För mer information kan du besöka webbsidan: http://www.winpt.org"
 
-#: ../Src/wptAboutDlgs.cpp:98
+#: Src/wptAboutDlgs.cpp:98
 msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
-msgstr "Rapportera alla FEL eller förslag angående WinPT till <winpt at freakmail.de>"
+msgstr ""
+"Rapportera alla FEL eller förslag angående WinPT till <winpt at freakmail.de>"
 
-#: ../Src/wptAboutDlgs.cpp:100
-msgid "WinPT is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 2 of the License, or (at your option) any later version."
-msgstr "WinPT är fri programvara; du kan distribuera det och/eller ändra det under villkoren för GNU General Public License som publicerats av Free Software Foundation; antingen version 2 av licensen, eller (du väljer själv) någon senare version."
+#: Src/wptAboutDlgs.cpp:100
+msgid ""
+"WinPT is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either Version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"WinPT är fri programvara; du kan distribuera det och/eller ändra det under "
+"villkoren för GNU General Public License som publicerats av Free Software "
+"Foundation; antingen version 2 av licensen, eller (du väljer själv) någon "
+"senare version."
 
-#: ../Src/wptAboutDlgs.cpp:105
-msgid "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR A PARTICULAR PURPOSE. See the General Public License for more details. "
-msgstr "WinPT distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI; även utan underförstådd garanti för SÄLJBARHET eller LÄMPLIGHET FÖR ETT SPECIFIKT ÄNDAMÅL. Se General Public License för mer detaljer. "
+#: Src/wptAboutDlgs.cpp:105
+msgid ""
+"WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
+"A PARTICULAR PURPOSE. See the General Public License for more details. "
+msgstr ""
+"WinPT distribueras i hopp om att det ska vara användbart, men UTAN NÅGON "
+"GARANTI; även utan underförstådd garanti för SÄLJBARHET eller LÄMPLIGHET FÖR "
+"ETT SPECIFIKT ÄNDAMÅL. Se General Public License för mer detaljer. "
 
-#: ../Src/wptAboutDlgs.cpp:109
+#: Src/wptAboutDlgs.cpp:109
 msgid "&About GPG..."
 msgstr "&Om GPG..."
 
-#: ../Src/wptAboutDlgs.cpp:110
-#: ../Src/wptKeyEditDlgs.cpp:2178
-#: ../Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2173
+#: Src/wptKeyManagerDlg.cpp:1002
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: ../Src/wptCardDlg.cpp:149
-#: ../Src/wptMainProc.cpp:395
+#: Src/wptCardDlg.cpp:146 Src/wptMainProc.cpp:396
 msgid "Card Manager"
 msgstr "Korthanterare"
 
-#: ../Src/wptCardDlg.cpp:185
+#: Src/wptCardDlg.cpp:182
 msgid "No Fingerprint"
 msgstr "Inget fingeravtryck"
 
-#: ../Src/wptCardDlg.cpp:216
+#: Src/wptCardDlg.cpp:213
 msgid "No OpenPGP smart card detected."
 msgstr "Inget OpenPGP-smartkort identifierades."
 
-#: ../Src/wptCardDlg.cpp:340
+#: Src/wptCardDlg.cpp:337
 msgid "No PINs found."
 msgstr "Inga PIN-koder hittades."
 
-#: ../Src/wptCardDlg.cpp:340
-#: ../Src/wptCardDlg.cpp:351
-#: ../Src/wptCardDlg.cpp:356
-#: ../Src/wptCardDlg.cpp:362
-#: ../Src/wptCardDlg.cpp:374
-#: ../Src/wptCardDlg.cpp:388
-#: ../Src/wptCardDlg.cpp:523
-#: ../Src/wptCardDlg.cpp:624
-#: ../Src/wptCardDlg.cpp:629
-#: ../Src/wptCardDlg.cpp:635
-#: ../Src/wptCardDlg.cpp:642
-#: ../Src/wptCardDlg.cpp:648
-#: ../Src/wptCardDlg.cpp:656
-#: ../Src/wptCardDlg.cpp:677
-#: ../Src/wptCardDlg.cpp:703
-#: ../Src/wptCardDlg.cpp:708
-#: ../Src/wptCardDlg.cpp:711
-#: ../Src/wptCardDlg.cpp:737
-#: ../Src/wptCardDlg.cpp:739
-#: ../Src/wptCardDlg.cpp:744
-#: ../Src/wptCardDlg.cpp:749
-#: ../Src/wptCardDlg.cpp:813
-#: ../Src/wptCardDlg.cpp:826
-#: ../Src/wptCardDlg.cpp:829
-#: ../Src/wptMainProc.cpp:265
+#: Src/wptCardDlg.cpp:337 Src/wptCardDlg.cpp:348 Src/wptCardDlg.cpp:353
+#: Src/wptCardDlg.cpp:359 Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:385
+#: Src/wptCardDlg.cpp:511 Src/wptCardDlg.cpp:612 Src/wptCardDlg.cpp:617
+#: Src/wptCardDlg.cpp:623 Src/wptCardDlg.cpp:630 Src/wptCardDlg.cpp:636
+#: Src/wptCardDlg.cpp:644 Src/wptCardDlg.cpp:665 Src/wptCardDlg.cpp:691
+#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:725
+#: Src/wptCardDlg.cpp:727 Src/wptCardDlg.cpp:732 Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:801 Src/wptCardDlg.cpp:814 Src/wptCardDlg.cpp:817
+#: Src/wptMainProc.cpp:265
 msgid "Card Edit"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:350
+#: Src/wptCardDlg.cpp:347
 msgid "Only plain ASCII is currently allowed."
 msgstr "Endast vanlig ASCII tillåts för närvarande."
 
-#: ../Src/wptCardDlg.cpp:355
+#: Src/wptCardDlg.cpp:352
 msgid "Only alphabetic characters are allowed."
 msgstr "Endast alfabetiska tecken tillåts."
 
-#. XXX: better URL check.
-#: ../Src/wptCardDlg.cpp:362
+#: Src/wptCardDlg.cpp:359
 msgid "Invalid URL."
 msgstr "Ogiltig url."
 
-#: ../Src/wptCardDlg.cpp:375
+#: Src/wptCardDlg.cpp:372
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "Kunde inte ändra kortattribut: %s"
 
-#: ../Src/wptCardDlg.cpp:388
+#: Src/wptCardDlg.cpp:385
 msgid "Card attribute changed."
 msgstr "Kortattribut ändrat."
 
-#: ../Src/wptCardDlg.cpp:428
+#: Src/wptCardDlg.cpp:423
 msgid "Please enter the 'Admin PIN'"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:430
+#: Src/wptCardDlg.cpp:425
 msgid "Please enter the 'User PIN'"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:432
-#: ../Src/wptPINDlg.cpp:51
+#: Src/wptCardDlg.cpp:427 Src/wptPINDlg.cpp:51
 msgid "Please enter the PIN"
 msgstr "Ange PIN-koden"
 
-#: ../Src/wptCardDlg.cpp:436
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-"%s\n"
-"Namn: %s %s\n"
-"Serienummer: %s\n"
-
-#: ../Src/wptCardDlg.cpp:479
-#: ../Src/wptCardDlg.cpp:595
-#: ../Src/wptKeyEditDlgs.cpp:503
+#: Src/wptCardDlg.cpp:467 Src/wptCardDlg.cpp:583 Src/wptKeyEditDlgs.cpp:498
 msgid "&Name"
 msgstr "&Namn"
 
-#: ../Src/wptCardDlg.cpp:480
+#: Src/wptCardDlg.cpp:468
 msgid "&Language"
 msgstr "&Språk"
 
-#: ../Src/wptCardDlg.cpp:481
+#: Src/wptCardDlg.cpp:469
 msgid "&Key-URL"
 msgstr "&Nyckel-url"
 
-#: ../Src/wptCardDlg.cpp:482
+#: Src/wptCardDlg.cpp:470
 msgid "&Login"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:483
+#: Src/wptCardDlg.cpp:471
 msgid "&Sex"
 msgstr "&Kön"
 
-#: ../Src/wptCardDlg.cpp:484
-#: ../Src/wptCommonDlg.cpp:256
-#: ../Src/wptKeyEditDlgs.cpp:2180
-#: ../Src/wptPassphraseDlg.cpp:105
-#: ../Src/wptPINDlg.cpp:55
+#: Src/wptCardDlg.cpp:472 Src/wptCommonDlg.cpp:256 Src/wptKeyEditDlgs.cpp:2175
+#: Src/wptPassphraseDlg.cpp:96 Src/wptPINDlg.cpp:55
 msgid "&OK"
 msgstr "&OK"
 
-#: ../Src/wptCardDlg.cpp:485
-#: ../Src/wptGPGOptDlg.cpp:51
+#: Src/wptCardDlg.cpp:473 Src/wptGPGOptDlg.cpp:51
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: ../Src/wptCardDlg.cpp:486
+#: Src/wptCardDlg.cpp:474
 msgid "&New keys"
 msgstr "&Nya nycklar"
 
-#: ../Src/wptCardDlg.cpp:487
+#: Src/wptCardDlg.cpp:475
 msgid "Change &PIN"
 msgstr "Ändra &PIN-kod"
 
-#: ../Src/wptCardDlg.cpp:522
+#: Src/wptCardDlg.cpp:510
 msgid ""
 "This operation will override the keys on the card.\n"
 "Continue?"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:594
+#: Src/wptCardDlg.cpp:582
 msgid "Pubkey algorithm"
 msgstr "Publik nyckelalgoritm"
 
-#: ../Src/wptCardDlg.cpp:596
-#: ../Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:584 Src/wptKeygenDlg.cpp:375
 msgid "&Comment (optional)"
 msgstr "&Kommentar (valfri)"
 
-#: ../Src/wptCardDlg.cpp:597
-#: ../Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:377
 msgid "&Expire date"
 msgstr "&Utgångsdatum"
 
-#: ../Src/wptCardDlg.cpp:598
+#: Src/wptCardDlg.cpp:586
 msgid "Off-card passphrase"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:599
-#: ../Src/wptKeyEditDlgs.cpp:640
-#: ../Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:587 Src/wptKeyEditDlgs.cpp:635 Src/wptKeygenDlg.cpp:379
 msgid "&Never"
 msgstr "&Aldrig"
 
-#: ../Src/wptCardDlg.cpp:600
-#: ../Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:588 Src/wptKeygenDlg.cpp:376
 msgid "Email &address"
 msgstr "E-post&adress"
 
-#: ../Src/wptCardDlg.cpp:601
+#: Src/wptCardDlg.cpp:589
 msgid "Overwrite old keys on the card"
 msgstr "Skriv över gamla nycklar på kortet"
 
-#: ../Src/wptCardDlg.cpp:602
+#: Src/wptCardDlg.cpp:590
 msgid "Make off-card backup of encryption key"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:603
-#: ../Src/wptKeyManagerDlg.cpp:1833
+#: Src/wptCardDlg.cpp:591 Src/wptKeyManagerDlg.cpp:1833
 msgid "Card Key Generation"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:624
+#: Src/wptCardDlg.cpp:612
 msgid "Please enter your name."
 msgstr "Ange ditt namn."
 
-#: ../Src/wptCardDlg.cpp:628
+#: Src/wptCardDlg.cpp:616
 msgid "Name must be at least 5 characters long."
 msgstr "Namnet måste vara minst 5 tecken långt."
 
-#: ../Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:622
 msgid "Please enter your e-mail address."
 msgstr "Ange din e-postadress."
 
-#: ../Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:629
 msgid "Please enter a valid e-mail address."
 msgstr "Ange en giltig e-postadress."
 
-#: ../Src/wptCardDlg.cpp:647
+#: Src/wptCardDlg.cpp:635
 msgid "Please enter an off-card passphrase."
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:655
+#: Src/wptCardDlg.cpp:643
 msgid "Please use plain ASCII charset for the fields."
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:676
-#: ../Src/wptKeyEditDlgs.cpp:1389
-#: ../Src/wptKeygenDlg.cpp:457
+#: Src/wptCardDlg.cpp:664 Src/wptKeyEditDlgs.cpp:1384 Src/wptKeygenDlg.cpp:457
 msgid "The date you have chosen has already passed."
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:701
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:710
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "Nycklarna skapades."
 
-#: ../Src/wptCardDlg.cpp:737
+#: Src/wptCardDlg.cpp:725
 msgid "Please enter the old card PIN."
 msgstr "Ange den gamla PIN-koden för kortet."
 
-#: ../Src/wptCardDlg.cpp:739
+#: Src/wptCardDlg.cpp:727
 msgid "Please enter the new card PIN."
 msgstr "Ange den nya PIN-koden för kortet."
 
-#: ../Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:732
 msgid "Admin PIN must be at least 8 characters."
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:749
+#: Src/wptCardDlg.cpp:737
 msgid "PIN must be at least 6 characters."
 msgstr "PIN-koden måste vara minst 6 tecken."
 
-#: ../Src/wptCardDlg.cpp:772
+#: Src/wptCardDlg.cpp:760
 msgid "Change Card PIN"
 msgstr ""
 
-#: ../Src/wptCardDlg.cpp:812
-#: ../Src/wptPassphraseDlg.cpp:256
+#: Src/wptCardDlg.cpp:800 Src/wptPassphraseDlg.cpp:247
 msgid "Passphrases do not match. Please try again."
 msgstr "Lösenfraserna stämmer inte överens. Försök igen."
 
-#: ../Src/wptCardDlg.cpp:828
+#: Src/wptCardDlg.cpp:816
 msgid "PIN successfully changed."
 msgstr "PIN-koden ändrades."
 
-#. :TODO: show card ID
-#: ../Src/wptCardEdit.cpp:332
+#: Src/wptCardEdit.cpp:332
 msgid "Please insert the card and click OK or Cancel to abort."
 msgstr "Mata in kortet och klicka på OK eller Avbryt för att avbryta."
 
-#: ../Src/wptCardEdit.cpp:333
+#: Src/wptCardEdit.cpp:333
 msgid "GPG Card Status"
 msgstr ""
 
-#: ../Src/wptCardManager.cpp:53
+#: Src/wptCardManager.cpp:48
 msgid ""
 "Please insert the OpenPGP smart card\n"
 "Press OK to continue or Cancel"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:55
-#: ../Src/wptClipDecryptDlg.cpp:136
-#: ../Src/wptClipDecryptDlg.cpp:179
-#: ../Src/wptKeyRevokersDlg.cpp:129
-#: ../Src/wptKeyRevokersDlg.cpp:173
-#: ../Src/wptVerifyList.cpp:257
-#: ../Src/wptVerifyList.cpp:319
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:138
+#: Src/wptClipDecryptDlg.cpp:182 Src/wptKeyRevokersDlg.cpp:129
+#: Src/wptKeyRevokersDlg.cpp:173 Src/wptVerifyList.cpp:229
+#: Src/wptVerifyList.cpp:293
 msgid "user ID not found"
 msgstr "användaridentiteten hittades inte"
 
-#: ../Src/wptClipDecryptDlg.cpp:105
+#: Src/wptClipDecryptDlg.cpp:106
 msgid "Signature status: created with a fully trusted key"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:107
+#: Src/wptClipDecryptDlg.cpp:108
 msgid "Signature status: created with a marginal trusted key"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:112
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:115
 msgid "Signature status: created with an undefined trusted key"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:125
 #, c-format
 msgid ""
 "*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -562,7 +499,7 @@
 "*** Signerare: %s (0x%s)\r\n"
 "*** START FÖR PGP-DEKRYPTERAD TEXT ***\r\n"
 
-#: ../Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:132
 msgid ""
 "\r\n"
 "*** END PGP DECRYPTED TEXT ***"
@@ -570,11 +507,11 @@
 "\r\n"
 "*** SLUT PÅ PGP-DEKRYPTERAD TEXT ***"
 
-#: ../Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Decrypt Verify"
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:190
 #, c-format
 msgid ""
 "%s\n"
@@ -589,54 +526,41 @@
 "Från \"%s\" med nyckelidentiteten 0x%s%s %s\n"
 "%s"
 
-#: ../Src/wptClipDecryptDlg.cpp:218
-#: ../Src/wptClipVerifyDlg.cpp:159
-#: ../Src/wptClipVerifyDlg.cpp:170
-#: ../Src/wptClipVerifyDlg.cpp:186
-#: ../Src/wptClipVerifyDlg.cpp:203
-#: ../Src/wptClipVerifyDlg.cpp:214
-#: ../Src/wptFileManager.cpp:1670
-#: ../Src/wptFileManager.cpp:1735
-#: ../Src/wptFileManager.cpp:1755
-#: ../Src/wptFileManagerDlg.cpp:597
-#: ../Src/wptFileVerifyDlg.cpp:127
-#: ../Src/wptKeyserverDlg.cpp:276
-#: ../Src/wptKeyserverDlg.cpp:284
-#: ../Src/wptMainProc.cpp:208
-#: ../Src/wptMainProc.cpp:224
-#: ../Src/wptMainProc.cpp:234
-#: ../Src/wptMainProc.cpp:404
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipVerifyDlg.cpp:144
+#: Src/wptClipVerifyDlg.cpp:155 Src/wptClipVerifyDlg.cpp:171
+#: Src/wptClipVerifyDlg.cpp:188 Src/wptClipVerifyDlg.cpp:199
+#: Src/wptFileManager.cpp:1670 Src/wptFileManager.cpp:1735
+#: Src/wptFileManager.cpp:1755 Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileVerifyDlg.cpp:127 Src/wptKeyserverDlg.cpp:279
+#: Src/wptKeyserverDlg.cpp:286 Src/wptMainProc.cpp:208 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:405
 msgid "Verify"
 msgstr "Validera"
 
-#: ../Src/wptClipDecryptDlg.cpp:225
-#: ../Src/wptClipDecryptDlg.cpp:238
-#: ../Src/wptClipDecryptDlg.cpp:246
-#: ../Src/wptClipDecryptDlg.cpp:253
-#: ../Src/wptClipDecryptDlg.cpp:255
-#: ../Src/wptFileManager.cpp:1377
-#: ../Src/wptFileManager.cpp:1428
+#: Src/wptClipDecryptDlg.cpp:230 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptClipDecryptDlg.cpp:258
+#: Src/wptClipDecryptDlg.cpp:260 Src/wptFileManager.cpp:1377
+#: Src/wptFileManager.cpp:1428
 msgid "Decryption"
 msgstr "Dekryptering"
 
-#: ../Src/wptClipDecryptDlg.cpp:239
-#: ../Src/wptFileManager.cpp:1429
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptFileManager.cpp:1429
 #, c-format
 msgid ""
 "Encrypted with %s key, ID 0x%s.%s\n"
 "Decryption failed: secret key not available."
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:246
+#: Src/wptClipDecryptDlg.cpp:251
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Algoritmen stöds inte: %s"
 
-#: ../Src/wptClipDecryptDlg.cpp:252
+#: Src/wptClipDecryptDlg.cpp:257
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:267
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -645,46 +569,31 @@
 "but it might be also possible that this is part of an attack."
 msgstr ""
 
-#: ../Src/wptClipDecryptDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:272
 msgid "*** IMPORTANT ***"
 msgstr "*** VIKTIGT ***"
 
-#: ../Src/wptClipDecryptDlg.cpp:271
-#: ../Src/wptClipEncryptDlg.cpp:221
-#: ../Src/wptClipSignDlg.cpp:118
-#: ../Src/wptClipSignDlg.cpp:264
-#: ../Src/wptClipSignEncDlg.cpp:190
-#: ../Src/wptKeyManager.cpp:304
-#: ../Src/wptKeyManager.cpp:770
-#: ../Src/wptKeyManager.cpp:962
-#: ../Src/wptSymEnc.cpp:94
+#: Src/wptClipDecryptDlg.cpp:276 Src/wptClipEncryptDlg.cpp:216
+#: Src/wptClipSignDlg.cpp:118 Src/wptClipSignDlg.cpp:264
+#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:296
+#: Src/wptKeyManager.cpp:762 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:88
 msgid "GnuPG Status: Finished"
 msgstr ""
 
-#. change popup texts
-#: ../Src/wptClipEditDlg.cpp:57
-#: ../Src/wptClipEditDlg.cpp:123
-#: ../Src/wptClipEditDlg.cpp:131
-#: ../Src/wptClipEditDlg.cpp:171
-#: ../Src/wptClipEditDlg.cpp:187
-#: ../Src/wptClipEditDlg.cpp:257
-#: ../Src/wptClipEditDlg.cpp:262
-#: ../Src/wptFileManagerDlg.cpp:220
-#: ../Src/wptMainProc.cpp:193
-#: ../Src/wptMainProc.cpp:244
-#: ../Src/wptMainProc.cpp:417
-#: ../Src/wptMainProc.cpp:500
-#: ../Src/wptMainProc.cpp:505
-#: ../Src/wptVerifyList.cpp:232
+#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
+#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
+#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:212
+#: Src/wptMainProc.cpp:193 Src/wptMainProc.cpp:244 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:501 Src/wptMainProc.cpp:506 Src/wptVerifyList.cpp:202
 msgid "Clipboard"
 msgstr "Urklipp"
 
-#: ../Src/wptClipEditDlg.cpp:113
-#: ../Src/wptFileManager.cpp:650
+#: Src/wptClipEditDlg.cpp:113 Src/wptFileManager.cpp:650
 msgid "File Open"
 msgstr ""
 
-#: ../Src/wptClipEditDlg.cpp:122
+#: Src/wptClipEditDlg.cpp:122
 msgid ""
 "The file you want to add is very large.\n"
 "Continue?"
@@ -692,508 +601,419 @@
 "Filen du vill lägga till är mycket stor.\n"
 "Fortsätt?"
 
-#: ../Src/wptClipEditDlg.cpp:160
+#: Src/wptClipEditDlg.cpp:160
 msgid "File Save"
 msgstr ""
 
-#: ../Src/wptClipEditDlg.cpp:186
+#: Src/wptClipEditDlg.cpp:186
 msgid "Data successfully written to file."
 msgstr ""
 
-#: ../Src/wptClipEditDlg.cpp:212
-#: ../Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:212 Src/wptClipEditDlg.cpp:222
 msgid "&Copy"
 msgstr "&Kopiera"
 
-#: ../Src/wptClipEditDlg.cpp:213
+#: Src/wptClipEditDlg.cpp:213
 msgid "Clea&r"
 msgstr ""
 
-#: ../Src/wptClipEditDlg.cpp:214
+#: Src/wptClipEditDlg.cpp:214
 msgid "&Quote"
 msgstr ""
 
-#: ../Src/wptClipEditDlg.cpp:215
-#: ../Src/wptFileManagerDlg.cpp:502
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:497
 msgid "&Open..."
 msgstr "&Öppna..."
 
-#: ../Src/wptClipEditDlg.cpp:216
-#: ../Src/wptMDSumDlg.cpp:207
+#: Src/wptClipEditDlg.cpp:216 Src/wptMDSumDlg.cpp:207
 msgid "&Save..."
 msgstr "&Spara..."
 
-#: ../Src/wptClipEditDlg.cpp:217
-#: ../Src/wptFileManagerDlg.cpp:515
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:510
 msgid "&Paste"
 msgstr "Klistra &in"
 
-#: ../Src/wptClipEditDlg.cpp:218
-#: ../Src/wptFileManagerDlg.cpp:503
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:498
 msgid "&Encrypt"
 msgstr "&Kryptera"
 
-#: ../Src/wptClipEditDlg.cpp:219
-#: ../Src/wptFileManagerDlg.cpp:505
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:500
 msgid "&Decrypt"
 msgstr "&Dekryptera"
 
-#: ../Src/wptClipEditDlg.cpp:221
-#: ../Src/wptMainProc.cpp:562
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr ""
 
-#: ../Src/wptClipEncryptDlg.cpp:104
+#: Src/wptClipEncryptDlg.cpp:106
 msgid "key not found"
 msgstr "nyckeln hittades inte"
 
-#: ../Src/wptClipEncryptDlg.cpp:123
+#: Src/wptClipEncryptDlg.cpp:122
 msgid "Recipients unsuable for encryption:\n"
 msgstr ""
 
-#: ../Src/wptClipEncryptDlg.cpp:139
-#: ../Src/wptClipEncryptDlg.cpp:161
-#: ../Src/wptClipEncryptDlg.cpp:211
-#: ../Src/wptClipEncryptDlg.cpp:218
-#: ../Src/wptClipEncryptDlg.cpp:244
-#: ../Src/wptMainProc.cpp:172
+#: Src/wptClipEncryptDlg.cpp:135 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:172
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../Src/wptClipEncryptDlg.cpp:162
+#: Src/wptClipEncryptDlg.cpp:157
 msgid "&Find"
 msgstr "&Sök"
 
-#: ../Src/wptClipEncryptDlg.cpp:163
-#: ../Src/wptClipSignEncDlg.cpp:112
-#: ../Src/wptCommonDlg.cpp:80
-#: ../Src/wptCommonDlg.cpp:257
-#: ../Src/wptFileManagerDlg.cpp:97
-#: ../Src/wptFileManagerDlg.cpp:226
-#: ../Src/wptFileManagerDlg.cpp:288
-#: ../Src/wptFileSaveDlg.cpp:59
-#: ../Src/wptFirstRunDlg.cpp:47
-#: ../Src/wptGPGPrefsDlg.cpp:168
-#: ../Src/wptKeyEditDlgs.cpp:359
-#: ../Src/wptKeyEditDlgs.cpp:440
-#: ../Src/wptKeyEditDlgs.cpp:506
-#: ../Src/wptKeyEditDlgs.cpp:641
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:67
-#: ../Src/wptKeygenDlg.cpp:380
-#: ../Src/wptKeygenDlg.cpp:547
-#: ../Src/wptKeyRevokeDlg.cpp:79
-#: ../Src/wptKeyserverDlg.cpp:549
-#: ../Src/wptKeyserverSearchDlg.cpp:66
-#: ../Src/wptKeysignDlg.cpp:362
-#: ../Src/wptPassphraseCB.cpp:95
-#: ../Src/wptPassphraseDlg.cpp:104
-#: ../Src/wptPINDlg.cpp:54
-#: ../Src/wptPreferencesDlg.cpp:120
-#: ../Src/wptTextInputDlg.cpp:86
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptCommonDlg.cpp:80 Src/wptCommonDlg.cpp:257
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:283 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
+#: Src/wptKeyEditDlgs.cpp:354 Src/wptKeyEditDlgs.cpp:435
+#: Src/wptKeyEditDlgs.cpp:501 Src/wptKeyEditDlgs.cpp:636
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
+#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:418 Src/wptPassphraseCB.cpp:89
+#: Src/wptPassphraseDlg.cpp:95 Src/wptPINDlg.cpp:54
+#: Src/wptPreferencesDlg.cpp:120 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: ../Src/wptClipEncryptDlg.cpp:210
-#: ../Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
 msgid "You must select at least one key."
 msgstr "Du måste välja åtminstone en nyckel."
 
-#: ../Src/wptClipEncryptDlg.cpp:245
+#: Src/wptClipEncryptDlg.cpp:240
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr ""
 
-#: ../Src/wptClipImportDlg.cpp:53
-#: ../Src/wptKeyImportStatusDlg.cpp:77
+#: Src/wptClipImportDlg.cpp:53 Src/wptKeyImportStatusDlg.cpp:77
 msgid "Key Import Statistics"
 msgstr ""
 
-#: ../Src/wptClipSignDlg.cpp:100
-#: ../Src/wptClipSignDlg.cpp:223
-#: ../Src/wptClipSignEncDlg.cpp:170
+#: Src/wptClipSignDlg.cpp:100 Src/wptClipSignDlg.cpp:223
+#: Src/wptClipSignEncDlg.cpp:170
 msgid "Could not get default key."
 msgstr ""
 
-#: ../Src/wptClipSignDlg.cpp:100
-#: ../Src/wptClipSignDlg.cpp:108
-#: ../Src/wptClipSignDlg.cpp:116
-#: ../Src/wptClipSignDlg.cpp:150
-#: ../Src/wptClipSignDlg.cpp:156
-#: ../Src/wptClipSignDlg.cpp:224
-#: ../Src/wptClipSignDlg.cpp:228
-#: ../Src/wptClipSignDlg.cpp:248
-#: ../Src/wptClipSignDlg.cpp:259
-#: ../Src/wptClipSignEncDlg.cpp:159
-#: ../Src/wptClipSignEncDlg.cpp:170
-#: ../Src/wptFileManager.cpp:1187
-#: ../Src/wptFileManager.cpp:1203
-#: ../Src/wptFileManager.cpp:1493
-#: ../Src/wptMainProc.cpp:179
+#: Src/wptClipSignDlg.cpp:100 Src/wptClipSignDlg.cpp:108
+#: Src/wptClipSignDlg.cpp:116 Src/wptClipSignDlg.cpp:150
+#: Src/wptClipSignDlg.cpp:156 Src/wptClipSignDlg.cpp:224
+#: Src/wptClipSignDlg.cpp:228 Src/wptClipSignDlg.cpp:248
+#: Src/wptClipSignDlg.cpp:259 Src/wptClipSignEncDlg.cpp:159
+#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1187
+#: Src/wptFileManager.cpp:1203 Src/wptFileManager.cpp:1493
+#: Src/wptMainProc.cpp:179
 msgid "Signing"
 msgstr "Signering"
 
-#: ../Src/wptClipSignDlg.cpp:156
+#: Src/wptClipSignDlg.cpp:156
 msgid "No useable signing key found"
 msgstr "Ingen användbar signeringsnyckel hittades"
 
-#: ../Src/wptClipSignDlg.cpp:229
+#: Src/wptClipSignDlg.cpp:229
 #, c-format
 msgid ""
 "No key was chosen.\n"
 "Use the GPG default key '%s'?"
 msgstr ""
 
-#: ../Src/wptClipSignEncDlg.cpp:111
-#: ../Src/wptClipSignEncDlg.cpp:151
-#: ../Src/wptClipSignEncDlg.cpp:179
-#: ../Src/wptClipSignEncDlg.cpp:188
-#: ../Src/wptMainProc.cpp:186
+#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
+#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
+#: Src/wptMainProc.cpp:186
 msgid "Sign & Encrypt"
 msgstr "Signera & kryptera"
 
-#: ../Src/wptClipSignEncDlg.cpp:119
+#: Src/wptClipSignEncDlg.cpp:119
 msgid "Select key for signing"
 msgstr "Välj nyckel för signering"
 
-#: ../Src/wptClipSignEncDlg.cpp:120
+#: Src/wptClipSignEncDlg.cpp:120
 msgid "Signing key:"
 msgstr "Signeringsnyckel:"
 
-#: ../Src/wptClipSignEncDlg.cpp:159
-#: ../Src/wptKeylist.cpp:1225
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1198
 msgid "No key was selected."
 msgstr "Ingen nyckel valdes."
 
-#: ../Src/wptClipVerifyDlg.cpp:139
+#: Src/wptClipVerifyDlg.cpp:125
 msgid "Signature Information"
 msgstr "Signaturinformation"
 
-#: ../Src/wptClipVerifyDlg.cpp:160
-#: ../Src/wptFileVerifyDlg.cpp:52
-#: ../Src/wptGPGOptDlg.cpp:49
+#: Src/wptClipVerifyDlg.cpp:145 Src/wptFileVerifyDlg.cpp:52
+#: Src/wptGPGOptDlg.cpp:49
 msgid "&Save"
 msgstr "&Spara"
 
-#: ../Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:188
 msgid "Invalid signature state."
 msgstr "Ogiltigt signaturtillstånd."
 
-#: ../Src/wptClipVerifyDlg.cpp:213
+#: Src/wptClipVerifyDlg.cpp:198
 msgid "Error while adding signature information."
 msgstr ""
 
-#: ../Src/wptClipVerifyDlg.cpp:251
-#: ../Src/wptFileSaveDlg.cpp:58
-#: ../Src/wptFileSaveDlg.cpp:81
-#: ../Src/wptFileSaveDlg.cpp:86
-#: ../Src/wptFileSaveDlg.cpp:92
-#: ../Src/wptFileSaveDlg.cpp:98
-#: ../Src/wptFileSaveDlg.cpp:100
-#: ../Src/wptFileSaveDlg.cpp:108
-#: ../Src/wptFileSaveDlg.cpp:114
-#: ../Src/wptFileSaveDlg.cpp:120
+#: Src/wptClipVerifyDlg.cpp:236 Src/wptFileSaveDlg.cpp:58
+#: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
+#: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
+#: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
+#: Src/wptFileSaveDlg.cpp:114 Src/wptFileSaveDlg.cpp:120
 msgid "Save Plaintext"
 msgstr "Spara klartext"
 
-#: ../Src/wptCommonDlg.cpp:89
+#: Src/wptCommonDlg.cpp:89
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: ../Src/wptCommonDlg.cpp:119
-#: ../Src/wptKeyManager.cpp:516
+#: Src/wptCommonDlg.cpp:119 Src/wptKeyManager.cpp:508
 msgid "HTTP Key Import"
 msgstr ""
 
-#: ../Src/wptCommonDlg.cpp:120
+#: Src/wptCommonDlg.cpp:120
 msgid "Enter URL to retrieve the public key"
 msgstr ""
 
-#. just get rid of the warning.
-#: ../Src/wptCommonDlg.cpp:138
-#: ../Src/wptKeyEditDlgs.cpp:758
-#: ../Src/wptKeyEditDlgs.cpp:826
-#: ../Src/wptKeyEditDlgs.cpp:867
-#: ../Src/wptKeyEditDlgs.cpp:881
-#: ../Src/wptKeyEditDlgs.cpp:883
-#: ../Src/wptKeyEditDlgs.cpp:909
-#: ../Src/wptKeyEditDlgs.cpp:939
-#: ../Src/wptKeyEditDlgs.cpp:972
-#: ../Src/wptKeyEditDlgs.cpp:1017
-#: ../Src/wptKeyEditDlgs.cpp:1024
-#: ../Src/wptKeyEditDlgs.cpp:1044
-#: ../Src/wptKeyEditDlgs.cpp:1301
-#: ../Src/wptKeyEditDlgs.cpp:1306
-#: ../Src/wptKeyEditDlgs.cpp:1310
-#: ../Src/wptKeyEditDlgs.cpp:1326
-#: ../Src/wptKeyEditDlgs.cpp:1360
-#: ../Src/wptKeyEditDlgs.cpp:1365
-#: ../Src/wptKeyEditDlgs.cpp:1375
-#: ../Src/wptKeyEditDlgs.cpp:1390
-#: ../Src/wptKeyEditDlgs.cpp:1394
-#: ../Src/wptKeyEditDlgs.cpp:1433
-#: ../Src/wptKeyEditDlgs.cpp:1438
-#: ../Src/wptKeyEditDlgs.cpp:1445
-#: ../Src/wptKeyEditDlgs.cpp:1451
-#: ../Src/wptKeyEditDlgs.cpp:1456
-#: ../Src/wptKeyEditDlgs.cpp:1499
-#: ../Src/wptKeyEditDlgs.cpp:1504
-#: ../Src/wptKeyEditDlgs.cpp:1511
-#: ../Src/wptKeyEditDlgs.cpp:1518
-#: ../Src/wptKeyEditDlgs.cpp:1521
-#: ../Src/wptKeyEditDlgs.cpp:1561
-#: ../Src/wptKeyEditDlgs.cpp:1569
-#: ../Src/wptKeyEditDlgs.cpp:1614
-#: ../Src/wptKeyEditDlgs.cpp:1625
-#: ../Src/wptKeyEditDlgs.cpp:1734
-#: ../Src/wptKeyEditDlgs.cpp:1772
-#: ../Src/wptKeyEditDlgs.cpp:1807
-#: ../Src/wptKeyEditDlgs.cpp:1812
-#: ../Src/wptKeyEditDlgs.cpp:1822
-#: ../Src/wptKeyEditDlgs.cpp:1927
-#: ../Src/wptKeyEditDlgs.cpp:1929
-#: ../Src/wptKeyEditDlgs.cpp:1945
-#: ../Src/wptKeyEditDlgs.cpp:1947
-#: ../Src/wptKeyEditDlgs.cpp:1982
-#: ../Src/wptKeyEditDlgs.cpp:1990
-#: ../Src/wptKeyEditDlgs.cpp:2006
-#: ../Src/wptKeyEditDlgs.cpp:2020
-#: ../Src/wptKeyEditDlgs.cpp:2024
-#: ../Src/wptKeyEditDlgs.cpp:2091
-#: ../Src/wptKeyEditDlgs.cpp:2154
-#: ../Src/wptKeyEditDlgs.cpp:2168
-#: ../Src/wptKeyEditDlgs.cpp:2183
-#: ../Src/wptKeyEditDlgs.cpp:2223
-#: ../Src/wptKeyEditDlgs.cpp:2228
-#: ../Src/wptKeyManagerDlg.cpp:1031
-#: ../Src/wptKeyManagerDlg.cpp:1972
+#: Src/wptCommonDlg.cpp:138 Src/wptKeyEditDlgs.cpp:753
+#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:862
+#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1012
+#: Src/wptKeyEditDlgs.cpp:1019 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1305 Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1355 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389 Src/wptKeyEditDlgs.cpp:1428
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1506 Src/wptKeyEditDlgs.cpp:1513
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1556
+#: Src/wptKeyEditDlgs.cpp:1564 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1620 Src/wptKeyEditDlgs.cpp:1729
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1922 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:2001 Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2019 Src/wptKeyEditDlgs.cpp:2086
+#: Src/wptKeyEditDlgs.cpp:2149 Src/wptKeyEditDlgs.cpp:2163
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyEditDlgs.cpp:2218
+#: Src/wptKeyEditDlgs.cpp:2223 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1972
 msgid "Key Edit"
 msgstr ""
 
-#: ../Src/wptCommonDlg.cpp:139
+#: Src/wptCommonDlg.cpp:139
 msgid "Enter preferred keyserver URL"
 msgstr ""
 
-#: ../Src/wptCommonDlg.cpp:215
-#: ../Src/wptGPGPrefsDlg.cpp:337
+#: Src/wptCommonDlg.cpp:215 Src/wptGPGPrefsDlg.cpp:346
 msgid "Choose Locale Directory"
 msgstr "Välj lokalkatalog"
 
-#: ../Src/wptCommonDlg.cpp:223
+#: Src/wptCommonDlg.cpp:223
 msgid "Could not create winpt.mo file"
 msgstr "Kunde inte skapa file winpt.mo"
 
-#: ../Src/wptCommonDlg.cpp:254
+#: Src/wptCommonDlg.cpp:254
 msgid "Native Language Support"
 msgstr ""
 
-#: ../Src/wptCommonDlg.cpp:255
+#: Src/wptCommonDlg.cpp:255
 msgid "Please select a language"
 msgstr "Välj ett språk"
 
-#: ../Src/wptErrors.cpp:47
+#: Src/wptErrors.cpp:51
 #, c-format
 msgid "Could not locate GPG.exe in %s."
 msgstr "Kunde inte hitta GPG.exe i %s."
 
-#: ../Src/wptErrors.cpp:52
+#: Src/wptErrors.cpp:56
 #, c-format
-msgid "Could not find keyring entries in the config file in %s or the file does NOT exist."
+msgid ""
+"Could not find keyring entries in the config file in %s or the file does NOT "
+"exist."
 msgstr ""
 
-#: ../Src/wptErrors.cpp:78
+#: Src/wptErrors.cpp:83
 msgid "General error occured"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:79
+#: Src/wptErrors.cpp:84
 msgid "Could not open file"
 msgstr "Kunde inte öppna fil"
 
-#: ../Src/wptErrors.cpp:80
+#: Src/wptErrors.cpp:85
 msgid "Could not create file"
 msgstr "Kunde inte skapa fil"
 
-#: ../Src/wptErrors.cpp:81
+#: Src/wptErrors.cpp:86
 msgid "Could not read file"
 msgstr "Kunde inte läsa fil"
 
-#: ../Src/wptErrors.cpp:82
+#: Src/wptErrors.cpp:87
 msgid "Could not write file"
 msgstr "Kunde inte skriva fil"
 
-#: ../Src/wptErrors.cpp:83
+#: Src/wptErrors.cpp:88
 msgid "Could not close file"
 msgstr "Kunde inte stänga fil"
 
-#: ../Src/wptErrors.cpp:84
+#: Src/wptErrors.cpp:89
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
-#: ../Src/wptErrors.cpp:85
+#: Src/wptErrors.cpp:90
 msgid "Could not delete file"
 msgstr "Kunde inte ta bort fil"
 
-#: ../Src/wptErrors.cpp:86
+#: Src/wptErrors.cpp:91
 msgid "Could not open Clipboard"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:87
+#: Src/wptErrors.cpp:92
 msgid "Could not close Clipboard"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:88
+#: Src/wptErrors.cpp:93
 msgid "Could not empty Clipboard"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:89
+#: Src/wptErrors.cpp:94
 msgid "Could not set Clipboard data"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:90
+#: Src/wptErrors.cpp:95
 msgid "Could not get Clipboard data"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:91
+#: Src/wptErrors.cpp:96
 msgid "There is no text in the Clipboard"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:92
+#: Src/wptErrors.cpp:97
 msgid "The Clipboard already contains GPG data"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:93
+#: Src/wptErrors.cpp:98
 msgid "General Clipboard error"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:94
+#: Src/wptErrors.cpp:99
 msgid "Registry error: "
 msgstr ""
 
-#: ../Src/wptErrors.cpp:97
+#: Src/wptErrors.cpp:102
 msgid "Could not startup Winsock 2 interface"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:98
+#: Src/wptErrors.cpp:103
 msgid "Could not resolve hostname"
 msgstr "Kunde inte slå upp värdnamn"
 
-#: ../Src/wptErrors.cpp:99
+#: Src/wptErrors.cpp:104
 msgid "Could not create new socket"
 msgstr "Kunde inte skapa nytt uttag"
 
-#: ../Src/wptErrors.cpp:100
+#: Src/wptErrors.cpp:105
 msgid "Could not connect to the host"
 msgstr "Kunde inte ansluta till värden"
 
-#: ../Src/wptErrors.cpp:101
+#: Src/wptErrors.cpp:106
 msgid "Could not send the key to the keyserver"
 msgstr "Kunde inte skicka nyckeln till nyckelservern"
 
-#: ../Src/wptErrors.cpp:102
+#: Src/wptErrors.cpp:107
 msgid "Could not receive the key from the keyserver"
 msgstr "Kunde inte hämta nyckeln från nyckelservern"
 
-#: ../Src/wptErrors.cpp:103
+#: Src/wptErrors.cpp:108
 msgid "Socket timed out, no data"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:104
+#: Src/wptErrors.cpp:109
 msgid "Could not forward request to proxy"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:105
+#: Src/wptErrors.cpp:110
 msgid "Keyserver returned: no matching keys in database"
 msgstr ""
 
-#: ../Src/wptErrors.cpp:106
+#: Src/wptErrors.cpp:111
 msgid "Could not register hotkey: "
 msgstr ""
 
-#: ../Src/wptErrors.cpp:109
+#: Src/wptErrors.cpp:114
 msgid "Could not open directory"
 msgstr "Kunde inte öppna katalogen"
 
-#: ../Src/wptErrors.cpp:110
+#: Src/wptErrors.cpp:115
 msgid "Could not create directory"
 msgstr "Kunde inte skapa katalogen"
 
-#: ../Src/wptErrors.cpp:111
+#: Src/wptErrors.cpp:116
 msgid "Could not extract data from the current window"
 msgstr "Kunde inte extrahera data från aktuell fönster"
 
-#: ../Src/wptErrors.cpp:112
+#: Src/wptErrors.cpp:117
 msgid "Could not load config file"
 msgstr "Kunde inte läsa in konfigurationsfilen"
 
-#: ../Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:121
 msgid "No data available"
 msgstr "Inget data är tillgängligt"
 
-#: ../Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:122
 msgid "There is no card in the reader"
 msgstr "Det finns inget kort i läsaren"
 
-#: ../Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:123
 msgid "There was no reader found"
 msgstr "Ingen läsare hittades"
 
-#: ../Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:124
 msgid "This is not an OpenPGP card"
 msgstr "Det här är inte ett OpenPGP-kort"
 
-#.
-#. case WPTERR_CDISK_LOCK: return _("Could not lock or unlock volume");
-#. case WPTERR_CDISK_MOUNT: return _("Could not mount volume");
-#. case WPTERR_CDISK_UMOUNT: return _("Could not unmount volume");
-#. case WPTERR_CDISK_OPEN: return _("Could not  open volume");
-#. case WPTERR_CDISK_BUSY: return _("Drive that belongs to the volume is busy");
-#. case WPTERR_CDISK_QUERY: return _("Could not query volume information");
-#.
-#: ../Src/wptErrors.cpp:128
+#: Src/wptErrors.cpp:134
 #, c-format
 msgid "Unknown error=%d"
 msgstr "Okänt fel=%d"
 
-#: ../Src/wptFileManager.cpp:131
-#: ../Src/wptFileManager.cpp:153
-#: ../Src/wptFileManager.cpp:159
-#: ../Src/wptFileManager.cpp:199
-#: ../Src/wptFileManager.cpp:325
-#: ../Src/wptFileManager.cpp:747
-#: ../Src/wptFileManager.cpp:915
-#: ../Src/wptFileManager.cpp:1045
-#: ../Src/wptFileManager.cpp:1579
-#: ../Src/wptFileManager.cpp:1606
-#: ../Src/wptFileManager.cpp:1625
-#: ../Src/wptFileManager.cpp:1910
-#: ../Src/wptFileManager.cpp:1972
-#: ../Src/wptFileManagerDlg.cpp:530
-#: ../Src/wptFileManagerDlg.cpp:640
-#: ../Src/wptFileStatDlg.cpp:152
-#: ../Src/wptMainProc.cpp:393
-#: ../Src/wptMDSumDlg.cpp:276
-#: ../Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:131 Src/wptFileManager.cpp:153
+#: Src/wptFileManager.cpp:159 Src/wptFileManager.cpp:199
+#: Src/wptFileManager.cpp:325 Src/wptFileManager.cpp:747
+#: Src/wptFileManager.cpp:915 Src/wptFileManager.cpp:1045
+#: Src/wptFileManager.cpp:1579 Src/wptFileManager.cpp:1606
+#: Src/wptFileManager.cpp:1625 Src/wptFileManager.cpp:1910
+#: Src/wptFileManager.cpp:1972 Src/wptFileManagerDlg.cpp:525
+#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:394 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
 msgid "File Manager"
 msgstr "Filhanterare"
 
-#: ../Src/wptFileManager.cpp:132
+#: Src/wptFileManager.cpp:132
 #, c-format
 msgid ""
 "\"%s\" already exists.\n"
 "Replace existing file?"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:154
+#: Src/wptFileManager.cpp:154
 #, c-format
 msgid ""
 "\"%s\" has read-only attribute.\n"
 "Set attribute to normal?"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:158
+#: Src/wptFileManager.cpp:158
 msgid "Could not reset file attribute to normal."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:195
+#: Src/wptFileManager.cpp:195
 msgid ""
 "Multi-Media files are already compressed, GPG would compress\n"
 "them anyway and this takes a lot of time.\n"
@@ -1201,109 +1021,95 @@
 "Do you want to disable it?"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:415
-#: ../Src/wptKeyEditDlgs.cpp:1080
-#: ../Src/wptVerifyList.cpp:169
+#: Src/wptFileManager.cpp:415 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptVerifyList.cpp:139
 msgid "Status"
 msgstr "Status"
 
-#: ../Src/wptFileManager.cpp:416
-#: ../Src/wptKeyEditDlgs.cpp:1161
-#: ../Src/wptKeyRevokersDlg.cpp:57
-#: ../Src/wptMDSumDlg.cpp:190
-#: ../Src/wptVerifyList.cpp:168
+#: Src/wptFileManager.cpp:416 Src/wptKeyEditDlgs.cpp:1156
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
+#: Src/wptVerifyList.cpp:138
 msgid "Name"
 msgstr "Namn"
 
-#: ../Src/wptFileManager.cpp:417
+#: Src/wptFileManager.cpp:417
 msgid "Operation"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:746
+#: Src/wptFileManager.cpp:746
 msgid "Please select a file."
 msgstr "Välj en fil."
 
-#: ../Src/wptFileManager.cpp:916
+#: Src/wptFileManager.cpp:916
 #, c-format
 msgid ""
 "\"%s\" does not seems to be a text file.\n"
 "Do you really want to clearsign it?"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1046
+#: Src/wptFileManager.cpp:1046
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "\"%s\" finns inte"
 
-#: ../Src/wptFileManager.cpp:1113
-#: ../Src/wptFileStatDlg.cpp:282
-#: ../Src/wptFileStatDlg.cpp:286
+#: Src/wptFileManager.cpp:1113 Src/wptFileStatDlg.cpp:282
+#: Src/wptFileStatDlg.cpp:286
 msgid "File Status"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1156
+#: Src/wptFileManager.cpp:1156
 msgid "Enter Filename for Encrypted File"
 msgstr "Ange filnamn för krypterad fil"
 
-#: ../Src/wptFileManager.cpp:1186
+#: Src/wptFileManager.cpp:1186
 msgid "Could not get default secret key."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1217
-#: ../Src/wptFileManager.cpp:1529
-#: ../Src/wptFileManagerDlg.cpp:595
-#: ../Src/wptMainProc.cpp:156
-#: ../Src/wptMainProc.cpp:401
-#: ../Src/wptMainProc.cpp:408
+#: Src/wptFileManager.cpp:1217 Src/wptFileManager.cpp:1529
+#: Src/wptFileManagerDlg.cpp:590 Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:402 Src/wptMainProc.cpp:409
 msgid "Sign"
 msgstr "Signera"
 
-#: ../Src/wptFileManager.cpp:1230
-#: ../Src/wptFileManagerDlg.cpp:593
-#: ../Src/wptMainProc.cpp:400
-#: ../Src/wptMainProc.cpp:405
+#: Src/wptFileManager.cpp:1230 Src/wptFileManagerDlg.cpp:588
+#: Src/wptMainProc.cpp:401 Src/wptMainProc.cpp:406
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../Src/wptFileManager.cpp:1257
-#: ../Src/wptSymEnc.cpp:72
-#: ../Src/wptSymEnc.cpp:92
+#: Src/wptFileManager.cpp:1257 Src/wptSymEnc.cpp:66 Src/wptSymEnc.cpp:86
 msgid "Symmetric Encryption"
 msgstr "Symmetrisk kryptering"
 
-#: ../Src/wptFileManager.cpp:1290
-#: ../Src/wptFileManager.cpp:1295
-#: ../Src/wptMainProc.cpp:399
-#: ../Src/wptMainProc.cpp:409
+#: Src/wptFileManager.cpp:1290 Src/wptFileManager.cpp:1295
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:410
 msgid "Symmetric"
 msgstr "Symmetrisk"
 
-#: ../Src/wptFileManager.cpp:1295
+#: Src/wptFileManager.cpp:1295
 msgid "Encryption failed."
 msgstr "Kryptering misslyckades."
 
-#: ../Src/wptFileManager.cpp:1386
+#: Src/wptFileManager.cpp:1386
 msgid "Choose Filename for Output"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1395
+#: Src/wptFileManager.cpp:1395
 msgid "Enter Filename for Plaintext File"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1437
-#: ../Src/wptFileManager.cpp:1457
-#: ../Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManager.cpp:1437 Src/wptFileManager.cpp:1457
+#: Src/wptFileManagerDlg.cpp:589
 msgid "Decrypt"
 msgstr "Dekryptera"
 
-#: ../Src/wptFileManager.cpp:1443
+#: Src/wptFileManager.cpp:1443
 #, c-format
 msgid ""
 "Decryption failed.\n"
 "%s: does not exist."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1458
+#: Src/wptFileManager.cpp:1458
 #, c-format
 msgid ""
 "The original file name is '%s'.\n"
@@ -1311,47 +1117,41 @@
 "Do you want to use this instead of '%s'?"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1506
+#: Src/wptFileManager.cpp:1506
 msgid "Enter Filename for Signed File"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1605
+#: Src/wptFileManager.cpp:1605
 msgid "Could not find detached signature in the clipboard."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1625
+#: Src/wptFileManager.cpp:1625
 msgid "No files to check."
 msgstr "Inga filer att kontrollera."
 
-#: ../Src/wptFileManager.cpp:1642
+#: Src/wptFileManager.cpp:1642
 msgid "Select Data File"
 msgstr "Välj datafil"
 
-#: ../Src/wptFileManager.cpp:1644
+#: Src/wptFileManager.cpp:1644
 msgid "Selected Output File"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1670
+#: Src/wptFileManager.cpp:1670
 msgid "Invalid file name. Exit"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1803
-#: ../Src/wptFileManager.cpp:1814
-#: ../Src/wptFileManagerDlg.cpp:245
-#: ../Src/wptImportList.cpp:406
-#: ../Src/wptImportList.cpp:413
-#: ../Src/wptImportList.cpp:423
-#: ../Src/wptImportList.cpp:431
-#: ../Src/wptImportList.cpp:440
-#: ../Src/wptKeyManager.cpp:458
-#: ../Src/wptKeyManager.cpp:469
-#: ../Src/wptKeyManager.cpp:567
-#: ../Src/wptKeyManager.cpp:586
-#: ../Src/wptKeyserverDlg.cpp:220
+#: Src/wptFileManager.cpp:1803 Src/wptFileManager.cpp:1814
+#: Src/wptFileManagerDlg.cpp:240 Src/wptImportList.cpp:387
+#: Src/wptImportList.cpp:394 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:412 Src/wptImportList.cpp:421
+#: Src/wptKeyManager.cpp:450 Src/wptKeyManager.cpp:461
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:578
+#: Src/wptKeyserverDlg.cpp:220
 msgid "Import"
 msgstr "Importera"
 
-#: ../Src/wptFileManager.cpp:1811
+#: Src/wptFileManager.cpp:1811
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -1359,124 +1159,110 @@
 "Cannot import these key(s)!"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1837
-#: ../Src/wptKeyManager.cpp:282
-#: ../Src/wptKeyManager.cpp:325
-#: ../Src/wptKeyManager.cpp:360
+#: Src/wptFileManager.cpp:1837 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:317 Src/wptKeyManager.cpp:352
 msgid "No key was selected for export."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1838
-#: ../Src/wptFileManager.cpp:1861
-#: ../Src/wptKeyserverDlg.cpp:93
+#: Src/wptFileManager.cpp:1838 Src/wptFileManager.cpp:1861
+#: Src/wptKeyserverDlg.cpp:93
 msgid "Export"
 msgstr "Exportera"
 
-#: ../Src/wptFileManager.cpp:1846
-#: ../Src/wptKeyManagerDlg.cpp:1903
-#: ../Src/wptKeyManagerDlg.cpp:1935
+#: Src/wptFileManager.cpp:1846 Src/wptKeyManagerDlg.cpp:1903
+#: Src/wptKeyManagerDlg.cpp:1935
 msgid "Choose Name for Key File"
 msgstr "Välj namn för nyckelfil"
 
-#: ../Src/wptFileManager.cpp:1865
-#: ../Src/wptKeyEditDlgs.cpp:1060
-#: ../Src/wptKeyEditDlgs.cpp:1340
-#: ../Src/wptKeyEditDlgs.cpp:1412
-#: ../Src/wptKeyserverDlg.cpp:105
+#: Src/wptFileManager.cpp:1865 Src/wptKeyEditDlgs.cpp:1055
+#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1407
+#: Src/wptKeyserverDlg.cpp:105
 msgid "GnuPG status"
 msgstr "GnuPG-status"
 
-#: ../Src/wptFileManager.cpp:1865
+#: Src/wptFileManager.cpp:1865
 #, c-format
 msgid "Finished (Output: %s)"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1911
+#: Src/wptFileManager.cpp:1911
 #, c-format
 msgid "%s: no valid OpenPGP data found."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1971
+#: Src/wptFileManager.cpp:1971
 msgid "Encrypting into a ZIP archive makes sense with multiple files"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:1976
+#: Src/wptFileManager.cpp:1976
 msgid "Choose File Name for Output"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:2048
+#: Src/wptFileManager.cpp:2048
 msgid "Choose a Name for the Archive"
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:2051
+#: Src/wptFileManager.cpp:2051
 msgid "Invalid archive name. Exit."
 msgstr ""
 
-#: ../Src/wptFileManager.cpp:2052
-#: ../Src/wptFileManager.cpp:2060
+#: Src/wptFileManager.cpp:2052 Src/wptFileManager.cpp:2060
 msgid "Encrypt Directory"
 msgstr "Kryptera katalog"
 
-#: ../Src/wptFileManager.cpp:2059
+#: Src/wptFileManager.cpp:2059
 msgid "Could not create zip archive."
 msgstr "Kunde inte skapa ZIP-arkiv."
 
-#: ../Src/wptFileManagerDlg.cpp:91
-#: ../Src/wptFileManagerDlg.cpp:153
+#: Src/wptFileManagerDlg.cpp:86 Src/wptFileManagerDlg.cpp:148
 msgid "File Encrypt"
 msgstr "Filkryptering"
 
-#: ../Src/wptFileManagerDlg.cpp:92
-#: ../Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:87 Src/wptFileManagerDlg.cpp:277
 msgid "&Text Output"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:93
+#: Src/wptFileManagerDlg.cpp:88
 msgid "&Wipe Original"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:94
+#: Src/wptFileManagerDlg.cpp:89
 msgid "Anonymize (throw keyid)"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:95
+#: Src/wptFileManagerDlg.cpp:90
 msgid "&Select Key for signing"
 msgstr "&Välj nyckel för signering"
 
-#: ../Src/wptFileManagerDlg.cpp:96
-#: ../Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:282
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../Src/wptFileManagerDlg.cpp:152
+#: Src/wptFileManagerDlg.cpp:147
 msgid "Please select at least one recipient."
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:210
-#: ../Src/wptFileStatDlg.cpp:281
-#: ../Src/wptKeyManager.cpp:426
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileStatDlg.cpp:281
+#: Src/wptKeyManager.cpp:418
 msgid "No valid OpenPGP data found."
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:210
-#: ../Src/wptFileManagerDlg.cpp:225
-#: ../Src/wptKeyManager.cpp:451
+#: Src/wptFileManagerDlg.cpp:205 Src/wptFileManagerDlg.cpp:220
+#: Src/wptKeyManager.cpp:443
 msgid "Key Import"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:216
+#: Src/wptFileManagerDlg.cpp:211
 #, c-format
 msgid "%s contain(s) %d key(s)."
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:220
-#: ../Src/wptFileManagerDlg.cpp:499
-#: ../Src/wptKeyManagerDlg.cpp:966
-#: ../Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:494
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Arkiv"
 
-#: ../Src/wptFileManagerDlg.cpp:242
+#: Src/wptFileManagerDlg.cpp:237
 msgid ""
 "Some of the imported keys are secret keys.\n"
 "\n"
@@ -1484,184 +1270,163 @@
 "set manually via the Key Properties dialog."
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:281
-#: ../Src/wptFileManagerDlg.cpp:328
+#: Src/wptFileManagerDlg.cpp:276 Src/wptFileManagerDlg.cpp:323
 msgid "File Sign"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:278
 msgid "&Normal Signature"
 msgstr "&Normal signatur"
 
-#: ../Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:279
 msgid "&Detached Signature"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:280
 msgid "&Cleartext Signature"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:286
+#: Src/wptFileManagerDlg.cpp:281
 msgid "Signature mode"
 msgstr "Signaturläge"
 
-#: ../Src/wptFileManagerDlg.cpp:328
-#: ../Src/wptKeyEditDlgs.cpp:1306
-#: ../Src/wptKeyEditDlgs.cpp:1365
-#: ../Src/wptKeyEditDlgs.cpp:1438
-#: ../Src/wptKeyManager.cpp:690
-#: ../Src/wptKeyManager.cpp:791
-#: ../Src/wptKeyManager.cpp:824
-#: ../Src/wptKeyManagerDlg.cpp:1710
-#: ../Src/wptKeyManagerDlg.cpp:1726
-#: ../Src/wptKeyManagerDlg.cpp:1754
-#: ../Src/wptKeyManagerDlg.cpp:1765
-#: ../Src/wptKeyManagerDlg.cpp:1780
-#: ../Src/wptKeyManagerDlg.cpp:1893
-#: ../Src/wptKeyManagerDlg.cpp:1912
-#: ../Src/wptKeyserverSearchDlg.cpp:146
+#: Src/wptFileManagerDlg.cpp:323 Src/wptKeyEditDlgs.cpp:1301
+#: Src/wptKeyEditDlgs.cpp:1360 Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyManager.cpp:682 Src/wptKeyManager.cpp:783
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1726 Src/wptKeyManagerDlg.cpp:1754
+#: Src/wptKeyManagerDlg.cpp:1765 Src/wptKeyManagerDlg.cpp:1780
+#: Src/wptKeyManagerDlg.cpp:1893 Src/wptKeyManagerDlg.cpp:1912
+#: Src/wptKeyserverSearchDlg.cpp:146
 msgid "Please select a key."
 msgstr "Välj en nyckel."
 
-#: ../Src/wptFileManagerDlg.cpp:387
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "0 objekt markerat"
 
-#: ../Src/wptFileManagerDlg.cpp:391
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d objekt markerade"
 
-#: ../Src/wptFileManagerDlg.cpp:496
-#: ../Src/wptMainProc.cpp:532
+#: Src/wptFileManagerDlg.cpp:491 Src/wptMainProc.cpp:533
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Filhanterare (använd dra & släpp för att lägga till filer)"
 
-#: ../Src/wptFileManagerDlg.cpp:500
-#: ../Src/wptKeyManagerDlg.cpp:967
-#: ../Src/wptKeyManagerDlg.cpp:972
-#: ../Src/wptKeyManagerDlg.cpp:983
-#: ../Src/wptMainProc.cpp:396
+#: Src/wptFileManagerDlg.cpp:495 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptMainProc.cpp:397
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../Src/wptFileManagerDlg.cpp:501
-#: ../Src/wptKeyManagerDlg.cpp:968
+#: Src/wptFileManagerDlg.cpp:496 Src/wptKeyManagerDlg.cpp:968
 msgid "View"
 msgstr "Visa"
 
-#: ../Src/wptFileManagerDlg.cpp:504
-#: ../Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:499 Src/wptFileManagerDlg.cpp:587
 msgid "Encrypt into ZIP"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:506
-#: ../Src/wptKeyManagerDlg.cpp:984
-#: ../Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptFileManagerDlg.cpp:501 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1034
 msgid "&Sign"
 msgstr "&Signera"
 
-#: ../Src/wptFileManagerDlg.cpp:507
-#: ../Src/wptFileManagerDlg.cpp:596
-#: ../Src/wptMainProc.cpp:402
-#: ../Src/wptMainProc.cpp:406
+#: Src/wptFileManagerDlg.cpp:502 Src/wptFileManagerDlg.cpp:591
+#: Src/wptMainProc.cpp:403 Src/wptMainProc.cpp:407
 msgid "Sign && Encrypt"
 msgstr "Signera && kryptera"
 
-#: ../Src/wptFileManagerDlg.cpp:508
+#: Src/wptFileManagerDlg.cpp:503
 msgid "&Verify"
 msgstr "&Validera"
 
-#: ../Src/wptFileManagerDlg.cpp:509
+#: Src/wptFileManagerDlg.cpp:504
 msgid "S&ymmetric"
 msgstr "S&ymmetrisk"
 
-#: ../Src/wptFileManagerDlg.cpp:510
+#: Src/wptFileManagerDlg.cpp:505
 msgid "&Import"
 msgstr "&Importera"
 
-#: ../Src/wptFileManagerDlg.cpp:511
+#: Src/wptFileManagerDlg.cpp:506
 msgid "E&xport"
 msgstr "E&xportera"
 
-#: ../Src/wptFileManagerDlg.cpp:512
-#: ../Src/wptMainProc.cpp:398
+#: Src/wptFileManagerDlg.cpp:507 Src/wptMainProc.cpp:399
 msgid "Exit"
 msgstr "Avsluta"
 
-#: ../Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:508
 msgid "&Reset"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:509
 msgid "Always on Top"
 msgstr "Alltid överst"
 
-#: ../Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:511
 msgid "&Select All"
 msgstr "&Markera allt"
 
-#: ../Src/wptFileManagerDlg.cpp:517
+#: Src/wptFileManagerDlg.cpp:512
 msgid "&Preferences"
 msgstr "&Inställningar"
 
-#: ../Src/wptFileManagerDlg.cpp:518
-#: ../Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:594
 msgid "Send as Mail"
 msgstr "Skicka som e-post"
 
-#: ../Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:514
 msgid "&List Packets"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:516
 msgid "&Wipe"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:598
+#: Src/wptFileManagerDlg.cpp:593
 msgid "Wipe"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:600
+#: Src/wptFileManagerDlg.cpp:595
 msgid "List Packets"
 msgstr ""
 
-#. XXX: do not hard code values
-#: ../Src/wptFileManagerDlg.cpp:627
+#: Src/wptFileManagerDlg.cpp:622
 msgid "&Calc Digest"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:639
+#: Src/wptFileManagerDlg.cpp:634
 msgid "This command requires admin privileges.\n"
 msgstr "Det här kommandot kräver administrativ behörighet.\n"
 
-#: ../Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:785
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Är du säker på att du vill på ett säkert sätt ta bort dessa filer?"
 
-#: ../Src/wptFileManagerDlg.cpp:791
-#: ../Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:786 Src/wptMainProc.cpp:110
 msgid "&Yes"
 msgstr "&Ja"
 
-#: ../Src/wptFileManagerDlg.cpp:792
-#: ../Src/wptMainProc.cpp:111
+#: Src/wptFileManagerDlg.cpp:787 Src/wptMainProc.cpp:111
 msgid "&No"
 msgstr "&Nej"
 
-#: ../Src/wptFileManagerDlg.cpp:793
+#: Src/wptFileManagerDlg.cpp:788
 msgid "passes"
 msgstr "gånger"
 
-#: ../Src/wptFileManagerDlg.cpp:858
+#: Src/wptFileManagerDlg.cpp:853
 msgid "Operation Status: Error"
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:859
+#: Src/wptFileManagerDlg.cpp:854
 msgid "Operation Status: Done."
 msgstr ""
 
-#: ../Src/wptFileManagerDlg.cpp:902
+#: Src/wptFileManagerDlg.cpp:897
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1670,72 +1435,70 @@
 "Total kapacitet: %12sk\n"
 "Ledigt utrymme : %12sk"
 
-#: ../Src/wptFileSaveDlg.cpp:60
+#: Src/wptFileSaveDlg.cpp:60
 msgid "&Save additional information"
 msgstr "&Spara ytterligare information"
 
-#: ../Src/wptFileSaveDlg.cpp:61
+#: Src/wptFileSaveDlg.cpp:61
 msgid "Save to &file"
 msgstr "Spara till &fil"
 
-#: ../Src/wptFileSaveDlg.cpp:62
+#: Src/wptFileSaveDlg.cpp:62
 msgid "Send to &clipboard"
 msgstr "Skicka till &urklipp"
 
-#: ../Src/wptFileSaveDlg.cpp:71
+#: Src/wptFileSaveDlg.cpp:71
 msgid "Destination for Plaintext"
 msgstr ""
 
-#: ../Src/wptFileSaveDlg.cpp:81
+#: Src/wptFileSaveDlg.cpp:81
 msgid "Please enter a filename."
 msgstr "Ange ett filnamn."
 
-#: ../Src/wptFileSaveDlg.cpp:85
-#: ../Src/wptKeyRevokeDlg.cpp:171
+#: Src/wptFileSaveDlg.cpp:85 Src/wptKeyRevokeDlg.cpp:171
 msgid "The file name contains one or more illegal characters."
 msgstr "Filnamnet innehåller ett eller flera felaktiga tecken."
 
-#: ../Src/wptFileSaveDlg.cpp:98
-#: ../Src/wptFileSaveDlg.cpp:120
+#: Src/wptFileSaveDlg.cpp:98 Src/wptFileSaveDlg.cpp:120
 msgid "Finished"
 msgstr ""
 
-#: ../Src/wptFileVerifyDlg.cpp:51
+#: Src/wptFileVerifyDlg.cpp:51
 msgid "File Verify"
 msgstr ""
 
-#: ../Src/wptFirstRunDlg.cpp:44
+#: Src/wptFirstRunDlg.cpp:44
 msgid "&Generate a GnuPG key pair"
 msgstr "&Generera ett GnuPG-nyckelpar"
 
-#: ../Src/wptFirstRunDlg.cpp:46
+#: Src/wptFirstRunDlg.cpp:46
 msgid "&Copy GnuPG keyrings from another location"
 msgstr "&Kopiera GnuPG-nyckelringar från en annan plats"
 
-#: ../Src/wptFirstRunDlg.cpp:48
+#: Src/wptFirstRunDlg.cpp:48
 msgid "WinPT First Start"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:843
+#: Src/wptGPG.cpp:843
 msgid ""
 "The selected keyring has the read-only file\n"
 "attribute. In this state you do not have write\n"
 "access. Do you want to remove the attribute?"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:846
+#: Src/wptGPG.cpp:846
 msgid "GPG Information"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:850
+#: Src/wptGPG.cpp:850
 msgid "Could not reset read-only state."
 msgstr ""
 
-#: ../Src/wptGPG.cpp:851
+#: Src/wptGPG.cpp:851
 msgid "GPG Error"
 msgstr "GPG-fel"
 
-#: ../Src/wptGPG.cpp:863
+#: Src/wptGPG.cpp:863
 msgid ""
 "You do not have file access to modify the contents of\n"
 "one or both of the selected keyrings.\n"
@@ -1744,167 +1507,148 @@
 "caused by another program which already opened the files.\n"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:868
+#: Src/wptGPG.cpp:868
 msgid "GPG Warning"
 msgstr "GPG-varning"
 
-#: ../Src/wptGPG.cpp:896
-#: ../Src/wptGPGPrefsDlg.cpp:222
-#: ../Src/wptGPGPrefsDlg.cpp:228
-#: ../Src/wptGPGPrefsDlg.cpp:234
-#: ../Src/wptGPGPrefsDlg.cpp:240
-#: ../Src/wptGPGPrefsDlg.cpp:245
-#: ../Src/wptGPGPrefsDlg.cpp:250
-#: ../Src/wptGPGPrefsDlg.cpp:256
-#: ../Src/wptGPGPrefsDlg.cpp:270
-#: ../Src/wptKeyEditDlgs.cpp:1739
-#: ../Src/wptMainProc.cpp:419
-#: ../Src/wptPreferencesDlg.cpp:209
-#: ../Src/wptPreferencesDlg.cpp:254
-#: ../Src/wptPreferencesDlg.cpp:266
-#: ../Src/wptPreferencesDlg.cpp:287
-#: ../Src/wptPreferencesDlg.cpp:315
-#: ../Src/wptRegistry.cpp:596
+#: Src/wptGPG.cpp:896 Src/wptGPGPrefsDlg.cpp:231 Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:259
+#: Src/wptGPGPrefsDlg.cpp:265 Src/wptGPGPrefsDlg.cpp:279
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptMainProc.cpp:420
+#: Src/wptPreferencesDlg.cpp:209 Src/wptPreferencesDlg.cpp:254
+#: Src/wptPreferencesDlg.cpp:266 Src/wptPreferencesDlg.cpp:287
+#: Src/wptPreferencesDlg.cpp:315 Src/wptRegistry.cpp:596
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../Src/wptGPG.cpp:897
+#: Src/wptGPG.cpp:897
 #, c-format
 msgid ""
 "%s does not exit.\n"
 "Do you want to create this directory?"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:925
+#: Src/wptGPG.cpp:925
 msgid "Please choose your Public Keyring"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:928
-#: ../Src/wptGPG.cpp:950
+#: Src/wptGPG.cpp:928 Src/wptGPG.cpp:950
 msgid "No keyring was chosen. Exit."
 msgstr ""
 
-#: ../Src/wptGPG.cpp:935
+#: Src/wptGPG.cpp:935
 msgid "Overwrite old public keyring?"
 msgstr "Skriv över gammal publik nyckelring?"
 
-#: ../Src/wptGPG.cpp:941
-#: ../Src/wptGPG.cpp:962
+#: Src/wptGPG.cpp:941 Src/wptGPG.cpp:962
 msgid "Could not copy file."
 msgstr "Kunde inte kopiera fil."
 
-#: ../Src/wptGPG.cpp:947
+#: Src/wptGPG.cpp:947
 msgid "Please choose your Secret Keyring"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:956
+#: Src/wptGPG.cpp:956
 msgid "Overwrite old secret keyring?"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:1002
-#: ../Src/wptGPG.cpp:1095
-#: ../Src/wptGPG.cpp:1111
+#: Src/wptGPG.cpp:1002 Src/wptGPG.cpp:1095 Src/wptGPG.cpp:1111
 msgid "Backup"
 msgstr "Säkerhetskopiera"
 
-#: ../Src/wptGPG.cpp:1002
+#: Src/wptGPG.cpp:1002
 #, c-format
 msgid "Backup keyring \"%s\" failed"
 msgstr ""
 
-#: ../Src/wptGPG.cpp:1096
+#: Src/wptGPG.cpp:1096
 #, c-format
 msgid ""
 "The backup drive '%s' does not seems to be accessable.\n"
 "Please insert/check the drive to continue."
 msgstr ""
 
-#: ../Src/wptGPG.cpp:1111
+#: Src/wptGPG.cpp:1111
 #, c-format
 msgid "Invalid backup mode %d"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:283
+#: Src/wptGPGME.cpp:283
 msgid "Error during verification process"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:284
+#: Src/wptGPGME.cpp:284
 msgid "The signature is good"
 msgstr "Signaturen är korrekt"
 
-#: ../Src/wptGPGME.cpp:285
+#: Src/wptGPGME.cpp:285
 msgid "The signature is BAD!"
 msgstr "Signaturen är FELAKTIG!"
 
-#: ../Src/wptGPGME.cpp:286
+#: Src/wptGPGME.cpp:286
 msgid "The signature could not be checked due to a missing key"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:287
+#: Src/wptGPGME.cpp:287
 msgid "No valid OpenPGP signature"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:288
+#: Src/wptGPGME.cpp:288
 msgid "Signature Error"
 msgstr "Signaturfel"
 
-#: ../Src/wptGPGME.cpp:289
+#: Src/wptGPGME.cpp:289
 msgid "Good signature (Expired Key)"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:290
+#: Src/wptGPGME.cpp:290
 msgid "Good signature (Revoked Key)"
 msgstr ""
 
-#: ../Src/wptGPGME.cpp:291
+#: Src/wptGPGME.cpp:291
 msgid "Good signature (Expired)"
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:42
+#: Src/wptGPGOptDlg.cpp:42
 msgid "Could not load GnuPG config file!"
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:43
-#: ../Src/wptGPGOptDlg.cpp:62
-#: ../Src/wptGPGOptDlg.cpp:72
-#: ../Src/wptGPGOptDlg.cpp:78
-#: ../Src/wptGPGOptDlg.cpp:85
-#: ../Src/wptGPGOptDlg.cpp:88
-#: ../Src/wptGPGOptDlg.cpp:95
-#: ../Src/wptGPGOptDlg.cpp:102
+#: Src/wptGPGOptDlg.cpp:43 Src/wptGPGOptDlg.cpp:62 Src/wptGPGOptDlg.cpp:72
+#: Src/wptGPGOptDlg.cpp:78 Src/wptGPGOptDlg.cpp:85 Src/wptGPGOptDlg.cpp:88
+#: Src/wptGPGOptDlg.cpp:95 Src/wptGPGOptDlg.cpp:102
 msgid "GPG Config"
 msgstr "GPG-konfiguration"
 
-#: ../Src/wptGPGOptDlg.cpp:48
+#: Src/wptGPGOptDlg.cpp:48
 msgid "GnuPG Configuration File"
 msgstr "Konfigurationsfil för GnuPG"
 
-#: ../Src/wptGPGOptDlg.cpp:50
-#: ../Src/wptTextInputDlg.cpp:87
+#: Src/wptGPGOptDlg.cpp:50 Src/wptTextInputDlg.cpp:87
 msgid "&Load"
 msgstr "&Läs in"
 
-#: ../Src/wptGPGOptDlg.cpp:61
+#: Src/wptGPGOptDlg.cpp:61
 msgid "The 'gpg.conf' file is not loaded."
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:71
+#: Src/wptGPGOptDlg.cpp:71
 msgid "Config contains invalid GnuPG keywords."
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:77
+#: Src/wptGPGOptDlg.cpp:77
 msgid "Could not save GnuPG config file."
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:85
+#: Src/wptGPGOptDlg.cpp:85
 msgid "Successfully saved."
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:87
+#: Src/wptGPGOptDlg.cpp:87
 msgid "GnuPG returned an error while parsing the config file."
 msgstr ""
 
-#: ../Src/wptGPGOptDlg.cpp:94
+#: Src/wptGPGOptDlg.cpp:94
 msgid ""
 "Current data will be lost!\n"
 "Are you sure?"
@@ -1912,163 +1656,124 @@
 "Aktuellt data kommer att förloras!\n"
 "Är du säker?"
 
-#: ../Src/wptGPGOptDlg.cpp:101
+#: Src/wptGPGOptDlg.cpp:101
 msgid "Could not load GnuPG config file."
 msgstr ""
 
-#: ../Src/wptGPGPrefsDlg.cpp:152
-#: ../Src/wptKeyManagerDlg.cpp:1865
-#: ../Src/wptMainProc.cpp:580
+#: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "Inställningar för GnuPG"
 
-#: ../Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:154
 msgid "GnuPG home directory  (where both keyrings are located)"
 msgstr "Hemkatalog för GnuPG  (där båda nyckelringarna finns)"
 
-#: ../Src/wptGPGPrefsDlg.cpp:156
+#: Src/wptGPGPrefsDlg.cpp:156
 msgid "GnuPG exe file location (full path with added gpg.exe)"
 msgstr "Plats för körbar GnuPG-binärfil (fullständig sökväg inklusive gpg.exe)"
 
-#: ../Src/wptGPGPrefsDlg.cpp:158
+#: Src/wptGPGPrefsDlg.cpp:158
 msgid "Locale directory (to access the translation files)"
 msgstr "Lokalkatalog (för att komma åt översättningsfilerna)"
 
-#: ../Src/wptGPGPrefsDlg.cpp:159
+#: Src/wptGPGPrefsDlg.cpp:159
 msgid "Ask for the signature class during key sign"
 msgstr "Fråga efter signaturklassen under nyckelsignering"
 
-#: ../Src/wptGPGPrefsDlg.cpp:160
+#: Src/wptGPGPrefsDlg.cpp:160
 msgid "Allow to set an expiration date for signatures"
 msgstr "Tillåt att ett utgångsdatum ställs in för signaturer"
 
-#: ../Src/wptGPGPrefsDlg.cpp:161
+#: Src/wptGPGPrefsDlg.cpp:161
 msgid "Comment in armored files"
 msgstr "Kommentar i ASCII-skalfiler"
 
-#: ../Src/wptGPGPrefsDlg.cpp:162
+#: Src/wptGPGPrefsDlg.cpp:162
 msgid "Encrypt to this key"
 msgstr "Kryptera till den här nyckeln"
 
-#: ../Src/wptGPGPrefsDlg.cpp:163
+#: Src/wptGPGPrefsDlg.cpp:163
 msgid "General GPG options"
 msgstr "Allmänna GPG-alternativ"
 
-#: ../Src/wptGPGPrefsDlg.cpp:164
-#: ../Src/wptGPGPrefsDlg.cpp:165
-#: ../Src/wptGPGPrefsDlg.cpp:166
-#: ../Src/wptPreferencesDlg.cpp:116
-#: ../Src/wptPreferencesDlg.cpp:117
+#: Src/wptGPGPrefsDlg.cpp:164 Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:166 Src/wptPreferencesDlg.cpp:116
+#: Src/wptPreferencesDlg.cpp:117
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: ../Src/wptGPGPrefsDlg.cpp:167
+#: Src/wptGPGPrefsDlg.cpp:167
 msgid "&Overwrite default settings"
 msgstr "S&kriv över standardinställningar"
 
-#: ../Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter the GnuPG home directory."
 msgstr "Ange hemkatalogen för GnuPG."
 
-#: ../Src/wptGPGPrefsDlg.cpp:233
+#: Src/wptGPGPrefsDlg.cpp:242
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "Kunde inte spara \"HomeDir\" i registret."
 
-#: ../Src/wptGPGPrefsDlg.cpp:239
+#: Src/wptGPGPrefsDlg.cpp:248
 msgid "Please enter where GPG.exe is located."
 msgstr "Ange var GPG.exe finns någonstans."
 
-#: ../Src/wptGPGPrefsDlg.cpp:244
+#: Src/wptGPGPrefsDlg.cpp:253
 msgid "Could not find the GPG program in this directory."
 msgstr "Kunde inte hitta GPG-programmet i den här katalogen."
 
-#: ../Src/wptGPGPrefsDlg.cpp:249
+#: Src/wptGPGPrefsDlg.cpp:258
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "Kunde inte spara \"gpgProgram\" i registret"
 
-#: ../Src/wptGPGPrefsDlg.cpp:269
+#: Src/wptGPGPrefsDlg.cpp:278
 msgid "Could not get GPG config file"
 msgstr ""
 
-#: ../Src/wptGPGPrefsDlg.cpp:319
+#: Src/wptGPGPrefsDlg.cpp:328
 msgid "Choose GPG Home Directory"
 msgstr "Välj hemkatalog för GPG"
 
-#: ../Src/wptGPGPrefsDlg.cpp:343
+#: Src/wptGPGPrefsDlg.cpp:352
 msgid "Choose GPG Binary"
 msgstr "Välj GPG-binärfil"
 
-#. XXX: do not allow to delete the self signature
-#: ../Src/wptGroupManager.cpp:244
-#: ../Src/wptGroupManager.cpp:274
-#: ../Src/wptImagelist.cpp:52
-#: ../Src/wptKeyManager.cpp:186
-#: ../Src/wptKeyManager.cpp:191
-#: ../Src/wptKeyManager.cpp:240
-#: ../Src/wptKeyManager.cpp:283
-#: ../Src/wptKeyManager.cpp:295
-#: ../Src/wptKeyManager.cpp:326
-#: ../Src/wptKeyManager.cpp:331
-#: ../Src/wptKeyManager.cpp:338
-#: ../Src/wptKeyManager.cpp:340
-#: ../Src/wptKeyManager.cpp:361
-#: ../Src/wptKeyManager.cpp:370
-#: ../Src/wptKeyManager.cpp:374
-#: ../Src/wptKeyManager.cpp:394
-#: ../Src/wptKeyManager.cpp:419
-#: ../Src/wptKeyManager.cpp:424
-#: ../Src/wptKeyManager.cpp:427
-#: ../Src/wptKeyManager.cpp:432
-#: ../Src/wptKeyManager.cpp:438
-#: ../Src/wptKeyManager.cpp:443
-#: ../Src/wptKeyManager.cpp:690
-#: ../Src/wptKeyManager.cpp:718
-#: ../Src/wptKeyManager.cpp:727
-#: ../Src/wptKeyManager.cpp:738
-#: ../Src/wptKeyManager.cpp:764
-#: ../Src/wptKeyManager.cpp:791
-#: ../Src/wptKeyManager.cpp:796
-#: ../Src/wptKeyManager.cpp:819
-#: ../Src/wptKeyManager.cpp:824
-#: ../Src/wptKeyManager.cpp:838
-#: ../Src/wptKeyManager.cpp:898
-#: ../Src/wptKeyManager.cpp:903
-#: ../Src/wptKeyManager.cpp:960
-#: ../Src/wptKeyManager.cpp:993
-#: ../Src/wptKeyManager.cpp:1077
-#: ../Src/wptKeyManagerDlg.cpp:1357
-#: ../Src/wptKeyManagerDlg.cpp:1368
-#: ../Src/wptKeyManagerDlg.cpp:1378
-#: ../Src/wptKeyManagerDlg.cpp:1688
-#: ../Src/wptKeyManagerDlg.cpp:1711
-#: ../Src/wptKeyManagerDlg.cpp:1726
-#: ../Src/wptKeyManagerDlg.cpp:1736
-#: ../Src/wptKeyManagerDlg.cpp:1744
-#: ../Src/wptKeyManagerDlg.cpp:1754
-#: ../Src/wptKeyManagerDlg.cpp:1765
-#: ../Src/wptKeyManagerDlg.cpp:1780
-#: ../Src/wptKeyManagerDlg.cpp:1797
-#: ../Src/wptKeyManagerDlg.cpp:1829
-#: ../Src/wptKeyManagerDlg.cpp:1894
-#: ../Src/wptKeyManagerDlg.cpp:1912
-#: ../Src/wptKeyManagerDlg.cpp:1917
-#: ../Src/wptKeyManagerDlg.cpp:1922
-#: ../Src/wptKeyManagerDlg.cpp:1998
-#: ../Src/wptKeyManagerDlg.cpp:2003
-#: ../Src/wptKeyManagerDlg.cpp:2117
-#: ../Src/wptKeysigDlg.cpp:94
-#: ../Src/wptKeysigDlg.cpp:106
-#: ../Src/wptKeysigDlg.cpp:317
-#: ../Src/wptKeysigDlg.cpp:389
-#: ../Src/wptKeysigDlg.cpp:399
-#: ../Src/wptKeysigDlg.cpp:442
-#: ../Src/wptMainProc.cpp:394
-#: ../Src/wptMainProc.cpp:543
-#: ../Src/wptMainProc.cpp:551
+#: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
+#: Src/wptKeyManager.cpp:232 Src/wptKeyManager.cpp:275
+#: Src/wptKeyManager.cpp:287 Src/wptKeyManager.cpp:318
+#: Src/wptKeyManager.cpp:323 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:332 Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:362 Src/wptKeyManager.cpp:366
+#: Src/wptKeyManager.cpp:386 Src/wptKeyManager.cpp:411
+#: Src/wptKeyManager.cpp:416 Src/wptKeyManager.cpp:419
+#: Src/wptKeyManager.cpp:424 Src/wptKeyManager.cpp:430
+#: Src/wptKeyManager.cpp:435 Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:710 Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:730 Src/wptKeyManager.cpp:756
+#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:788
+#: Src/wptKeyManager.cpp:811 Src/wptKeyManager.cpp:816
+#: Src/wptKeyManager.cpp:830 Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:895 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManager.cpp:1068
+#: Src/wptKeyManagerDlg.cpp:1357 Src/wptKeyManagerDlg.cpp:1368
+#: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1688
+#: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptKeyManagerDlg.cpp:1736 Src/wptKeyManagerDlg.cpp:1744
+#: Src/wptKeyManagerDlg.cpp:1754 Src/wptKeyManagerDlg.cpp:1765
+#: Src/wptKeyManagerDlg.cpp:1780 Src/wptKeyManagerDlg.cpp:1797
+#: Src/wptKeyManagerDlg.cpp:1829 Src/wptKeyManagerDlg.cpp:1894
+#: Src/wptKeyManagerDlg.cpp:1912 Src/wptKeyManagerDlg.cpp:1917
+#: Src/wptKeyManagerDlg.cpp:1922 Src/wptKeyManagerDlg.cpp:1998
+#: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeyManagerDlg.cpp:2117
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
+#: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
+#: Src/wptMainProc.cpp:395 Src/wptMainProc.cpp:544 Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "Nyckelhanterare"
 
-#: ../Src/wptGroupManager.cpp:245
+#: Src/wptGroupManager.cpp:245
 #, c-format
 msgid ""
 "Do you really want to delete this group?\n"
@@ -2079,7 +1784,7 @@
 "\n"
 "%s"
 
-#: ../Src/wptGroupManager.cpp:272
+#: Src/wptGroupManager.cpp:272
 #, c-format
 msgid ""
 "Do you really want to delete this entry?\n"
@@ -2087,206 +1792,170 @@
 "%s"
 msgstr ""
 
-#: ../Src/wptGroupsDlg.cpp:53
+#: Src/wptGroupsDlg.cpp:53
 msgid "New Group"
 msgstr "Ny grupp"
 
-#: ../Src/wptGroupsDlg.cpp:69
+#: Src/wptGroupsDlg.cpp:69
 msgid "Please enter the email address"
 msgstr "Ange e-postadressen"
 
-#: ../Src/wptGroupsDlg.cpp:69
+#: Src/wptGroupsDlg.cpp:69
 msgid "Group manager"
 msgstr "Grupphanterare"
 
-#: ../Src/wptHotkey.cpp:61
+#: Src/wptHotkey.cpp:61
 msgid "Clipboard Encrypt (ALT+CTRL+E)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:62
+#: Src/wptHotkey.cpp:62
 msgid "Clipboard Decrypt/Verify (ALT+CTRL+D)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:63
+#: Src/wptHotkey.cpp:63
 msgid "Clipboard Sign (ALT+CTRL+S)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:64
+#: Src/wptHotkey.cpp:64
 msgid "Clipboard Sign Encrypt (ALT+CTRL+B)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:65
+#: Src/wptHotkey.cpp:65
 msgid "Current Window Encrypt (ALT+SHIFT+E)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:66
+#: Src/wptHotkey.cpp:66
 msgid "Current Window Decrypt/Verify (ALT+SHIFT+D)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:67
+#: Src/wptHotkey.cpp:67
 msgid "Current Window Sign (ALT+SHIFT+S)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:68
+#: Src/wptHotkey.cpp:68
 msgid "Current Window Sign Encrypt (ALT+SHIFT+B)"
 msgstr ""
 
-#: ../Src/wptHotkey.cpp:69
+#: Src/wptHotkey.cpp:69
 msgid "Unknown Hotkey"
 msgstr "Okänd snabbtangent"
 
-#: ../Src/wptImportList.cpp:268
-#: ../Src/wptKeyEditDlgs.cpp:257
-#: ../Src/wptKeyEditDlgs.cpp:1134
-#: ../Src/wptKeyEditDlgs.cpp:1184
-#: ../Src/wptKeyEditDlgs.cpp:1450
-#: ../Src/wptKeyEditDlgs.cpp:1470
-#: ../Src/wptKeyEditDlgs.cpp:1509
-#: ../Src/wptKeyEditDlgs.cpp:1540
-#: ../Src/wptKeyEditDlgs.cpp:1618
-#: ../Src/wptKeyEditDlgs.cpp:1784
-#: ../Src/wptKeyEditDlgs.cpp:1986
-#: ../Src/wptKeylist.cpp:425
-#: ../Src/wptKeylist.cpp:459
-#: ../Src/wptKeyPropsDlg.cpp:152
-#: ../Src/wptKeysigDlg.cpp:158
-#: ../Src/wptKeysigDlg.cpp:215
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:252
+#: Src/wptKeyEditDlgs.cpp:1129 Src/wptKeyEditDlgs.cpp:1179
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1465
+#: Src/wptKeyEditDlgs.cpp:1504 Src/wptKeyEditDlgs.cpp:1535
+#: Src/wptKeyEditDlgs.cpp:1613 Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeylist.cpp:407 Src/wptKeylist.cpp:441
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
+#: Src/wptKeysigDlg.cpp:215
 msgid "Revoked"
 msgstr "Spärrat"
 
-#: ../Src/wptImportList.cpp:270
-#: ../Src/wptKeyEditDlgs.cpp:259
-#: ../Src/wptKeyEditDlgs.cpp:1132
-#: ../Src/wptKeyEditDlgs.cpp:1372
-#: ../Src/wptKeylist.cpp:427
-#: ../Src/wptKeylist.cpp:457
-#: ../Src/wptKeyPropsDlg.cpp:150
-#: ../Src/wptKeysigDlg.cpp:157
-#: ../Src/wptKeysigDlg.cpp:216
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:254
+#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeylist.cpp:409 Src/wptKeylist.cpp:439 Src/wptKeyPropsDlg.cpp:150
+#: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
 msgid "Expired"
 msgstr "Utgånget"
 
-#: ../Src/wptImportList.cpp:274
+#: Src/wptImportList.cpp:271
 msgid "secret key"
 msgstr "hemlig nyckel"
 
-#: ../Src/wptImportList.cpp:276
-#: ../Src/wptKeylist.cpp:463
+#: Src/wptImportList.cpp:271 Src/wptKeylist.cpp:450
 msgid "public key"
 msgstr "publik nyckel"
 
-#: ../Src/wptImportList.cpp:306
-#: ../Src/wptKeyEditDlgs.cpp:1192
+#: Src/wptImportList.cpp:289 Src/wptKeyEditDlgs.cpp:1187
 msgid "Invalid user ID"
 msgstr "Ogiltig användaridentitet"
 
-#: ../Src/wptImportList.cpp:346
-#: ../Src/wptKeylist.cpp:580
-#: ../Src/wptKeylist.cpp:588
-#: ../Src/wptKeyManagerDlg.cpp:910
-#: ../Src/wptKeyManagerDlg.cpp:980
-#: ../Src/wptKeyserverSearchDlg.cpp:58
-#: ../Src/wptSigList.cpp:53
-#: ../Src/wptVerifyList.cpp:173
+#: Src/wptImportList.cpp:327 Src/wptKeylist.cpp:566 Src/wptKeylist.cpp:574
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
+#: Src/wptVerifyList.cpp:143
 msgid "User ID"
 msgstr "Användaridentitet"
 
-#: ../Src/wptImportList.cpp:347
-#: ../Src/wptKeylist.cpp:582
-#: ../Src/wptKeylist.cpp:591
-#: ../Src/wptKeyManagerDlg.cpp:913
-#: ../Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptImportList.cpp:328 Src/wptKeylist.cpp:568 Src/wptKeylist.cpp:577
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "Storlek"
 
-#: ../Src/wptImportList.cpp:348
-#: ../Src/wptKeyEditDlgs.cpp:1077
-#: ../Src/wptKeylist.cpp:581
-#: ../Src/wptKeylist.cpp:589
-#: ../Src/wptKeyManagerDlg.cpp:911
-#: ../Src/wptKeyManagerDlg.cpp:1004
-#: ../Src/wptKeyRevokersDlg.cpp:58
-#: ../Src/wptKeyserverSearchDlg.cpp:56
-#: ../Src/wptSigList.cpp:57
-#: ../Src/wptVerifyList.cpp:172
+#: Src/wptImportList.cpp:329 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeylist.cpp:567 Src/wptKeylist.cpp:575 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
+#: Src/wptVerifyList.cpp:142
 msgid "Key ID"
 msgstr "Nyckelidentitet"
 
-#: ../Src/wptImportList.cpp:349
-#: ../Src/wptKeyEditDlgs.cpp:1078
-#: ../Src/wptKeyEditDlgs.cpp:1163
-#: ../Src/wptKeylist.cpp:595
-#: ../Src/wptKeyManagerDlg.cpp:917
-#: ../Src/wptKeyManagerDlg.cpp:1007
-#: ../Src/wptKeyserverSearchDlg.cpp:57
-#: ../Src/wptSigList.cpp:56
+#: Src/wptImportList.cpp:330 Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:581
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "Skapad"
 
-#: ../Src/wptImportList.cpp:350
-#: ../Src/wptKeylist.cpp:590
-#: ../Src/wptKeyManagerDlg.cpp:912
-#: ../Src/wptKeyManagerDlg.cpp:1006
+#: Src/wptImportList.cpp:331 Src/wptKeylist.cpp:576
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
 msgid "Type"
 msgstr "Typ"
 
-#: ../Src/wptImportList.cpp:421
+#: Src/wptImportList.cpp:402
 msgid ""
 "It is possible that the ASCII-Armor is damaged\n"
 "and thus causing a CRC error."
 msgstr ""
 
-#: ../Src/wptKeyCache.cpp:819
+#: Src/wptKeyCache.cpp:819
 msgid "Load GPG Keyrings..."
 msgstr "Läs in GPG-nyckelringar..."
 
-#: ../Src/wptKeyCacheDlg.cpp:50
+#: Src/wptKeyCacheDlg.cpp:50
 msgid "WinPT Key Caching"
 msgstr ""
 
-#: ../Src/wptKeyCacheDlg.cpp:53
+#: Src/wptKeyCacheDlg.cpp:53
 msgid "Caching keyrings, please wait..."
 msgstr "Cachar nyckelringar, vänta..."
 
-#. XXX: should we use gpg_check_return_code() to suggest
-#. to check the config file in case of errors??
-#: ../Src/wptKeyCacheDlg.cpp:70
+#: Src/wptKeyCacheDlg.cpp:70
 msgid "Key Cache"
 msgstr "Nyckelcache"
 
-#: ../Src/wptKeyEditDlgs.cpp:228
-#: ../Src/wptKeylist.cpp:392
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeylist.cpp:374
 msgid "Ultimate"
 msgstr "Förbehållslös"
 
-#: ../Src/wptKeyEditDlgs.cpp:243
-#: ../Src/wptKeyEditDlgs.cpp:1130
-#: ../Src/wptKeylist.cpp:244
-#: ../Src/wptKeylist.cpp:386
+#: Src/wptKeyEditDlgs.cpp:238 Src/wptKeyEditDlgs.cpp:1125
+#: Src/wptKeylist.cpp:230 Src/wptKeylist.cpp:368
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../Src/wptKeyEditDlgs.cpp:261
-#: ../Src/wptKeyEditDlgs.cpp:1136
+#: Src/wptKeyEditDlgs.cpp:256 Src/wptKeyEditDlgs.cpp:1131
 msgid "OK"
 msgstr "OK"
 
-#: ../Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:278
 msgid "user ID"
 msgstr "användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:284
+#: Src/wptKeyEditDlgs.cpp:279
 #, c-format
 msgid ""
 "Could not get key information for: \"%s\":\n"
 "%s"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:356
-msgid "Remember that the image is stored within your public key.  If you use a very large picture, your key will become very large as well! Keeping the image close to 240x288 is advised."
+#: Src/wptKeyEditDlgs.cpp:351
+msgid ""
+"Remember that the image is stored within your public key.  If you use a very "
+"large picture, your key will become very large as well! Keeping the image "
+"close to 240x288 is advised."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:357
+#: Src/wptKeyEditDlgs.cpp:352
 msgid ""
 "Pick an image to use for your photo ID.\n"
 "The image must be a JPEG file."
@@ -2294,39 +1963,35 @@
 "Välj en bild att använda för din fotoidentifikation.\n"
 "Bilden måste vara en JPEG-fil."
 
-#: ../Src/wptKeyEditDlgs.cpp:358
-#: ../Src/wptKeyEditDlgs.cpp:439
-#: ../Src/wptKeysignDlg.cpp:361
+#: Src/wptKeyEditDlgs.cpp:353 Src/wptKeyEditDlgs.cpp:434
+#: Src/wptKeysignDlg.cpp:417
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: ../Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:355
 msgid "Add Photo ID"
 msgstr "Lägg till fotoidentifikation"
 
-#: ../Src/wptKeyEditDlgs.cpp:367
+#: Src/wptKeyEditDlgs.cpp:362
 msgid "Select Image File"
 msgstr "Välj bildfil"
 
-#: ../Src/wptKeyEditDlgs.cpp:371
-#: ../Src/wptKeyEditDlgs.cpp:382
-#: ../Src/wptKeyEditDlgs.cpp:388
-#: ../Src/wptKeyEditDlgs.cpp:400
-#: ../Src/wptKeyEditDlgs.cpp:903
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383 Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:898
 msgid "Add Photo"
 msgstr "Lägg till foto"
 
-#: ../Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:367
 #, c-format
 msgid "'%s' is not a valid JPEG file."
 msgstr "\"%s\" är inte en giltig JPEG-fil."
 
-#: ../Src/wptKeyEditDlgs.cpp:381
-#: ../Src/wptKeyRevokeDlg.cpp:166
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:166
 msgid "Please enter a file name."
 msgstr "Ange ett filnamn."
 
-#: ../Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:381
 msgid ""
 "The JPEG is really large.\n"
 "Are you sure you want to use it?"
@@ -2334,213 +1999,187 @@
 "JPEG-filen är verkligen stor.\n"
 "Är du säker på att du vill använda den?"
 
-#: ../Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:400
 msgid "Photo successfully added."
 msgstr "Fotot lades till."
 
-#: ../Src/wptKeyEditDlgs.cpp:406
-#: ../Src/wptKeyEditDlgs.cpp:469
-#: ../Src/wptKeyEditDlgs.cpp:551
-#: ../Src/wptKeyEditDlgs.cpp:725
-#: ../Src/wptKeyEditDlgs.cpp:1472
-#: ../Src/wptKeyEditDlgs.cpp:1542
-#: ../Src/wptKeyEditDlgs.cpp:1592
-#: ../Src/wptKeyEditDlgs.cpp:1640
-#: ../Src/wptKeyEditDlgs.cpp:1838
-#: ../Src/wptKeygenDlg.cpp:499
-#: ../Src/wptKeygenDlg.cpp:600
-#: ../Src/wptKeyPropsDlg.cpp:386
-#: ../Src/wptOwnertrustDlg.cpp:119
-#: ../Src/wptOwnertrustDlg.cpp:131
+#: Src/wptKeyEditDlgs.cpp:401 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:546 Src/wptKeyEditDlgs.cpp:720
+#: Src/wptKeyEditDlgs.cpp:1467 Src/wptKeyEditDlgs.cpp:1537
+#: Src/wptKeyEditDlgs.cpp:1587 Src/wptKeyEditDlgs.cpp:1635
+#: Src/wptKeyEditDlgs.cpp:1833 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:386
+#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "GnuPG-status"
 
-#: ../Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:432
 msgid "Appointing a key as designated revoker cannot be undone."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:438
+#: Src/wptKeyEditDlgs.cpp:433
 msgid "Public key"
 msgstr "Publik nyckel"
 
-#: ../Src/wptKeyEditDlgs.cpp:441
-#: ../Src/wptKeyEditDlgs.cpp:450
-#: ../Src/wptKeyEditDlgs.cpp:463
-#: ../Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:436 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:458 Src/wptKeyEditDlgs.cpp:929
 msgid "Add Revoker"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:450
-#: ../Src/wptKeyEditDlgs.cpp:1504
-#: ../Src/wptKeyEditDlgs.cpp:1561
-#: ../Src/wptKeyEditDlgs.cpp:1614
-#: ../Src/wptKeyEditDlgs.cpp:1772
-#: ../Src/wptKeyEditDlgs.cpp:1812
-#: ../Src/wptKeyEditDlgs.cpp:1982
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1556 Src/wptKeyEditDlgs.cpp:1609
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1977
 msgid "Please select a user ID."
 msgstr "Välj en användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:468
+#: Src/wptKeyEditDlgs.cpp:463
 msgid "Revoker successfully addded."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:502
+#: Src/wptKeyEditDlgs.cpp:497
 msgid "Add new User ID"
 msgstr "Lägg till ny användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:499
 msgid "&Email"
 msgstr "&E-post"
 
-#: ../Src/wptKeyEditDlgs.cpp:505
+#: Src/wptKeyEditDlgs.cpp:500
 msgid "&Comment"
 msgstr "&Kommentar"
 
-#: ../Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:512
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "Ange ett namn (minimum 5 tecken)"
 
-#: ../Src/wptKeyEditDlgs.cpp:518
-#: ../Src/wptKeyEditDlgs.cpp:524
-#: ../Src/wptKeyEditDlgs.cpp:530
-#: ../Src/wptKeyEditDlgs.cpp:535
-#: ../Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:525 Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:544
 msgid "UserID"
 msgstr "Användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:523
-msgid "Please enter the email address in the email field and not in the name field"
+#: Src/wptKeyEditDlgs.cpp:518
+msgid ""
+"Please enter the email address in the email field and not in the name field"
 msgstr "Ange e-postadressen i e-postfältet och inte i namnfältet"
 
-#: ../Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:525
 msgid "Please enter an email address."
 msgstr "Ange en e-postadress."
 
-#: ../Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:530
 msgid "Invalid email address."
 msgstr "Ogiltig e-postadress."
 
-#: ../Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:546
 msgid "user ID successfully added."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:636
-#: ../Src/wptKeyEditDlgs.cpp:839
+#: Src/wptKeyEditDlgs.cpp:631 Src/wptKeyEditDlgs.cpp:834
 msgid "Add new Subkey"
 msgstr "Lägg till ny undernyckel"
 
-#: ../Src/wptKeyEditDlgs.cpp:637
+#: Src/wptKeyEditDlgs.cpp:632
 msgid "Key type"
 msgstr "Nyckeltyp"
 
-#: ../Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:633
 msgid "Size in bits"
 msgstr "Storlek i bitar"
 
-#: ../Src/wptKeyEditDlgs.cpp:639
+#: Src/wptKeyEditDlgs.cpp:634
 msgid "Key expiration"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:684
+#: Src/wptKeyEditDlgs.cpp:679
 msgid "Please select one entry."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:685
-#: ../Src/wptKeyEditDlgs.cpp:691
-#: ../Src/wptKeyEditDlgs.cpp:722
-#: ../Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:680 Src/wptKeyEditDlgs.cpp:686
+#: Src/wptKeyEditDlgs.cpp:717 Src/wptKeyEditDlgs.cpp:817
 msgid "Add Subkey"
 msgstr "Lägg till undernyckel"
 
-#: ../Src/wptKeyEditDlgs.cpp:690
+#: Src/wptKeyEditDlgs.cpp:685
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS använder en fast nyckelstorlek på 1024. Storleken ändrad."
 
-#: ../Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:719
 msgid "Subkey successfully added."
 msgstr "Undernyckel lades till."
 
-#: ../Src/wptKeyEditDlgs.cpp:752
-#: ../Src/wptKeyEditDlgs.cpp:821
-#: ../Src/wptKeyEditDlgs.cpp:902
-#: ../Src/wptKeyEditDlgs.cpp:934
-#: ../Src/wptKeyEditDlgs.cpp:1016
-#: ../Src/wptKeyEditDlgs.cpp:1360
-#: ../Src/wptKeyEditDlgs.cpp:1433
-#: ../Src/wptKeyEditDlgs.cpp:1493
-#: ../Src/wptKeyManagerDlg.cpp:1743
+#: Src/wptKeyEditDlgs.cpp:747 Src/wptKeyEditDlgs.cpp:816
+#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
+#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1355
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyManagerDlg.cpp:1743
 msgid "There is no secret key available!"
 msgstr "Det finns ingen hemlig nyckel tillgänglig!"
 
-#: ../Src/wptKeyEditDlgs.cpp:753
-#: ../Src/wptKeyEditDlgs.cpp:772
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:767
 msgid "Add user ID"
 msgstr "Lägg till användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:875
 msgid "Preferred keyserver successfully set."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:969
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:55
-#: ../Src/wptKeyPropsDlg.cpp:377
+#: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:377
 msgid "Change Ownertrust"
 msgstr "Ändra ägartillit"
 
-#: ../Src/wptKeyEditDlgs.cpp:972
-#: ../Src/wptKeyManager.cpp:238
+#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyManager.cpp:230
 msgid "Key status changed."
 msgstr "Nyckelstatus ändrad."
 
-#: ../Src/wptKeyEditDlgs.cpp:1022
+#: Src/wptKeyEditDlgs.cpp:1017
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1029
+#: Src/wptKeyEditDlgs.cpp:1024
 msgid "Current (old) Passphrase"
 msgstr "Aktuell (gammal) lösenfras"
 
-#: ../Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1029
 msgid "New Passphrase"
 msgstr "Ny lösenfras"
 
-#: ../Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1037
 msgid ""
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, continue?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1058
+#: Src/wptKeyEditDlgs.cpp:1053
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: ../Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1055
 msgid "Passphrase successfully changed."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1076
-#: ../Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../Src/wptKeyEditDlgs.cpp:1079
+#: Src/wptKeyEditDlgs.cpp:1074
 msgid "Expires"
 msgstr "Går ut"
 
-#: ../Src/wptKeyEditDlgs.cpp:1160
-#: ../Src/wptKeylist.cpp:584
-#: ../Src/wptKeylist.cpp:593
-#: ../Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:570 Src/wptKeylist.cpp:579
+#: Src/wptKeyManagerDlg.cpp:915
 msgid "Validity"
 msgstr "Giltighet"
 
-#: ../Src/wptKeyEditDlgs.cpp:1162
+#: Src/wptKeyEditDlgs.cpp:1157
 msgid "Email"
 msgstr "E-post"
 
-#: ../Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1245
 msgid ""
 "ADDUID      add a user ID\r\n"
 "ADDPHOTO    add a photo ID\r\n"
@@ -2564,28 +2203,27 @@
 "MINIMIZE    remove all signatures from key\r\n"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1266
 msgid "Key Edit Help"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1301
-#: ../Src/wptKeyEditDlgs.cpp:1310
+#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1305
 msgid "Primary key can not be deleted!"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1313
 msgid ""
 "Anything encrypted to the selected subkey cannot be\n"
 "decrypted any longer."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1321
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid ""
 "Anything signed by the selected subkey cannot be\n"
 "verified any longer."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1327
+#: Src/wptKeyEditDlgs.cpp:1322
 #, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -2595,35 +2233,34 @@
 "Do you really want to delete this subkey?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1331
 msgid "Delete Subkey"
 msgstr "Ta bort undernyckel"
 
-#: ../Src/wptKeyEditDlgs.cpp:1340
+#: Src/wptKeyEditDlgs.cpp:1335
 msgid "Subkey successfully deleted."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1368
 msgid ""
 "Key already expired.\n"
 "\n"
 "Do you want to change the expiration date?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1382
-#: ../Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1380
 msgid "Key Expiration Date"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyEditDlgs.cpp:1401
 msgid "Expire Subkey"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1411
+#: Src/wptKeyEditDlgs.cpp:1406
 msgid "Subkey expire date successfully set."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1437
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -2631,31 +2268,31 @@
 "This command is only available to revoke single subkeys"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1451
+#: Src/wptKeyEditDlgs.cpp:1446
 msgid "Key already revoked."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1463
 msgid "Revoke Subkey"
 msgstr "Spärra undernyckel"
 
-#: ../Src/wptKeyEditDlgs.cpp:1472
+#: Src/wptKeyEditDlgs.cpp:1467
 msgid "Subkey successfully revoked."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1494
+#: Src/wptKeyEditDlgs.cpp:1489
 msgid "Revoke user ID"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1494
 msgid "Key has only one user ID."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1510
+#: Src/wptKeyEditDlgs.cpp:1505
 msgid "This user ID has been already revoked."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1511
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2663,52 +2300,51 @@
 "Do you really want to revoke this user ID?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1533
 msgid "Revoke User ID"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1542
+#: Src/wptKeyEditDlgs.cpp:1537
 msgid "User ID successfully revoked"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1589
+#: Src/wptKeyEditDlgs.cpp:1584
 msgid "Set user ID preferences"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1587
 msgid "User ID preferences successfully updated"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1637
+#: Src/wptKeyEditDlgs.cpp:1632
 msgid "Primary"
 msgstr "Primär"
 
-#: ../Src/wptKeyEditDlgs.cpp:1640
+#: Src/wptKeyEditDlgs.cpp:1635
 msgid "User ID successfully flagged"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1729
 msgid "No preferences available."
 msgstr "Inga inställningar tillgängliga."
 
-#: ../Src/wptKeyEditDlgs.cpp:1738
+#: Src/wptKeyEditDlgs.cpp:1733
 msgid "MDC feature"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1735
 msgid "user ID:"
 msgstr "användaridentitet:"
 
-#: ../Src/wptKeyEditDlgs.cpp:1741
-#: ../Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1801
 msgid "Primary user ID can not be deleted!"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1812
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2718,29 +2354,27 @@
 "Do you really want to delete this user ID?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1834
+#: Src/wptKeyEditDlgs.cpp:1829
 msgid "Delete User ID"
 msgstr "Ta bort användaridentitet"
 
-#: ../Src/wptKeyEditDlgs.cpp:1838
+#: Src/wptKeyEditDlgs.cpp:1833
 msgid "User ID successfully deleted"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1929
-#: ../Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1924 Src/wptKeyEditDlgs.cpp:1942
 msgid "Finished to compact key."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:1989
+#: Src/wptKeyEditDlgs.cpp:1984
 msgid "Do you really want to make this sig exportable?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:2020
-#: ../Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyEditDlgs.cpp:2015 Src/wptKeysignDlg.cpp:385
 msgid "Key successfully signed."
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:2083
+#: Src/wptKeyEditDlgs.cpp:2078
 #, c-format
 msgid ""
 "Your keys is listed as a designated revoker for the key\n"
@@ -2751,464 +2385,429 @@
 "which allows you to revoke the key listed above?"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyEditDlgs.cpp:2116
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr ""
 
-#: ../Src/wptKeyEditDlgs.cpp:2176
+#: Src/wptKeyEditDlgs.cpp:2171
 msgid "Command>"
 msgstr "Kommando>"
 
-#: ../Src/wptKeyEditDlgs.cpp:2177
-#: ../Src/wptKeyserverDlg.cpp:689
-#: ../Src/wptMDSumDlg.cpp:208
-#: ../Src/wptOwnertrustDlg.cpp:103
+#: Src/wptKeyEditDlgs.cpp:2172 Src/wptKeyserverDlg.cpp:691
+#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Stäng"
 
-#: ../Src/wptKeyEditDlgs.cpp:2179
+#: Src/wptKeyEditDlgs.cpp:2174
 msgid "&Revoke..."
 msgstr "&Spärra..."
 
-#: ../Src/wptKeyEditDlgs.cpp:2223
+#: Src/wptKeyEditDlgs.cpp:2218
 msgid "Please select a command."
 msgstr "Välj ett kommando."
 
-#: ../Src/wptKeyEditDlgs.cpp:2227
+#: Src/wptKeyEditDlgs.cpp:2222
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr ""
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:57
-#: ../Src/wptKeyPropsDlg.cpp:62
+#: Src/wptKeyEditOwnertrustDlg.cpp:57 Src/wptKeyPropsDlg.cpp:62
 msgid "Don't know"
 msgstr "Jag vet inte"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:58
-#: ../Src/wptKeyPropsDlg.cpp:63
+#: Src/wptKeyEditOwnertrustDlg.cpp:58 Src/wptKeyPropsDlg.cpp:63
 msgid "I do NOT trust"
 msgstr "Jag litar INTE"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:59
-#: ../Src/wptKeyPropsDlg.cpp:64
+#: Src/wptKeyEditOwnertrustDlg.cpp:59 Src/wptKeyPropsDlg.cpp:64
 msgid "I trust marginally"
 msgstr "Jag litar marginellt"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:60
-#: ../Src/wptKeyPropsDlg.cpp:65
+#: Src/wptKeyEditOwnertrustDlg.cpp:60 Src/wptKeyPropsDlg.cpp:65
 msgid "I trust fully"
 msgstr "Jag litar fullständigt"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:61
-#: ../Src/wptKeyPropsDlg.cpp:71
+#: Src/wptKeyEditOwnertrustDlg.cpp:61 Src/wptKeyPropsDlg.cpp:71
 msgid "I trust ultimately"
 msgstr "Jag litar förbehållslöst"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:63
-msgid "Please decide how far you trust this user to correctly verify other users' keys (by looking at passports, checking fingerprint from different sources...)?"
+#: Src/wptKeyEditOwnertrustDlg.cpp:63
+msgid ""
+"Please decide how far you trust this user to correctly verify other users' "
+"keys (by looking at passports, checking fingerprint from different "
+"sources...)?"
 msgstr ""
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:82
+#: Src/wptKeyEditOwnertrustDlg.cpp:82
 msgid "Please choose one entry."
 msgstr ""
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:83
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:89
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:98
-#: ../Src/wptKeyManagerDlg.cpp:974
-#: ../Src/wptKeyManagerDlg.cpp:1964
-#: ../Src/wptKeyPropsDlg.cpp:298
-#: ../Src/wptOwnertrustDlg.cpp:97
-#: ../Src/wptOwnertrustDlg.cpp:116
-#: ../Src/wptOwnertrustDlg.cpp:128
+#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:1964 Src/wptKeyPropsDlg.cpp:298
+#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
+#: Src/wptOwnertrustDlg.cpp:128
 msgid "Ownertrust"
 msgstr "Ägartillit"
 
-#: ../Src/wptKeyEditOwnertrustDlg.cpp:88
+#: Src/wptKeyEditOwnertrustDlg.cpp:88
 msgid "Do you really want to set this key to ultimate trust?"
 msgstr ""
 
-#: ../Src/wptKeyeditSetPrefDlg.cpp:115
+#: Src/wptKeyeditSetPrefDlg.cpp:115
 msgid "There are no preferences in the list."
 msgstr ""
 
-#: ../Src/wptKeygenCBDlg.cpp:45
+#: Src/wptKeygenCBDlg.cpp:45
 msgid "Key Generation - Progress Dialog"
 msgstr ""
 
-#: ../Src/wptKeygenCBDlg.cpp:85
-#: ../Src/wptKeygenDlg.cpp:296
-#: ../Src/wptKeygenDlg.cpp:305
-#: ../Src/wptKeygenDlg.cpp:369
-#: ../Src/wptKeygenDlg.cpp:414
-#: ../Src/wptKeygenDlg.cpp:419
-#: ../Src/wptKeygenDlg.cpp:424
-#: ../Src/wptKeygenDlg.cpp:429
-#: ../Src/wptKeygenDlg.cpp:436
-#: ../Src/wptKeygenDlg.cpp:444
-#: ../Src/wptKeygenDlg.cpp:458
-#: ../Src/wptKeygenDlg.cpp:465
-#: ../Src/wptKeygenDlg.cpp:475
-#: ../Src/wptKeygenDlg.cpp:496
-#: ../Src/wptKeygenDlg.cpp:579
-#: ../Src/wptKeyManagerDlg.cpp:1820
-#: ../Src/wptPassphraseDlg.cpp:147
-#: ../Src/wptPassphraseDlg.cpp:157
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:296 Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:414 Src/wptKeygenDlg.cpp:419
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
+#: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
+#: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
+#: Src/wptKeyManagerDlg.cpp:1820 Src/wptPassphraseDlg.cpp:138
+#: Src/wptPassphraseDlg.cpp:148
 msgid "Key Generation"
 msgstr "Nyckelgenerering"
 
-#: ../Src/wptKeygenDlg.cpp:284
+#: Src/wptKeygenDlg.cpp:284
 msgid ""
-"It is STRONGLY recommend that you backup your keyrings because they both contain VERY important data.\n"
-"Remember that your hard disk can crash or the files can be deleted by accident; so it is a good\n"
+"It is STRONGLY recommend that you backup your keyrings because they both "
+"contain VERY important data.\n"
+"Remember that your hard disk can crash or the files can be deleted by "
+"accident; so it is a good\n"
 "idea to store them on a different mass stoarge like a floppy or CDR!\n"
 "\n"
 "Backup your keyrings now?"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:289
+#: Src/wptKeygenDlg.cpp:289
 msgid "WARNING - Important hint"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:291
+#: Src/wptKeygenDlg.cpp:291
 msgid "Destination for Public Keyring"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:297
-#: ../Src/wptKeygenDlg.cpp:306
+#: Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
 #, c-format
 msgid "Could not copy %s -> %s"
 msgstr "Kunde inte kopiera %s -> %s"
 
-#: ../Src/wptKeygenDlg.cpp:300
+#: Src/wptKeygenDlg.cpp:300
 msgid "Destination for Secret Keyring"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:322
+#: Src/wptKeygenDlg.cpp:322
 msgid "DSA and ELG (default)"
 msgstr "DSA och ELG (standard)"
 
-#: ../Src/wptKeygenDlg.cpp:323
+#: Src/wptKeygenDlg.cpp:323
 msgid "DSA and RSA"
 msgstr "DSA och RSA"
 
-#: ../Src/wptKeygenDlg.cpp:324
+#: Src/wptKeygenDlg.cpp:324
 msgid "DSA sign only"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:325
+#: Src/wptKeygenDlg.cpp:325
 msgid "RSA sign only"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:326
+#: Src/wptKeygenDlg.cpp:326
 msgid "RSA sign and encrypt"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:327
 msgid "RSA and RSA (PGP)"
 msgstr "RSA och RSA (PGP)"
 
-#: ../Src/wptKeygenDlg.cpp:371
-msgid "NOTE: Key generation can be a lengthy process! Please wait until you get the message that key generation has finished."
+#: Src/wptKeygenDlg.cpp:371
+msgid ""
+"NOTE: Key generation can be a lengthy process! Please wait until you get the "
+"message that key generation has finished."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:373
 msgid "Subkey size in &bits"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:374
+#: Src/wptKeygenDlg.cpp:374
 msgid "&Real name"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:378
+#: Src/wptKeygenDlg.cpp:378
 msgid "Key &type"
 msgstr "Nyckel&typ"
 
-#: ../Src/wptKeygenDlg.cpp:413
+#: Src/wptKeygenDlg.cpp:413
 msgid "Invalid value. Allowed values 1024-4096 bits."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:418
+#: Src/wptKeygenDlg.cpp:418
 msgid "Do you really need such a large key?"
 msgstr "Behöver du verkligen en sådan stor nyckel?"
 
-#: ../Src/wptKeygenDlg.cpp:424
-#: ../Src/wptKeygenDlg.cpp:556
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:556
 msgid "Please enter the name."
 msgstr "Ange namnet."
 
-#: ../Src/wptKeygenDlg.cpp:428
-#: ../Src/wptKeygenDlg.cpp:561
+#: Src/wptKeygenDlg.cpp:428 Src/wptKeygenDlg.cpp:561
 msgid "Please do not enter the email address in the name field."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:435
-#: ../Src/wptKeygenDlg.cpp:568
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:568
 msgid "Please enter a valid email address."
 msgstr "Ange en giltig e-postadress."
 
-#: ../Src/wptKeygenDlg.cpp:443
+#: Src/wptKeygenDlg.cpp:443
 msgid "Please do NOT enter the email address in the comment field."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:474
-#: ../Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:474 Src/wptKeyRevokeDlg.cpp:180
 msgid "Please enter the passphrase."
 msgstr "Ange lösenfrasen."
 
-#: ../Src/wptKeygenDlg.cpp:499
-#: ../Src/wptKeygenDlg.cpp:600
+#: Src/wptKeygenDlg.cpp:499 Src/wptKeygenDlg.cpp:600
 msgid "Key Generation completed"
 msgstr "Nyckelgenerering färdig"
 
-#: ../Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:540
 msgid "&Prefer RSA keys"
 msgstr "&Föredra RSA-nycklar"
 
-#: ../Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:541
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:542
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: ../Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:543
 msgid "Name and E-Mail Assignment"
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:544
 msgid ""
 "Every key pair must have a name associated with it. The name and\n"
 "email address let your correspondents know that your public key they\n"
 "are using belongs to us."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:545
 msgid ""
-"By associating an email address with your key pair, you will enable WinPT to assist your correspondents in selecting the correct public\n"
+"By associating an email address with your key pair, you will enable WinPT to "
+"assist your correspondents in selecting the correct public\n"
 "key when communicating with you."
 msgstr ""
 
-#: ../Src/wptKeygenDlg.cpp:546
-#: ../Src/wptKeygenDlg.cpp:557
-#: ../Src/wptKeygenDlg.cpp:562
-#: ../Src/wptKeygenDlg.cpp:569
-#: ../Src/wptKeygenDlg.cpp:575
-#: ../Src/wptKeygenDlg.cpp:596
-#: ../Src/wptKeyManagerDlg.cpp:1843
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeygenDlg.cpp:557 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:569 Src/wptKeygenDlg.cpp:575 Src/wptKeygenDlg.cpp:596
+#: Src/wptKeyManagerDlg.cpp:1843
 msgid "Key Generation Wizard"
 msgstr "Nyckelgenereringsguide"
 
-#: ../Src/wptKeygenDlg.cpp:574
+#: Src/wptKeygenDlg.cpp:574
 msgid "Please do not add '<' or '>' to the email address."
 msgstr "Lägg inte till \"<\" eller \">\" till e-postadressen."
 
-#: ../Src/wptKeyImportStatusDlg.cpp:48
+#: Src/wptKeyImportStatusDlg.cpp:48
 msgid "Number of public keys"
 msgstr "Antal publika nycklar"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:49
+#: Src/wptKeyImportStatusDlg.cpp:49
 msgid "Imported public keys"
 msgstr ""
 
-#: ../Src/wptKeyImportStatusDlg.cpp:50
+#: Src/wptKeyImportStatusDlg.cpp:50
 msgid "Number of secret keys"
 msgstr "Antal hemliga nycklar"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:51
+#: Src/wptKeyImportStatusDlg.cpp:51
 msgid "Imported secret keys"
 msgstr ""
 
-#: ../Src/wptKeyImportStatusDlg.cpp:52
+#: Src/wptKeyImportStatusDlg.cpp:52
 msgid "Revocation certificates"
 msgstr "Spärrcertifikat"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:53
+#: Src/wptKeyImportStatusDlg.cpp:53
 msgid "No (valid) user ID"
 msgstr ""
 
-#: ../Src/wptKeyImportStatusDlg.cpp:54
+#: Src/wptKeyImportStatusDlg.cpp:54
 msgid "New user ID's"
 msgstr "Nya användaridentiteter"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:55
+#: Src/wptKeyImportStatusDlg.cpp:55
 msgid "New sub keys"
 msgstr "Nya undernycklar"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:56
+#: Src/wptKeyImportStatusDlg.cpp:56
 msgid "New signatures"
 msgstr "Nya signaturer"
 
-#: ../Src/wptKeyImportStatusDlg.cpp:68
+#: Src/wptKeyImportStatusDlg.cpp:68
 msgid "Revocation certifcate(s) imported."
 msgstr ""
 
-#: ../Src/wptKeyImportStatusDlg.cpp:70
+#: Src/wptKeyImportStatusDlg.cpp:70
 msgid "Secret key(s) imported."
 msgstr "Hemlig nycklar importerade."
 
-#: ../Src/wptKeyImportStatusDlg.cpp:76
+#: Src/wptKeyImportStatusDlg.cpp:76
 msgid "No keys updated."
 msgstr "Inga nycklar uppdaterade."
 
-#: ../Src/wptKeylist.cpp:261
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair"
 msgstr "Nyckelpar"
 
-#: ../Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:245
 msgid "Key Pair (Card)"
 msgstr "Nyckelpar (Kort)"
 
-#: ../Src/wptKeylist.cpp:264
+#: Src/wptKeylist.cpp:246
 msgid "Public Key"
 msgstr "Publik nyckel"
 
-#: ../Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:366
 msgid "None"
 msgstr "Ingen"
 
-#: ../Src/wptKeylist.cpp:388
+#: Src/wptKeylist.cpp:370
 msgid "Marginal"
 msgstr "Marginell"
 
-#: ../Src/wptKeylist.cpp:390
+#: Src/wptKeylist.cpp:372
 msgid "Full"
 msgstr "Fullständig"
 
-#: ../Src/wptKeylist.cpp:429
-#: ../Src/wptKeylist.cpp:455
-#: ../Src/wptKeyPropsDlg.cpp:154
+#: Src/wptKeylist.cpp:411 Src/wptKeylist.cpp:437 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: ../Src/wptKeylist.cpp:465
+#: Src/wptKeylist.cpp:452
 msgid "key pair"
 msgstr "nyckelpar"
 
-#: ../Src/wptKeylist.cpp:583
-#: ../Src/wptKeylist.cpp:592
-#: ../Src/wptKeyManagerDlg.cpp:914
-#: ../Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeylist.cpp:569 Src/wptKeylist.cpp:578 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1005
 msgid "Cipher"
 msgstr "Chiffer"
 
-#: ../Src/wptKeylist.cpp:594
-#: ../Src/wptKeyManagerDlg.cpp:916
-#: ../Src/wptVerifyList.cpp:171
+#: Src/wptKeylist.cpp:580 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:141
 msgid "Trust"
 msgstr "Tillit"
 
-#. normal userids are > 5 chars
-#: ../Src/wptKeylist.cpp:782
-#: ../Src/wptPassphraseCB.cpp:126
+#: Src/wptKeylist.cpp:768 Src/wptPassphraseCB.cpp:120
 msgid "Invalid User ID"
 msgstr "Ogiltig användaridentitet"
 
-#: ../Src/wptKeylist.cpp:1051
-#, c-format
+#: Src/wptKeylist.cpp:1031
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
 "named in the user ID.  If you *really* know what you are\n"
 "doing, you may answer the next question with yes\n"
 "\n"
-"Use \"%s\" anyway?"
+"Still proceed?"
 msgstr ""
 
-#: ../Src/wptKeylist.cpp:1059
-#: ../Src/wptKeylist.cpp:1122
+#: Src/wptKeylist.cpp:1100
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: ../Src/wptKeylist.cpp:1123
+#: Src/wptKeylist.cpp:1101
 #, c-format
 msgid ""
 "KeyID %s.\n"
 "Do you really want to export a revoked key?"
 msgstr ""
 
-#: ../Src/wptKeylist.cpp:1225
+#: Src/wptKeylist.cpp:1198
 msgid "Secret Key List"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:185
+#: Src/wptKeyManager.cpp:177
 msgid ""
 "This key has expired!\n"
 "Key check failed."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:190
+#: Src/wptKeyManager.cpp:182
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:322
 msgid "Only one secret key can be exported."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:333
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:375
+#: Src/wptKeyManager.cpp:367
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:431
+#: Src/wptKeyManager.cpp:423
 msgid "No valid OpenPGP keys found."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:428
 msgid ""
 "The key you want to import is dash escaped.\n"
 "Do you want to extract the key?"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:434
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:467
-#: ../Src/wptKeyManager.cpp:584
+#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:576
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:496
-#: ../Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:488 Src/wptKeyManager.cpp:495
 msgid "Key Import HTTP"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:496
+#: Src/wptKeyManager.cpp:488
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:517
+#: Src/wptKeyManager.cpp:509
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:558
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:687
 msgid "Do you really want to confirm each key?"
 msgstr "Vill du verkligen bekräfta varje nyckel?"
 
-#: ../Src/wptKeyManager.cpp:696
+#: Src/wptKeyManager.cpp:688
 msgid "Delete Confirmation"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:719
+#: Src/wptKeyManager.cpp:711
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -3216,7 +2815,7 @@
 "%s"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:728
+#: Src/wptKeyManager.cpp:720
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -3227,415 +2826,390 @@
 "%s"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:735
+#: Src/wptKeyManager.cpp:727
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
 "placeholder will be deleted.\n"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:797
+#: Src/wptKeyManager.cpp:789
 #, c-format
 msgid "Do you really want to send '0x%s' to keyserver %s?"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:818
+#: Src/wptKeyManager.cpp:810
 msgid "Please only select one key."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:897
+#: Src/wptKeyManager.cpp:889
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:902
+#: Src/wptKeyManager.cpp:894
 msgid "Could not connect to keyserver, abort procedure."
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "Sök"
 
-#: ../Src/wptKeyManager.cpp:976
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "Sök efter:"
 
-#: ../Src/wptKeyManager.cpp:988
-#, c-format
-msgid "String pattern \"%s\" not found."
+#: Src/wptKeyManager.cpp:982
+msgid "String pattern not found:"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:1054
-#: ../Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:85
 msgid "0. No reason specified"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:1055
-#: ../Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:86
 msgid "1. Key has been compromised"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:1056
-#: ../Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:87
 msgid "2. Key is superseded"
 msgstr ""
 
-#: ../Src/wptKeyManager.cpp:1057
-#: ../Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:88
 msgid "3. Key is no longer used"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:487
-#: ../Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1026
 msgid "Paste Key from Clipboard"
 msgstr "Klistra in nyckel från urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:508
+#: Src/wptKeyManagerDlg.cpp:508
 #, c-format
 msgid "Default Key: %s"
 msgstr "Standardnyckel: %s"
 
-#: ../Src/wptKeyManagerDlg.cpp:510
+#: Src/wptKeyManagerDlg.cpp:510
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "Standardnyckel: 0x%s"
 
-#: ../Src/wptKeyManagerDlg.cpp:529
+#: Src/wptKeyManagerDlg.cpp:529
 #, c-format
 msgid "%d secret keys"
 msgstr "%d hemliga nycklar"
 
-#: ../Src/wptKeyManagerDlg.cpp:530
+#: Src/wptKeyManagerDlg.cpp:530
 #, c-format
 msgid "%d keys"
 msgstr "%d nycklar"
 
-#: ../Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Key"
 msgstr "Nyckel"
 
-#: ../Src/wptKeyManagerDlg.cpp:970
-#: ../Src/wptKeyManagerDlg.cpp:1397
+#: Src/wptKeyManagerDlg.cpp:970 Src/wptKeyManagerDlg.cpp:1397
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:973
 msgid "Send Mail..."
 msgstr "Skicka e-post..."
 
-#. XXX
-#: ../Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:975
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopiera\tCtrl+C"
 
-#: ../Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:976
 msgid "&Paste\tCtrl+V"
 msgstr "Klistra &in\tCtrl+V"
 
-#: ../Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:977
 msgid "Search...\tCtrl+F"
 msgstr "Sök...\tCtrl+F"
 
-#: ../Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "Select All\tCtrl+A"
 msgstr "Markera allt\tCtrl+A"
 
-#: ../Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:979
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: ../Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:981
 msgid "&Expert"
 msgstr "&Expert"
 
-#: ../Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:982
 msgid "&Normal"
 msgstr "&Normal"
 
-#: ../Src/wptKeyManagerDlg.cpp:985
-#: ../Src/wptKeyManagerDlg.cpp:986
-#: ../Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1032
 msgid "&Delete"
 msgstr "&Ta bort"
 
-#: ../Src/wptKeyManagerDlg.cpp:987
-#: ../Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1033
 msgid "&Revoke Cert"
 msgstr "S&pärra cert"
 
-#: ../Src/wptKeyManagerDlg.cpp:988
-#: ../Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1029
 msgid "&List Signatures"
 msgstr "&Lista signaturer"
 
-#: ../Src/wptKeyManagerDlg.cpp:989
-#: ../Src/wptKeyManagerDlg.cpp:1760
-#: ../Src/wptKeyTrustPathDlg.cpp:129
+#: Src/wptKeyManagerDlg.cpp:989 Src/wptKeyManagerDlg.cpp:1760
+#: Src/wptKeyTrustPathDlg.cpp:129
 msgid "List Trust Path"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:990
 msgid "&Export..."
 msgstr "&Exportera..."
 
-#: ../Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:991
 msgid "&Import..."
 msgstr "&Importera..."
 
-#: ../Src/wptKeyManagerDlg.cpp:992
-#: ../Src/wptKeyManagerDlg.cpp:1030
-#: ../Src/wptKeysigDlg.cpp:427
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeysigDlg.cpp:427
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: ../Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "GPG &Options"
 msgstr "GPG-&alternativ"
 
-#: ../Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "&GPG Preferences"
 msgstr "&GPG-inställningar"
 
-#: ../Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:995
 msgid "&WinPT Preferences"
 msgstr "&WinPT-inställningar"
 
-#: ../Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:997
 msgid "E&xport Secret Key"
 msgstr "E&xportera hemlig nyckel"
 
-#: ../Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:998
 msgid "Re&load Key Cache"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:999
 msgid "R&everify Signatures"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1000
 msgid "Refresh &Keys (Keyserver)"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1001
-#: ../Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1001 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "Info"
 
-#: ../Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:1020
 msgid "Copy User ID to Clipboard"
 msgstr "Kopiera användaridentitet till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1021
 msgid "Copy Key ID to Clipboard"
 msgstr "Kopiera nyckelidentitet till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1022
 msgid "Copy Fingerprint to Clipboard"
 msgstr "Kopiera fingeravtryck till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:1023
 msgid "Copy Key Info to Clipboard"
 msgstr "Kopiera nyckelinformation till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1024
 msgid "Copy E-Mail to Clipboard"
 msgstr "Kopiera e-post till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1025
 msgid "Copy Key to Clipboard"
 msgstr "Kopiera nyckel till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:1027
 msgid "Refresh from Keyserver"
 msgstr "Uppdatera från nyckelserver"
 
-#: ../Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptKeyManagerDlg.cpp:1028
 msgid "Set Implicit &Trust"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:1035
 msgid "&Enable"
 msgstr "&Aktivera"
 
-#: ../Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1036
 msgid "&Disable"
 msgstr "&Inaktivera"
 
-#: ../Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1037
 msgid "Re&fresh from Keyserver"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1038
 msgid "Set preferred Keyserver URL"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1039
 msgid "Send Key to Mail Recipient"
 msgstr "Skicka nyckel till e-postmottagare"
 
-#: ../Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1040
 msgid "Set as Default Key"
 msgstr "Ställ in som standardnyckel"
 
-#: ../Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1042
 msgid "Key..."
 msgstr "Nyckel..."
 
-#: ../Src/wptKeyManagerDlg.cpp:1043
+#: Src/wptKeyManagerDlg.cpp:1043
 msgid "User ID..."
 msgstr "Användaridentitet..."
 
-#: ../Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1044
 msgid "Photo ID..."
 msgstr "Fotoidentitet..."
 
-#: ../Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1045
 msgid "Revoker..."
 msgstr ""
 
-#. change popup texts
-#: ../Src/wptKeyManagerDlg.cpp:1048
+#: Src/wptKeyManagerDlg.cpp:1048
 msgid "Key Attributes"
 msgstr "Nyckelattribut"
 
-#: ../Src/wptKeyManagerDlg.cpp:1049
+#: Src/wptKeyManagerDlg.cpp:1049
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../Src/wptKeyManagerDlg.cpp:1050
+#: Src/wptKeyManagerDlg.cpp:1050
 msgid "Send to Keyserver"
 msgstr "Skicka till nyckelserver"
 
-#: ../Src/wptKeyManagerDlg.cpp:1366
+#: Src/wptKeyManagerDlg.cpp:1366
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1398
+#: Src/wptKeyManagerDlg.cpp:1398
 msgid "&Show"
 msgstr "&Visa"
 
-#: ../Src/wptKeyManagerDlg.cpp:1399
+#: Src/wptKeyManagerDlg.cpp:1399
 msgid "&New..."
 msgstr "&Ny..."
 
-#: ../Src/wptKeyManagerDlg.cpp:1510
+#: Src/wptKeyManagerDlg.cpp:1510
 msgid "Generate new key pair"
 msgstr "Generera nytt nyckelpar"
 
-#: ../Src/wptKeyManagerDlg.cpp:1514
+#: Src/wptKeyManagerDlg.cpp:1514
 msgid "Search for a specific key"
 msgstr "Sök efter en specifik nyckel"
 
-#: ../Src/wptKeyManagerDlg.cpp:1518
+#: Src/wptKeyManagerDlg.cpp:1518
 msgid "Delete key from keyring"
 msgstr "Ta bort nyckel från nyckelring"
 
-#: ../Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1522
 msgid "Show key properties"
 msgstr "Visa nyckelegenskaper"
 
-#: ../Src/wptKeyManagerDlg.cpp:1526
+#: Src/wptKeyManagerDlg.cpp:1526
 msgid "Sign key"
 msgstr "Signera nyckel"
 
-#: ../Src/wptKeyManagerDlg.cpp:1530
+#: Src/wptKeyManagerDlg.cpp:1530
 msgid "Copy key to clipboard"
 msgstr "Kopiera nyckel till urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1534
+#: Src/wptKeyManagerDlg.cpp:1534
 msgid "Paste key from clipboard"
 msgstr "Klistra in nyckel från urklipp"
 
-#: ../Src/wptKeyManagerDlg.cpp:1538
+#: Src/wptKeyManagerDlg.cpp:1538
 msgid "Import key to keyring"
 msgstr "Importera nyckel till nyckelring"
 
-#: ../Src/wptKeyManagerDlg.cpp:1542
+#: Src/wptKeyManagerDlg.cpp:1542
 msgid "Export key to a file"
 msgstr "Exportera nyckel till en fil"
 
-#: ../Src/wptKeyManagerDlg.cpp:1679
+#: Src/wptKeyManagerDlg.cpp:1679
 msgid "New"
 msgstr "Ny"
 
-#: ../Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1681
 msgid "Preferences..."
 msgstr "Inställningar..."
 
-#: ../Src/wptKeyManagerDlg.cpp:1687
+#: Src/wptKeyManagerDlg.cpp:1687
 msgid "Could not access public keyring"
 msgstr "Kunde inte komma åt publik nyckelring"
 
-#: ../Src/wptKeyManagerDlg.cpp:1719
-#: ../Src/wptKeysignDlg.cpp:351
-#: ../Src/wptKeysignDlg.cpp:365
-#: ../Src/wptKeysignDlg.cpp:426
-#: ../Src/wptKeysignDlg.cpp:455
-#: ../Src/wptKeysignDlg.cpp:461
-#: ../Src/wptKeysignDlg.cpp:463
+#: Src/wptKeyManagerDlg.cpp:1719 Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:378 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:385 Src/wptKeysignDlg.cpp:407
+#: Src/wptKeysignDlg.cpp:421
 msgid "Key Signing"
 msgstr "Nyckelsignering"
 
-#: ../Src/wptKeyManagerDlg.cpp:1735
+#: Src/wptKeyManagerDlg.cpp:1735
 msgid "Key already revoked!"
 msgstr "Nyckeln redan spärrad!"
 
-#: ../Src/wptKeyManagerDlg.cpp:1749
-#: ../Src/wptKeyRevokeDlg.cpp:68
-#: ../Src/wptKeyRevokeDlg.cpp:78
-#: ../Src/wptKeyRevokeDlg.cpp:162
-#: ../Src/wptKeyRevokeDlg.cpp:167
-#: ../Src/wptKeyRevokeDlg.cpp:172
-#: ../Src/wptKeyRevokeDlg.cpp:181
-#: ../Src/wptKeyRevokeDlg.cpp:191
-#: ../Src/wptKeyRevokeDlg.cpp:197
+#: Src/wptKeyManagerDlg.cpp:1749 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyRevokeDlg.cpp:78 Src/wptKeyRevokeDlg.cpp:162
+#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:172
+#: Src/wptKeyRevokeDlg.cpp:181 Src/wptKeyRevokeDlg.cpp:191
+#: Src/wptKeyRevokeDlg.cpp:197
 msgid "Key Revocation Cert"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1771
+#: Src/wptKeyManagerDlg.cpp:1771
 msgid "Key Signature List"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1788
-#: ../Src/wptKeyPropsDlg.cpp:294
+#: Src/wptKeyManagerDlg.cpp:1788 Src/wptKeyPropsDlg.cpp:294
 msgid "Key Properties"
 msgstr "Nyckelegenskaper"
 
-#: ../Src/wptKeyManagerDlg.cpp:1798
+#: Src/wptKeyManagerDlg.cpp:1798
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1828
+#: Src/wptKeyManagerDlg.cpp:1828
 msgid "Smart Card support is not available."
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1851
-#: ../Src/wptKeyserverDlg.cpp:680
+#: Src/wptKeyManagerDlg.cpp:1851 Src/wptKeyserverDlg.cpp:682
 msgid "Keyserver Access"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1859
-#: ../Src/wptMainProc.cpp:574
-#: ../Src/wptPreferencesDlg.cpp:125
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptMainProc.cpp:575
+#: Src/wptPreferencesDlg.cpp:125
 msgid "WinPT Preferences"
 msgstr "WinPT-inställningar"
 
-#: ../Src/wptKeyManagerDlg.cpp:1874
+#: Src/wptKeyManagerDlg.cpp:1874
 msgid "GnuPG Options"
 msgstr "GnuPG-alternativ"
 
-#: ../Src/wptKeyManagerDlg.cpp:1916
+#: Src/wptKeyManagerDlg.cpp:1916
 msgid "There is no corresponding secret key for this key."
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1921
+#: Src/wptKeyManagerDlg.cpp:1921
 msgid "You can only export one secret key."
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1926
+#: Src/wptKeyManagerDlg.cpp:1926
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -3646,38 +3220,38 @@
 "Do you really want to export the key?"
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:1931
+#: Src/wptKeyManagerDlg.cpp:1931
 msgid "WARNING"
 msgstr "VARNING"
 
-#: ../Src/wptKeyManagerDlg.cpp:1997
+#: Src/wptKeyManagerDlg.cpp:1997
 msgid "No key was selected, select all by default."
 msgstr ""
 
-#: ../Src/wptKeyManagerDlg.cpp:2002
+#: Src/wptKeyManagerDlg.cpp:2002
 msgid "Keyserver refresh finished."
 msgstr ""
 
-#: ../Src/wptKeyPropsDlg.cpp:69
+#: Src/wptKeyPropsDlg.cpp:69
 msgid "I trust ultimately (implicit)"
 msgstr "Jag litar förbehållslöst (implicit)"
 
-#: ../Src/wptKeyPropsDlg.cpp:72
-#: ../Src/wptVerifyList.cpp:246
-#: ../Src/wptVerifyList.cpp:311
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:215
+#: Src/wptVerifyList.cpp:218 Src/wptVerifyList.cpp:277
+#: Src/wptVerifyList.cpp:279 Src/wptVerifyList.cpp:285
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../Src/wptKeyPropsDlg.cpp:156
+#: Src/wptKeyPropsDlg.cpp:156
 msgid "Invalid"
 msgstr "Ogiltig"
 
-#: ../Src/wptKeyPropsDlg.cpp:205
+#: Src/wptKeyPropsDlg.cpp:205
 #, c-format
 msgid "Card-Type: %s\r\n"
 msgstr "Korttyp: %s\r\n"
 
-#: ../Src/wptKeyPropsDlg.cpp:256
+#: Src/wptKeyPropsDlg.cpp:256
 #, c-format
 msgid ""
 "Type: %s\r\n"
@@ -3700,23 +3274,23 @@
 "Chiffer: %s\r\n"
 "%s\r\n"
 
-#: ../Src/wptKeyPropsDlg.cpp:295
+#: Src/wptKeyPropsDlg.cpp:295
 msgid "&Change"
 msgstr "&Ändra"
 
-#: ../Src/wptKeyPropsDlg.cpp:296
+#: Src/wptKeyPropsDlg.cpp:296
 msgid "&Revokers"
 msgstr ""
 
-#: ../Src/wptKeyPropsDlg.cpp:297
+#: Src/wptKeyPropsDlg.cpp:297
 msgid "Change &Password"
 msgstr "Byt &lösenord"
 
-#: ../Src/wptKeyPropsDlg.cpp:304
+#: Src/wptKeyPropsDlg.cpp:304
 msgid "Photo-ID not validated."
 msgstr ""
 
-#: ../Src/wptKeyPropsDlg.cpp:367
+#: Src/wptKeyPropsDlg.cpp:367
 msgid ""
 "This is a non-valid key.\n"
 "Modifying the ownertrust has no effect on such keys.\n"
@@ -3724,167 +3298,168 @@
 "Do you really want to continue?"
 msgstr ""
 
-#: ../Src/wptKeyPropsDlg.cpp:385
+#: Src/wptKeyPropsDlg.cpp:385
 msgid "Ownertrust successfully changed."
 msgstr ""
 
-#: ../Src/wptKeyPropsDlg.cpp:398
-#: ../Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:398 Src/wptKeyRevokersDlg.cpp:160
 msgid "Key Revokers"
 msgstr ""
 
-#: ../Src/wptKeyRevokeDlg.cpp:80
+#: Src/wptKeyRevokeDlg.cpp:80
 msgid "Reason for revocation"
 msgstr "Anledning för spärr"
 
-#: ../Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyRevokeDlg.cpp:81
 msgid "Optional description text"
 msgstr ""
 
-#: ../Src/wptKeyRevokeDlg.cpp:82
+#: Src/wptKeyRevokeDlg.cpp:82
 msgid "&Passphrase"
 msgstr "&Lösenfras"
 
-#: ../Src/wptKeyRevokeDlg.cpp:83
+#: Src/wptKeyRevokeDlg.cpp:83
 msgid "Output file"
 msgstr ""
 
-#: ../Src/wptKeyRevokeDlg.cpp:134
+#: Src/wptKeyRevokeDlg.cpp:134
 msgid ""
-"Please move this certificate to a medium where it can be stored in a safe place (floppy, CDR, etc..).\n"
-"If an attacker gets access to this certificate he can use it to render your key unusable!"
+"Please move this certificate to a medium where it can be stored in a safe "
+"place (floppy, CDR, etc..).\n"
+"If an attacker gets access to this certificate he can use it to render your "
+"key unusable!"
 msgstr ""
 
-#: ../Src/wptKeyRevokeDlg.cpp:152
+#: Src/wptKeyRevokeDlg.cpp:152
 msgid "Choose File to save the Certificate"
 msgstr ""
 
-#: ../Src/wptKeyRevokeDlg.cpp:161
+#: Src/wptKeyRevokeDlg.cpp:161
 msgid "Please select a reason."
 msgstr "Välj en anledning."
 
-#: ../Src/wptKeyRevokeDlg.cpp:196
+#: Src/wptKeyRevokeDlg.cpp:196
 msgid "Revocation certificate generated."
 msgstr ""
 
-#: ../Src/wptKeyRevokersDlg.cpp:59
-#: ../Src/wptKeyserverSearchDlg.cpp:55
-#: ../Src/wptSigList.cpp:59
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptKeyserverSearchDlg.cpp:55
+#: Src/wptSigList.cpp:59
 msgid "Algorithm"
 msgstr "Algoritm"
 
-#: ../Src/wptKeyRevokersDlg.cpp:121
-#: ../Src/wptKeyRevokersDlg.cpp:174
+#: Src/wptKeyRevokersDlg.cpp:121 Src/wptKeyRevokersDlg.cpp:174
 msgid "Designated Key Revokers"
 msgstr ""
 
-#: ../Src/wptKeyRevokersDlg.cpp:159
+#: Src/wptKeyRevokersDlg.cpp:159
 msgid "Designated Revoker Keys"
 msgstr ""
 
-#: ../Src/wptKeyRevokersDlg.cpp:175
+#: Src/wptKeyRevokersDlg.cpp:175
 #, c-format
 msgid "Do you want to retrieve %s via the default keyserver?"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:443
+#: Src/wptKeyserver.cpp:444
 msgid "Network unreachable"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:446
+#: Src/wptKeyserver.cpp:447
 msgid "Host unreachable"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:449
+#: Src/wptKeyserver.cpp:450
 msgid "Could not resolve host name"
 msgstr "Kunde inte slå upp värdnamn"
 
-#: ../Src/wptKeyserver.cpp:452
-#: ../Src/wptSOCKS.cpp:69
+#: Src/wptKeyserver.cpp:453
 msgid "Connection refused"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:456
+#: Src/wptKeyserver.cpp:457
 msgid "Connection timeout"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:460
+#: Src/wptKeyserver.cpp:461
 msgid "Connection resetted by peer"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:463
+#: Src/wptKeyserver.cpp:464
 msgid "Socket has been shutdown"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:642
 msgid "Could not save keyserver.conf file"
 msgstr "Kunde inte spara filen keyserver.conf"
 
-#: ../Src/wptKeyserver.cpp:727
-msgid "Invalid proxy configuration. You need to set a user and a password to use proxy authentication!"
+#: Src/wptKeyserver.cpp:728
+msgid ""
+"Invalid proxy configuration. You need to set a user and a password to use "
+"proxy authentication!"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:730
+#: Src/wptKeyserver.cpp:731
 msgid "Proxy Error"
 msgstr "Proxyfel"
 
-#: ../Src/wptKeyserver.cpp:755
+#: Src/wptKeyserver.cpp:756
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:757
+#: Src/wptKeyserver.cpp:758
 msgid "Keyserver Error"
 msgstr "Nyckelserverfel"
 
-#: ../Src/wptKeyserver.cpp:776
+#: Src/wptKeyserver.cpp:777
 msgid "The keyserver limit is exceeded"
 msgstr ""
 
-#: ../Src/wptKeyserver.cpp:777
+#: Src/wptKeyserver.cpp:778
 msgid "Keyserver Warning"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:104
+#: Src/wptKeyserverDlg.cpp:104
 #, c-format
 msgid "Key '%s' successfully sent"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:138
+#: Src/wptKeyserverDlg.cpp:138
 msgid ""
 "WARNING: multiple keys matched request.\n"
 "\n"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:143
+#: Src/wptKeyserverDlg.cpp:143
 msgid "Key(s) successfully received but nothing was changed."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:145
+#: Src/wptKeyserverDlg.cpp:145
 msgid "Key(s) sucessfully received and imported."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:162
+#: Src/wptKeyserverDlg.cpp:162
 msgid "Imported Keys"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:187
+#: Src/wptKeyserverDlg.cpp:187
 msgid ""
 "LDAP key import failed.\n"
-"Please make sure you have an online connection and gpgkeys_ldap.exe is installed"
+"Please make sure you have an online connection and gpgkeys_ldap.exe is "
+"installed"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:199
+#: Src/wptKeyserverDlg.cpp:199
 #, c-format
 msgid "Finger key import failed: %s\n"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:213
+#: Src/wptKeyserverDlg.cpp:213
 msgid "This is not a valid OpenPGP key."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:277
+#: Src/wptKeyserverDlg.cpp:280
 #, c-format
 msgid ""
 "Signature made %s using %s key ID 0x%s\n"
@@ -3893,151 +3468,142 @@
 "Do you want to try to retrieve the key from the keyserver?"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:393
 msgid "Please select one of the servers."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:397
+#: Src/wptKeyserverDlg.cpp:399
 msgid "Only HKP keyserver can be used."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:416
 msgid "DNS Name"
 msgstr "DNS-namn"
 
-#: ../Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:417
 msgid "Port"
 msgstr "Port"
 
-#: ../Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:501
 msgid "No space for new keyserver entry"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:522
 msgid "HKP Keyserver"
 msgstr "HKP-nyckelserver"
 
-#: ../Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:523
 msgid "LDAP Keyserver"
 msgstr "LDAP-nyckelserver"
 
-#: ../Src/wptKeyserverDlg.cpp:522
+#: Src/wptKeyserverDlg.cpp:524
 msgid "Finger Keyserver"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:547
-#: ../Src/wptKeyserverDlg.cpp:840
-#: ../Src/wptKeyserverDlg.cpp:860
+#: Src/wptKeyserverDlg.cpp:549 Src/wptKeyserverDlg.cpp:842
+#: Src/wptKeyserverDlg.cpp:862
 msgid "Edit Keyserver"
 msgstr "Redigera nyckelserver"
 
-#: ../Src/wptKeyserverDlg.cpp:548
-#: ../Src/wptKeyserverDlg.cpp:713
+#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:715
 msgid "&Add"
 msgstr "&Lägg till"
 
-#: ../Src/wptKeyserverDlg.cpp:550
+#: Src/wptKeyserverDlg.cpp:552
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../Src/wptKeyserverDlg.cpp:551
+#: Src/wptKeyserverDlg.cpp:553
 msgid "Port:"
 msgstr "Port:"
 
-#: ../Src/wptKeyserverDlg.cpp:552
+#: Src/wptKeyserverDlg.cpp:554
 msgid "Host name:"
 msgstr "Värdnamn:"
 
-#: ../Src/wptKeyserverDlg.cpp:560
+#: Src/wptKeyserverDlg.cpp:562
 msgid "Please enter a host name"
 msgstr "Ange ett värdnamn"
 
-#: ../Src/wptKeyserverDlg.cpp:565
+#: Src/wptKeyserverDlg.cpp:567
 msgid "Invalid port, valid numbers are < 65535"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:681
-#: ../Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "&Ta emot"
 
-#: ../Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:685
 msgid "Send key (default is receiving)"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:685
+#: Src/wptKeyserverDlg.cpp:687
 msgid "Key ID or email address you want to search for"
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:686
+#: Src/wptKeyserverDlg.cpp:688
 msgid "&Search"
 msgstr "&Sök"
 
-#: ../Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:689
 msgid "C&hange proxy"
 msgstr "Ä&ndra proxy"
 
-#: ../Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:690
 msgid "Set &default"
 msgstr "Ställ in s&tandard"
 
-#: ../Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
 msgid "&Remove"
 msgstr "&Ta bort"
 
-#: ../Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:717
 msgid "&Edit"
 msgstr "R&edigera"
 
-#: ../Src/wptKeyserverDlg.cpp:750
-#: ../Src/wptProxySettingsDlg.cpp:105
-#: ../Src/wptProxySettingsDlg.cpp:115
-#: ../Src/wptProxySettingsDlg.cpp:120
-#: ../Src/wptProxySettingsDlg.cpp:127
-#: ../Src/wptProxySettingsDlg.cpp:132
-#: ../Src/wptProxySettingsDlg.cpp:137
-#: ../Src/wptProxySettingsDlg.cpp:198
-#: ../Src/wptProxySettingsDlg.cpp:233
+#: Src/wptKeyserverDlg.cpp:752 Src/wptProxySettingsDlg.cpp:105
+#: Src/wptProxySettingsDlg.cpp:115 Src/wptProxySettingsDlg.cpp:120
+#: Src/wptProxySettingsDlg.cpp:127 Src/wptProxySettingsDlg.cpp:132
+#: Src/wptProxySettingsDlg.cpp:137 Src/wptProxySettingsDlg.cpp:198
+#: Src/wptProxySettingsDlg.cpp:233
 msgid "Proxy Settings"
 msgstr "Proxyinställningar"
 
-#: ../Src/wptKeyserverDlg.cpp:758
-#: ../Src/wptKeyserverDlg.cpp:799
+#: Src/wptKeyserverDlg.cpp:760 Src/wptKeyserverDlg.cpp:801
 msgid "Please enter the search pattern."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:783
+#: Src/wptKeyserverDlg.cpp:785
 msgid "Please select one of the keyservers."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:804
+#: Src/wptKeyserverDlg.cpp:806
 msgid "Only keyids are allowed."
 msgstr ""
 
-#: ../Src/wptKeyserverDlg.cpp:810
+#: Src/wptKeyserverDlg.cpp:812
 msgid "Only enter the name of the user."
 msgstr "Ange endast namnet för användaren."
 
-#: ../Src/wptKeyserverDlg.cpp:816
+#: Src/wptKeyserverDlg.cpp:818
 msgid "Only email addresses or keyids are allowed."
 msgstr ""
 
-#: ../Src/wptKeyserverSearchDlg.cpp:68
+#: Src/wptKeyserverSearchDlg.cpp:68
 #, c-format
 msgid "Connect to '%s' to search for \"%s\""
 msgstr ""
 
-#: ../Src/wptKeyserverSearchDlg.cpp:72
+#: Src/wptKeyserverSearchDlg.cpp:72
 msgid "Keyserver Searching"
 msgstr ""
 
-#: ../Src/wptKeyserverSearchDlg.cpp:97
-#: ../Src/wptKeyserverSearchDlg.cpp:102
-#: ../Src/wptKeyserverSearchDlg.cpp:146
+#: Src/wptKeyserverSearchDlg.cpp:97 Src/wptKeyserverSearchDlg.cpp:102
+#: Src/wptKeyserverSearchDlg.cpp:146
 msgid "Keyserver Search"
 msgstr ""
 
-#: ../Src/wptKeyserverSearchDlg.cpp:103
+#: Src/wptKeyserverSearchDlg.cpp:103
 #, c-format
 msgid ""
 "The search result contains a lot of keys: %d\n"
@@ -4045,7 +3611,7 @@
 "Do you really want to continue?"
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:95
+#: Src/wptKeysigDlg.cpp:95
 #, c-format
 msgid ""
 "Are you really sure you want to delete this %s from\n"
@@ -4053,139 +3619,133 @@
 "  \"%s\""
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:96
+#: Src/wptKeysigDlg.cpp:96
 msgid "self signature"
 msgstr "självsignatur"
 
-#: ../Src/wptKeysigDlg.cpp:96
+#: Src/wptKeysigDlg.cpp:96
 msgid "signature"
 msgstr "signatur"
 
-#: ../Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:147
 #, c-format
 msgid "%s %s signature"
 msgstr "%s %s signatur"
 
-#: ../Src/wptKeysigDlg.cpp:155
-#: ../Src/wptKeysigDlg.cpp:180
-#: ../Src/wptKeysigDlg.cpp:213
+#: Src/wptKeysigDlg.cpp:155 Src/wptKeysigDlg.cpp:180 Src/wptKeysigDlg.cpp:213
 msgid "Exportable"
 msgstr "Exporterbart"
 
-#: ../Src/wptKeysigDlg.cpp:156
-#: ../Src/wptKeysigDlg.cpp:214
+#: Src/wptKeysigDlg.cpp:156 Src/wptKeysigDlg.cpp:214
 msgid "Non-revocably"
 msgstr "Inte spärrbar"
 
-#: ../Src/wptKeysigDlg.cpp:159
-#: ../Src/wptSigList.cpp:55
+#: Src/wptKeysigDlg.cpp:159 Src/wptSigList.cpp:55
 msgid "Class"
 msgstr "Klass"
 
-#: ../Src/wptKeysigDlg.cpp:160
+#: Src/wptKeysigDlg.cpp:160
 msgid "Expire date"
 msgstr "Utgångsdatum"
 
-#: ../Src/wptKeysigDlg.cpp:161
+#: Src/wptKeysigDlg.cpp:161
 msgid "Creation date"
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:162
+#: Src/wptKeysigDlg.cpp:162
 msgid "Issuer key"
 msgstr "Utfärdarens nyckel"
 
-#: ../Src/wptKeysigDlg.cpp:163
+#: Src/wptKeysigDlg.cpp:163
 msgid "Issuer key ID"
 msgstr "Utfärdarens nyckelidentitet"
 
-#: ../Src/wptKeysigDlg.cpp:164
+#: Src/wptKeysigDlg.cpp:164
 msgid "Policy URL"
 msgstr "Policy-url"
 
-#: ../Src/wptKeysigDlg.cpp:165
-#: ../Src/wptKeysigDlg.cpp:217
+#: Src/wptKeysigDlg.cpp:165 Src/wptKeysigDlg.cpp:217
 msgid "Signature Properties"
 msgstr "Signaturegenskaper"
 
-#: ../Src/wptKeysigDlg.cpp:180
+#: Src/wptKeysigDlg.cpp:180
 msgid "Non-exportable"
 msgstr "Icke-exporterbar"
 
-#: ../Src/wptKeysigDlg.cpp:193
-#: ../Src/wptSigList.cpp:153
+#: Src/wptKeysigDlg.cpp:193 Src/wptSigList.cpp:153
 msgid "  user ID not found"
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:316
+#: Src/wptKeysigDlg.cpp:316
 msgid "Really receive all missing keys?"
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:350
-#: ../Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:350 Src/wptSigTreeDlg.cpp:115
 msgid "Signature &Properties"
 msgstr "Signature&genskaper"
 
-#: ../Src/wptKeysigDlg.cpp:351
+#: Src/wptKeysigDlg.cpp:351
 msgid "Signing &Key Properties"
 msgstr "Egenskaper för signerings&nyckel"
 
-#: ../Src/wptKeysigDlg.cpp:388
+#: Src/wptKeysigDlg.cpp:388
 msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:399
+#: Src/wptKeysigDlg.cpp:399
 msgid "Key not found in keyring."
 msgstr ""
 
-#: ../Src/wptKeysigDlg.cpp:424
+#: Src/wptKeysigDlg.cpp:424
 #, c-format
 msgid "Signature List for \"%s\""
 msgstr "Signaturlista för \"%s\""
 
-#: ../Src/wptKeysigDlg.cpp:426
+#: Src/wptKeysigDlg.cpp:426
 msgid "&Receive Key"
 msgstr "Ta &emot nyckel"
 
-#: ../Src/wptKeysignDlg.cpp:78
+#: Src/wptKeysignDlg.cpp:75
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:174
 #, c-format
 msgid "Photo of %s"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:222
-#: ../Src/wptKeysignDlg.cpp:409
+#: Src/wptKeysignDlg.cpp:216 Src/wptKeysignDlg.cpp:333
 msgid "Choose Signature Class"
 msgstr "Välj signaturklass"
 
-#: ../Src/wptKeysignDlg.cpp:224
-msgid "How carefully have you verified the key you are about to sign actually belongs to the person? If you don't know what to anwser, use \"0\"."
+#: Src/wptKeysignDlg.cpp:218
+msgid ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs to the person? If you don't know what to anwser, use \"0\"."
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:226
+#: Src/wptKeysignDlg.cpp:220
 msgid "(0) I will not answer (default)"
 msgstr "(0) Jag vill inte svara (standard)"
 
-#: ../Src/wptKeysignDlg.cpp:228
+#: Src/wptKeysignDlg.cpp:222
 msgid "(1) I have not checked at all."
 msgstr "(1) Jag har inte kontrollerat alls."
 
-#: ../Src/wptKeysignDlg.cpp:230
+#: Src/wptKeysignDlg.cpp:224
 msgid "(2) I have done causal checking."
 msgstr "(2) Jag har gjort en flyktig kontroll."
 
-#: ../Src/wptKeysignDlg.cpp:232
+#: Src/wptKeysignDlg.cpp:226
 msgid "(3) I have done very careful checking."
 msgstr "(3) Jag har gjort en mycket noggrann kontroll."
 
-#: ../Src/wptKeysignDlg.cpp:271
+#: Src/wptKeysignDlg.cpp:265
 msgid "never"
 msgstr "aldrig"
 
-#: ../Src/wptKeysignDlg.cpp:304
+#: Src/wptKeysignDlg.cpp:297
 #, c-format
 msgid ""
 "pub %d/0x%s   created: %s    expires: %s\n"
@@ -4194,114 +3754,107 @@
 "\n"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:321
+#: Src/wptKeysignDlg.cpp:312
 msgid ""
 "\n"
 "\n"
 "Are you really sure that you want to sign this key with YOUR key?\n"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:351
+#: Src/wptKeysignDlg.cpp:351
+msgid "You cannot select today as the expiration date."
+msgstr ""
+
+#: Src/wptKeysignDlg.cpp:382
+msgid "This key is already signed by your key"
+msgstr ""
+
+#: Src/wptKeysignDlg.cpp:407
 msgid "No valid secret key found."
 msgstr "Ingen giltig hemlig nyckel hittades."
 
-#: ../Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:413
 msgid "Sign local only (non exportable signature)"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:358
+#: Src/wptKeysignDlg.cpp:414
 msgid "Signature expires on"
 msgstr "Signaturen går ut den"
 
-#: ../Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:415
 msgid "Sign non-revocably"
 msgstr "Signera icke-spärrbar"
 
-#: ../Src/wptKeysignDlg.cpp:360
+#: Src/wptKeysignDlg.cpp:416
 msgid "&Ask for certification level"
 msgstr "&Fråga efter certifieringsnivå"
 
-#: ../Src/wptKeysignDlg.cpp:363
+#: Src/wptKeysignDlg.cpp:419
 msgid "&Show photo"
 msgstr "&Visa foto"
 
-#: ../Src/wptKeysignDlg.cpp:364
-#: ../Src/wptPassphraseCB.cpp:98
-#: ../Src/wptPassphraseCB.cpp:104
-#: ../Src/wptPassphraseDlg.cpp:103
-#: ../Src/wptPINDlg.cpp:53
+#: Src/wptKeysignDlg.cpp:420 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:98 Src/wptPassphraseDlg.cpp:94 Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr ""
 
-#: ../Src/wptKeysignDlg.cpp:425
-msgid "You cannot select today as the expiration date."
-msgstr ""
-
-#: ../Src/wptKeysignDlg.cpp:460
-msgid "This key is already signed by your key"
-msgstr ""
-
-#: ../Src/wptKeyTrustPathDlg.cpp:136
+#: Src/wptKeyTrustPathDlg.cpp:136
 msgid "Trustlist"
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:105
+#: Src/wptMainProc.cpp:105
 msgid "Delete Clipboard Contents"
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:107
+#: Src/wptMainProc.cpp:107
 msgid "&Remember the answer"
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:109
+#: Src/wptMainProc.cpp:109
 msgid "Do you want to delete the contents from the clipboard?"
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:156
+#: Src/wptMainProc.cpp:156
 msgid "Could not access secret keyring."
 msgstr "Kunde inte komma åt hemlig nyckelring."
 
-#: ../Src/wptMainProc.cpp:216
-#: ../Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:216 Src/wptTextInputDlg.cpp:79
 msgid "Text Input"
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:244
+#: Src/wptMainProc.cpp:244
 msgid "Unknown OpenPGP type."
 msgstr "Okänd OpenPGP-typ."
 
-#: ../Src/wptMainProc.cpp:345
+#: Src/wptMainProc.cpp:345
 msgid "Could not set current window mode hooks."
 msgstr ""
 
-#: ../Src/wptMainProc.cpp:397
+#: Src/wptMainProc.cpp:398
 msgid "About..."
 msgstr "Om..."
 
-#: ../Src/wptMainProc.cpp:403
-#: ../Src/wptMainProc.cpp:407
+#: Src/wptMainProc.cpp:404 Src/wptMainProc.cpp:408
 msgid "Decrypt/Verify"
 msgstr "Dekryptera/Validera"
 
-#: ../Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:419
 msgid "Current Window"
 msgstr "Aktuellt fönster"
 
-#: ../Src/wptMainProc.cpp:476
+#: Src/wptMainProc.cpp:477
 msgid "Remove all passphrases from cache?"
 msgstr "Ta bort alla lösenfraser från cachen?"
 
-#: ../Src/wptMainProc.cpp:477
-#: ../Src/wptProgressDlg.cpp:136
-#: ../Src/wptRegistry.cpp:274
+#: Src/wptMainProc.cpp:478 Src/wptProgressDlg.cpp:136 Src/wptRegistry.cpp:274
 msgid "WinPT"
 msgstr "WinPT"
 
-#: ../Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:488
 msgid "Could not access public keyring, exit WinPT?"
 msgstr "Kunde inte komma åt publik nyckelring, avsluta WinPT?"
 
-#: ../Src/wptMainProc.cpp:520
+#: Src/wptMainProc.cpp:521
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4310,85 +3863,89 @@
 "Se till att fönstret innehåller text.\n"
 "%s."
 
-#: ../Src/wptMAPI.cpp:133
-#: ../Src/wptMAPI.cpp:208
+#: Src/wptMAPI.cpp:133 Src/wptMAPI.cpp:208
 msgid "MAPI Login failed"
 msgstr ""
 
-#: ../Src/wptMAPI.cpp:140
+#: Src/wptMAPI.cpp:140
 msgid "Could not send mail."
 msgstr "Kunde inte skicka e-post."
 
-#: ../Src/wptMAPI.cpp:263
+#: Src/wptMAPI.cpp:263
 msgid "Could not sent mail."
 msgstr "Kunde inte skicka e-post."
 
-#: ../Src/wptMDSumDlg.cpp:189
+#: Src/wptMDSumDlg.cpp:189
 msgid "Digest"
 msgstr "Sammandrag"
 
-#: ../Src/wptMDSumDlg.cpp:209
+#: Src/wptMDSumDlg.cpp:209
 msgid "Save to clipboard"
 msgstr "Spara till urklipp"
 
-#: ../Src/wptMDSumDlg.cpp:210
+#: Src/wptMDSumDlg.cpp:210
 msgid "Print Message Digest"
 msgstr ""
 
-#: ../Src/wptMDSumDlg.cpp:269
+#: Src/wptMDSumDlg.cpp:269
 msgid "Select File to Save Checksums"
 msgstr "Välj fil att spara kontrollsummor till"
 
-#: ../Src/wptMDSumDlg.cpp:277
+#: Src/wptMDSumDlg.cpp:277
 #, c-format
 msgid "Checksums successfully saved in '%s'"
 msgstr ""
 
-#: ../Src/wptOwnertrustDlg.cpp:100
-msgid "Here it is possible to save or restore the ownertrust from the 'trustdb' file. This could be very useful because the values are NOT stored in the keyring."
+#: Src/wptOwnertrustDlg.cpp:100
+msgid ""
+"Here it is possible to save or restore the ownertrust from the 'trustdb' "
+"file. This could be very useful because the values are NOT stored in the "
+"keyring."
 msgstr ""
 
-#: ../Src/wptOwnertrustDlg.cpp:111
+#: Src/wptOwnertrustDlg.cpp:111
 msgid "Select File Name for Output"
 msgstr ""
 
-#: ../Src/wptOwnertrustDlg.cpp:119
+#: Src/wptOwnertrustDlg.cpp:119
 msgid "Ownertrust successfully exported."
 msgstr ""
 
-#: ../Src/wptOwnertrustDlg.cpp:123
+#: Src/wptOwnertrustDlg.cpp:123
 msgid "Select File Name for Input"
 msgstr ""
 
-#: ../Src/wptOwnertrustDlg.cpp:131
+#: Src/wptOwnertrustDlg.cpp:131
 msgid "Ownertrust successfully imported."
 msgstr ""
 
-#: ../Src/wptPassphraseCB.cpp:100
+#: Src/wptPassphraseCB.cpp:94
 msgid "Encrypted with the following public key(s)"
 msgstr "Krypterad med följande publika nycklar"
 
-#: ../Src/wptPassphraseCB.cpp:144
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr "Okänd nyckelidentitet (%s, 0x%s)"
+#: Src/wptPassphraseCB.cpp:127
+#, fuzzy
+msgid "Unknown key ID"
+msgstr "Okänd snabbtangent"
 
-#: ../Src/wptPassphraseCB.cpp:156
+#: Src/wptPassphraseCB.cpp:140
 msgid "Bad passphrase; Enter passphrase again"
 msgstr "Fel lösenfras; Ange lösenfrasen igen"
 
-#: ../Src/wptPassphraseCB.cpp:157
+#: Src/wptPassphraseCB.cpp:141
 msgid "Please enter your passphrase"
 msgstr "Ange din lösenfras"
 
-#: ../Src/wptPassphraseCB.cpp:161
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
+#: Src/wptPassphraseCB.cpp:147
+#, fuzzy
+msgid "Symmetric encryption."
+msgstr "Symmetrisk kryptering"
+
+#: Src/wptPassphraseCB.cpp:149
+msgid "encrypted data."
 msgstr ""
 
-#: ../Src/wptPassphraseCB.cpp:300
+#: Src/wptPassphraseCB.cpp:281
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4396,7 +3953,7 @@
 "%s key, ID 0x%s (main key ID 0x%s)\n"
 msgstr ""
 
-#: ../Src/wptPassphraseCB.cpp:306
+#: Src/wptPassphraseCB.cpp:287
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4404,7 +3961,7 @@
 "%s key, ID 0x%s\n"
 msgstr ""
 
-#: ../Src/wptPassphraseCB.cpp:395
+#: Src/wptPassphraseCB.cpp:376
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -4413,24 +3970,23 @@
 "Ange PIN-koden för att låsa upp din hemliga kortnyckel\n"
 "Card: %s"
 
-#: ../Src/wptPassphraseDlg.cpp:91
-#: ../Src/wptPassphraseDlg.cpp:137
+#: Src/wptPassphraseDlg.cpp:82 Src/wptPassphraseDlg.cpp:128
 msgid "Passphrase Dialog"
 msgstr ""
 
-#: ../Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:87
 msgid "Repeat Passphrase"
 msgstr "Repetera lösenfras"
 
-#: ../Src/wptPassphraseDlg.cpp:98
+#: Src/wptPassphraseDlg.cpp:89
 msgid "Enter Passphrase"
 msgstr "Ange lösenfras"
 
-#: ../Src/wptPassphraseDlg.cpp:136
+#: Src/wptPassphraseDlg.cpp:127
 msgid "Please enter a passphrase."
 msgstr "Ange en lösenfras."
 
-#: ../Src/wptPassphraseDlg.cpp:144
+#: Src/wptPassphraseDlg.cpp:135
 msgid ""
 "Your passphrase should be at least 8 characters long\n"
 "and should contain non-alphabetic characters.\n"
@@ -4438,593 +3994,402 @@
 "Continue?"
 msgstr ""
 
-#: ../Src/wptPassphraseDlg.cpp:154
+#: Src/wptPassphraseDlg.cpp:145
 msgid ""
 "The passphrase contains 8-bit characters.\n"
 "It is not suggested to use charset specific characters.\n"
 "Continue?"
 msgstr ""
 
-#: ../Src/wptPINDlg.cpp:74
+#: Src/wptPINDlg.cpp:74
 msgid "Please enter a PIN."
 msgstr "Ange en PIN-kod."
 
-#: ../Src/wptPINDlg.cpp:74
-#: ../Src/wptPINDlg.cpp:85
-#: ../Src/wptPINDlg.cpp:91
-#: ../Src/wptPINDlg.cpp:104
-#: ../Src/wptPINDlg.cpp:110
+#: Src/wptPINDlg.cpp:74 Src/wptPINDlg.cpp:85 Src/wptPINDlg.cpp:91
+#: Src/wptPINDlg.cpp:104 Src/wptPINDlg.cpp:110
 msgid "PIN"
 msgstr "PIN-kod"
 
-#: ../Src/wptPINDlg.cpp:84
+#: Src/wptPINDlg.cpp:84
 msgid "'Admin PIN' must be at least 8 characters long."
 msgstr ""
 
-#: ../Src/wptPINDlg.cpp:90
-#: ../Src/wptPINDlg.cpp:109
+#: Src/wptPINDlg.cpp:90 Src/wptPINDlg.cpp:109
 msgid "PIN's are currently limited to US-ASCII"
 msgstr ""
 
-#: ../Src/wptPINDlg.cpp:103
+#: Src/wptPINDlg.cpp:103
 msgid "'User PIN' must be at least 6 characters long."
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:101
+#: Src/wptPreferencesDlg.cpp:101
 msgid "Do not use any &temporary files"
 msgstr "Använd inga &temporärfiler"
 
-#: ../Src/wptPreferencesDlg.cpp:102
+#: Src/wptPreferencesDlg.cpp:102
 msgid "Use clipboard &viewer to display the plaintext"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:103
+#: Src/wptPreferencesDlg.cpp:103
 msgid "Word wrap cleartext &signatures at column"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:104
+#: Src/wptPreferencesDlg.cpp:104
 msgid "&Disable hotkeys (Not recommended!)"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:105
+#: Src/wptPreferencesDlg.cpp:105
 msgid "Skip key validation and assume that keys are always fully trusted"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:106
+#: Src/wptPreferencesDlg.cpp:106
 msgid "&Automatic keyring backup when WinPT closes"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:107
+#: Src/wptPreferencesDlg.cpp:107
 msgid "Backup to &keyring folder"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:108
+#: Src/wptPreferencesDlg.cpp:108
 msgid "Backup to:"
 msgstr "Säkerhetskopiera till:"
 
-#: ../Src/wptPreferencesDlg.cpp:109
+#: Src/wptPreferencesDlg.cpp:109
 msgid "Select &key list mode"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:110
+#: Src/wptPreferencesDlg.cpp:110
 msgid "Keyserver &config"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:111
+#: Src/wptPreferencesDlg.cpp:111
 msgid "Cache &passphrases for 'n' minutes"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:112
+#: Src/wptPreferencesDlg.cpp:112
 msgid "(CTRL+ALT+F to clear the cache)"
 msgstr "(CTRL+ALT+F för att tömma cachen)"
 
-#: ../Src/wptPreferencesDlg.cpp:113
+#: Src/wptPreferencesDlg.cpp:113
 msgid "General options"
 msgstr "Allmänna alternativ"
 
-#: ../Src/wptPreferencesDlg.cpp:114
+#: Src/wptPreferencesDlg.cpp:114
 msgid "Clipboard hotkeys"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:115
+#: Src/wptPreferencesDlg.cpp:115
 msgid "Current window hotkeys"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:118
+#: Src/wptPreferencesDlg.cpp:118
 msgid "Default extension for encrypted files"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:119
+#: Src/wptPreferencesDlg.cpp:119
 msgid "&Backup includes secret keyring"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:206
+#: Src/wptPreferencesDlg.cpp:206
 msgid ""
 "In most cases it is not a good idea to enable this setting.\n"
 "If you know what you are doing, you can enable this flag, otherwise\n"
 "it is safe to leave this flag untouched."
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:240
+#: Src/wptPreferencesDlg.cpp:240
 msgid "Select GPG backup path"
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:252
+#: Src/wptPreferencesDlg.cpp:252
 msgid ""
 "Please enter a value that is between 1-720.\n"
 "It is not a good idea to cache the passphrase more than 12 hours."
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:265
+#: Src/wptPreferencesDlg.cpp:265
 msgid "Please enter a value between 1-80."
 msgstr "Ange ett värde mellan 1-80."
 
-#: ../Src/wptPreferencesDlg.cpp:286
+#: Src/wptPreferencesDlg.cpp:286
 msgid "The specified backup folder is invalid."
 msgstr ""
 
-#: ../Src/wptPreferencesDlg.cpp:321
+#: Src/wptPreferencesDlg.cpp:321
 msgid "Hotkeys"
 msgstr "Snabbtangenter"
 
-#: ../Src/wptProgressDlg.cpp:135
+#: Src/wptProgressDlg.cpp:135
 msgid "Could not create progress thread."
 msgstr "Kunde inte skapa förloppstråd."
 
-#: ../Src/wptProxySettingsDlg.cpp:105
+#: Src/wptProxySettingsDlg.cpp:105
 msgid "Invalid host or IP address."
 msgstr "Ogiltig värd eller IP-adress."
 
-#: ../Src/wptProxySettingsDlg.cpp:114
+#: Src/wptProxySettingsDlg.cpp:114
 msgid "Please enter the proxy hostname."
 msgstr "Ange proxyns värdnamn."
 
-#: ../Src/wptProxySettingsDlg.cpp:120
+#: Src/wptProxySettingsDlg.cpp:120
 msgid "Invalid port number."
 msgstr "Ogiltigt portnummer."
 
-#: ../Src/wptProxySettingsDlg.cpp:126
+#: Src/wptProxySettingsDlg.cpp:126
 msgid "Please select a value from 0-65535 for the port"
 msgstr ""
 
-#: ../Src/wptProxySettingsDlg.cpp:131
+#: Src/wptProxySettingsDlg.cpp:131
 msgid "When you want to use authentication, please fill out both fields."
 msgstr ""
 
-#: ../Src/wptProxySettingsDlg.cpp:136
+#: Src/wptProxySettingsDlg.cpp:136
 msgid "Please enter a host name and a port."
 msgstr ""
 
-#: ../Src/wptProxySettingsDlg.cpp:192
+#: Src/wptProxySettingsDlg.cpp:192
 msgid "Proxy host name or IP address"
 msgstr ""
 
-#: ../Src/wptProxySettingsDlg.cpp:193
+#: Src/wptProxySettingsDlg.cpp:193
 msgid "Server requires &authentication"
 msgstr ""
 
-#: ../Src/wptProxySettingsDlg.cpp:194
+#: Src/wptProxySettingsDlg.cpp:194
 msgid "User name"
 msgstr "Användarnamn"
 
-#: ../Src/wptProxySettingsDlg.cpp:195
+#: Src/wptProxySettingsDlg.cpp:195
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../Src/wptProxySettingsDlg.cpp:196
+#: Src/wptProxySettingsDlg.cpp:196
 msgid "Proxy type"
 msgstr "Proxytyp"
 
-#: ../Src/wptProxySettingsDlg.cpp:197
+#: Src/wptProxySettingsDlg.cpp:197
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../Src/wptProxySettingsDlg.cpp:232
+#: Src/wptProxySettingsDlg.cpp:232
 msgid "Please fill out all required fields for authentication."
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:225
+#: Src/wptRegistry.cpp:225
 msgid "GPG Detached Signature"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:226
+#: Src/wptRegistry.cpp:226
 msgid "GPG Encrypted Data"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:227
+#: Src/wptRegistry.cpp:227
 msgid "GPG Armored Data"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:272
+#: Src/wptRegistry.cpp:272
 msgid ""
-"WinPT can register some GPG file types for you so they can be processed with a double click in the explorer.\n"
+"WinPT can register some GPG file types for you so they can be processed with "
+"a double click in the explorer.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:280
+#: Src/wptRegistry.cpp:280
 msgid "WinPT WARNING"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:281
+#: Src/wptRegistry.cpp:281
 #, c-format
 msgid ""
-"It seems there was already a '%s' file type registered by another application.\n"
+"It seems there was already a '%s' file type registered by another "
+"application.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: ../Src/wptRegistry.cpp:596
+#: Src/wptRegistry.cpp:596
 msgid "Could not write to Registry."
 msgstr "Kunde inte skriva till registret."
 
-#: ../Src/wptSigList.cpp:54
+#: Src/wptSigList.cpp:54
 msgid "Valid"
 msgstr "Giltig"
 
-#: ../Src/wptSigList.cpp:58
+#: Src/wptSigList.cpp:58
 msgid "Expiration"
 msgstr ""
 
-#: ../Src/wptSigTreeDlg.cpp:164
+#: Src/wptSigTreeDlg.cpp:164
 #, c-format
 msgid "Signature Tree for \"%s\" (0x%s)"
 msgstr "Signaturträd för \"%s\" (0x%s)"
 
-#: ../Src/wptSigTreeDlg.cpp:166
+#: Src/wptSigTreeDlg.cpp:166
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: ../Src/wptTextInputDlg.cpp:49
+#: Src/wptTextInputDlg.cpp:49
 msgid "Data is too large for copying."
 msgstr ""
 
-#: ../Src/wptTextInputDlg.cpp:83
+#: Src/wptTextInputDlg.cpp:83
 msgid "Enter the text that was signed"
 msgstr ""
 
-#: ../Src/wptTextInputDlg.cpp:94
+#: Src/wptTextInputDlg.cpp:94
 msgid "Text Input from File"
 msgstr ""
 
-#: ../Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:79
 #, c-format
 msgid "PKA: Verified signer's address is '%s'"
 msgstr ""
 
-#: ../Src/wptVerifyList.cpp:139
+#: Src/wptVerifyList.cpp:109
 msgid ""
 "WARNING: This key is not certified with a trusted signature!\r\n"
-"                   There is no indication that the signature belongs to the owner.\r\n"
+"                   There is no indication that the signature belongs to the "
+"owner.\r\n"
 msgstr ""
 
-#: ../Src/wptVerifyList.cpp:144
+#: Src/wptVerifyList.cpp:114
 msgid "The signature is expired!"
 msgstr "Signaturen har gått ut!"
 
-#: ../Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:140
 msgid "Signed"
 msgstr "Signerad"
 
-#: ../MyGPGME/errors.c:59
-msgid "End of file"
-msgstr "Slut på filen"
+#~ msgid ""
+#~ "%s\n"
+#~ "Name: %s %s\n"
+#~ "Serial-No: %s\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Namn: %s %s\n"
+#~ "Serienummer: %s\n"
 
-#: ../MyGPGME/errors.c:60
-msgid "No Error"
-msgstr "Inga fel"
+#~ msgid "Unknown key ID (%s, 0x%s)"
+#~ msgstr "Okänd nyckelidentitet (%s, 0x%s)"
 
-#: ../MyGPGME/errors.c:61
-msgid "General Error"
-msgstr "Allmänt fel"
+#~ msgid "End of file"
+#~ msgstr "Slut på filen"
 
-#: ../MyGPGME/errors.c:62
-msgid "Out Of Core"
-msgstr ""
+#~ msgid "No Error"
+#~ msgstr "Inga fel"
 
-#: ../MyGPGME/errors.c:63
-msgid "Invalid Value"
-msgstr "Ogiltigt värde"
+#~ msgid "General Error"
+#~ msgstr "Allmänt fel"
 
-#: ../MyGPGME/errors.c:64
-msgid "Busy"
-msgstr "Upptagen"
+#~ msgid "Invalid Value"
+#~ msgstr "Ogiltigt värde"
 
-#: ../MyGPGME/errors.c:65
-msgid "No Request"
-msgstr ""
+#~ msgid "Busy"
+#~ msgstr "Upptagen"
 
-#: ../MyGPGME/errors.c:66
-msgid "Exec Error"
-msgstr ""
+#~ msgid "Too Many Procs"
+#~ msgstr "För många processer"
 
-#: ../MyGPGME/errors.c:67
-msgid "Too Many Procs"
-msgstr "För många processer"
+#~ msgid "No Recipients"
+#~ msgstr "Inga mottagare"
 
-#: ../MyGPGME/errors.c:68
-msgid "Pipe Error"
-msgstr ""
+#~ msgid "Invalid Recipients"
+#~ msgstr "Ogiltiga mottagare"
 
-#: ../MyGPGME/errors.c:69
-msgid "No Recipients"
-msgstr "Inga mottagare"
+#~ msgid "No Data"
+#~ msgstr "Ingen data"
 
-#: ../MyGPGME/errors.c:70
-msgid "Invalid Recipients"
-msgstr "Ogiltiga mottagare"
+#~ msgid "Not Implemented"
+#~ msgstr "Inte implementerat"
 
-#: ../MyGPGME/errors.c:71
-msgid "No Data"
-msgstr "Ingen data"
+#~ msgid "Read Error"
+#~ msgstr "Läsfel"
 
-#: ../MyGPGME/errors.c:72
-msgid "Conflict"
-msgstr ""
+#~ msgid "Write Error"
+#~ msgstr "Skrivfel"
 
-#: ../MyGPGME/errors.c:73
-msgid "Not Implemented"
-msgstr "Inte implementerat"
+#~ msgid "Invalid Type"
+#~ msgstr "Ogiltig typ"
 
-#: ../MyGPGME/errors.c:74
-msgid "Read Error"
-msgstr "Läsfel"
+#~ msgid "Invalid Mode"
+#~ msgstr "Ogiltigt läge"
 
-#: ../MyGPGME/errors.c:75
-msgid "Write Error"
-msgstr "Skrivfel"
+#~ msgid "Decryption Failed"
+#~ msgstr "Dekryptering misslyckades"
 
-#: ../MyGPGME/errors.c:76
-msgid "Invalid Type"
-msgstr "Ogiltig typ"
+#~ msgid "Signing Failed"
+#~ msgstr "Signering misslyckades"
 
-#: ../MyGPGME/errors.c:77
-msgid "Invalid Mode"
-msgstr "Ogiltigt läge"
+#~ msgid "Encryption Failed"
+#~ msgstr "Kryptering misslyckades"
 
-#: ../MyGPGME/errors.c:78
-msgid "File Error"
-msgstr ""
+#~ msgid "No Passphrase"
+#~ msgstr "Ingen lösenfras"
 
-#: ../MyGPGME/errors.c:79
-msgid "Decryption Failed"
-msgstr "Dekryptering misslyckades"
+#~ msgid "No secret key available"
+#~ msgstr "Inge hemlig nyckel tillgänglig"
 
-#: ../MyGPGME/errors.c:80
-msgid "Signing Failed"
-msgstr "Signering misslyckades"
+#~ msgid "No public key available"
+#~ msgstr "Ingen publik nyckel tillgänglig"
 
-#: ../MyGPGME/errors.c:81
-msgid "Encryption Failed"
-msgstr "Kryptering misslyckades"
+#~ msgid "Cancelled"
+#~ msgstr "Avbruten"
 
-#: ../MyGPGME/errors.c:82
-msgid "No Passphrase"
-msgstr "Ingen lösenfras"
+#~ msgid "Invalid Key"
+#~ msgstr "Ogiltig nyckel"
 
-#: ../MyGPGME/errors.c:83
-msgid "No secret key available"
-msgstr "Inge hemlig nyckel tillgänglig"
+#~ msgid "Invalid Engine"
+#~ msgstr "Ogiltig motor"
 
-#: ../MyGPGME/errors.c:84
-msgid "No public key available"
-msgstr "Ingen publik nyckel tillgänglig"
+#~ msgid "Bad Signature"
+#~ msgstr "Felaktig signatur"
 
-#: ../MyGPGME/errors.c:85
-msgid "Cancelled"
-msgstr "Avbruten"
+#~ msgid "Bad Passphrase"
+#~ msgstr "Felaktig lösenfras"
 
-#: ../MyGPGME/errors.c:86
-msgid "Invalid Key"
-msgstr "Ogiltig nyckel"
+#~ msgid "Cannot open Clipboard"
+#~ msgstr "Kan inte öppna urklipp"
 
-#: ../MyGPGME/errors.c:87
-msgid "Invalid Engine"
-msgstr "Ogiltig motor"
+#~ msgid "Clipboard is empty"
+#~ msgstr "Urklipp är tom"
 
-#: ../MyGPGME/errors.c:88
-msgid "Bad Signature"
-msgstr "Felaktig signatur"
+#~ msgid "No specific reason given"
+#~ msgstr "Ingen specifik anledning angavs"
 
-#: ../MyGPGME/errors.c:89
-msgid "Bad Passphrase"
-msgstr "Felaktig lösenfras"
+#~ msgid "Not Found"
+#~ msgstr "Hittades inte"
 
-#: ../MyGPGME/errors.c:90
-msgid "Cannot open Clipboard"
-msgstr "Kan inte öppna urklipp"
+#~ msgid "Wrong key usage"
+#~ msgstr "Fel nyckelanvändning"
 
-#: ../MyGPGME/errors.c:91
-msgid "Clipboard is empty"
-msgstr "Urklipp är tom"
+#~ msgid "Not a secret key"
+#~ msgstr "Inte en hemlig nyckel"
 
-#: ../MyGPGME/errors.c:92
-msgid "Cannot get Clipboard data"
-msgstr ""
+#~ msgid "Please enter a passphrase for the volume."
+#~ msgstr "Ange en lösenfras för volymen."
 
-#: ../MyGPGME/errors.c:93
-msgid ""
-"Internal GPG Problem, no more information available.\n"
-"Please run GPG on the console to check this."
-msgstr ""
+#~ msgid "Please enter a password."
+#~ msgstr "Ange ett lösenord."
 
-#: ../MyGPGME/errors.c:95
-msgid "Protection algorithm 1 (IDEA) is not supported."
-msgstr ""
+#~ msgid "Drive %s (ID %d); Size %d MB, Readonly=%s"
+#~ msgstr "Enhet %s (id %d); Storlek %d MB, Skrivskyddad=%s"
 
-#: ../MyGPGME/errors.c:96
-msgid "Config file (gpg.conf) contains invalid option."
-msgstr ""
+#~ msgid "No error"
+#~ msgstr "Inga fel"
 
-#: ../MyGPGME/errors.c:97
-msgid "Smartcard operation failure"
-msgstr ""
+#~ msgid "Network is unreachable"
+#~ msgstr "Nätverket är inte nåbart"
 
-#: ../MyGPGME/errors.c:98
-msgid "No specific reason given"
-msgstr "Ingen specifik anledning angavs"
+#~ msgid "Host could not be resolved"
+#~ msgstr "Värden kunde inte slås upp"
 
-#: ../MyGPGME/errors.c:99
-msgid "Not Found"
-msgstr "Hittades inte"
+#~ msgid "Address type is not supported"
+#~ msgstr "Adresstypen stöds inte"
 
-#: ../MyGPGME/errors.c:100
-msgid "Ambigious specification"
-msgstr ""
+#~ msgid "Unknown SOCKS error"
+#~ msgstr "Okänt SOCKS-fel"
 
-#: ../MyGPGME/errors.c:101
-msgid "Wrong key usage"
-msgstr "Fel nyckelanvändning"
+#~ msgid "No acceptable methods"
+#~ msgstr "Inga acceptabla metoder"
 
-#: ../MyGPGME/errors.c:102
-msgid "Key revoked"
-msgstr ""
-
-#: ../MyGPGME/errors.c:103
-msgid "Key expired"
-msgstr ""
-
-#: ../MyGPGME/errors.c:104
-msgid "Not a secret key"
-msgstr "Inte en hemlig nyckel"
-
-#: ../MyGPGME/errors.c:105
-msgid "Key not trusted"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:140
-msgid "Could not execute Cryptdisk Server."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:141
-#: ../Src/wptCryptdisk.cpp:419
-#: ../Src/wptCryptdisk.cpp:521
-#: ../Src/wptCryptdisk.cpp:547
-#: ../Src/wptCryptdisk.cpp:553
-#: ../Src/wptCryptdisk.cpp:562
-#: ../Src/wptCryptdisk.cpp:575
-#: ../Src/wptCryptdisk.cpp:669
-msgid "Cryptdisk Error"
-msgstr ""
-
-#. xxx
-#: ../Src/wptCryptdisk.cpp:417
-msgid ""
-"The Cryptdisk service seems to be available but it is not started yet.\n"
-"Please start the service and try again."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:454
-msgid "Please enter a name for the image file."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:455
-#: ../Src/wptCryptdisk.cpp:470
-#: ../Src/wptCryptdisk.cpp:476
-#: ../Src/wptCryptdisk.cpp:482
-#: ../Src/wptCryptdisk.cpp:651
-msgid "Cryptdisk"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:459
-msgid ""
-"This volume file already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:461
-msgid "Cryptdisk Warning"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:469
-msgid "Please enter the size for the volume"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:475
-msgid "There is not enough free disk space to store the volume."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:481
-msgid "Please enter a passphrase for the volume."
-msgstr "Ange en lösenfras för volymen."
-
-#: ../Src/wptCryptdisk.cpp:520
-msgid "Cannot determine the number of drives."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:537
-msgid "Select Crypdisk Volume"
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:546
-msgid "Please enter the name of the image file."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:552
-msgid "Please enter a password."
-msgstr "Ange ett lösenord."
-
-#: ../Src/wptCryptdisk.cpp:561
-msgid "Image file does not exist or could not be accessed."
-msgstr ""
-
-#: ../Src/wptCryptdisk.cpp:600
-#, c-format
-msgid "Drive %s (ID %d); Size %d MB, Readonly=%s"
-msgstr "Enhet %s (id %d); Storlek %d MB, Skrivskyddad=%s"
-
-#: ../Src/wptCryptdisk.cpp:651
-msgid "Please select one drive to umount."
-msgstr ""
-
-#: ../Src/wptSOCKS.cpp:64
-msgid "No error"
-msgstr "Inga fel"
-
-#: ../Src/wptSOCKS.cpp:65
-msgid "General SOCKS error"
-msgstr ""
-
-#: ../Src/wptSOCKS.cpp:66
-msgid "Connection not allowed by ruleset"
-msgstr ""
-
-#: ../Src/wptSOCKS.cpp:67
-msgid "Network is unreachable"
-msgstr "Nätverket är inte nåbart"
-
-#: ../Src/wptSOCKS.cpp:68
-msgid "Host could not be resolved"
-msgstr "Värden kunde inte slås upp"
-
-#: ../Src/wptSOCKS.cpp:70
-msgid "Address type is not supported"
-msgstr "Adresstypen stöds inte"
-
-#: ../Src/wptSOCKS.cpp:72
-msgid "Unknown SOCKS error"
-msgstr "Okänt SOCKS-fel"
-
-#: ../Src/wptSOCKS.cpp:281
-msgid "No acceptable methods"
-msgstr "Inga acceptabla metoder"
-
-#: ../Src/wptSOCKS.cpp:281
-#: ../Src/wptSOCKS.cpp:287
-#: ../Src/wptSOCKS.cpp:289
-#: ../Src/wptSOCKS.cpp:294
-#: ../Src/wptSOCKS.cpp:300
-#: ../Src/wptSOCKS.cpp:302
-msgid "SOCKS Proxy"
-msgstr ""
-
-#: ../Src/wptSOCKS.cpp:286
-msgid "Authentication failed or unspported"
-msgstr "Autentisering misslyckades eller stöds inte"
-
-#: ../Src/wptSOCKS.cpp:293
-msgid "Could not send SOCKS request"
-msgstr ""
-
-#: ../Src/wptSOCKS.cpp:299
-msgid "Error while parsing SOCKS reply"
-msgstr ""
-
+#~ msgid "Authentication failed or unspported"
+#~ msgstr "Autentisering misslyckades eller stöds inte"



More information about the Winpt-commits mailing list