[Winpt-commits] r226 - in trunk: . Doc Include Po Src

Mon Jun 12 15:40:27 CEST 2006

Author: twoaday
Date: 2006-06-12 15:40:21 +0200 (Mon, 12 Jun 2006)
New Revision: 226

Modified:
   trunk/Doc/winpt.texi
   trunk/Include/wptGPG.h
   trunk/Include/wptKeyserver.h
   trunk/NEWS
   trunk/Po/ChangeLog
   trunk/Po/de.po
   trunk/Po/jp.po
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/WinPT.cpp
   trunk/Src/resource.h
   trunk/Src/wptClipboard.cpp
   trunk/Src/wptCurrWnd.cpp
   trunk/Src/wptFileCBS.cpp
   trunk/Src/wptFileManager.cpp
   trunk/Src/wptFileStatDlg.cpp
   trunk/Src/wptGPGMEData.cpp
   trunk/Src/wptKeyCache.cpp
   trunk/Src/wptKeyEditDlgs.cpp
   trunk/Src/wptKeyManager.cpp
   trunk/Src/wptKeyManagerDlg.cpp
   trunk/Src/wptKeyPropsDlg.cpp
   trunk/Src/wptKeylist.cpp
   trunk/Src/wptKeyserver.cpp
   trunk/Src/wptKeysignDlg.cpp
   trunk/Src/wptMainProc.cpp
   trunk/Src/wptSigList.cpp
   trunk/Src/wptSymEnc.cpp
   trunk/configure.ac
Log:
Prepare new release.



Modified: trunk/Doc/winpt.texi
===================================================================

--- trunk/Doc/winpt.texi	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Doc/winpt.texi	2006-06-12 13:40:21 UTC (rev 226)
@@ -373,4 +373,27 @@
 unuseable. You really should trust the selected key, in case it is
 not a key owned by yourself.
 
+ at subsection Export a Public Key
+There are several reason why to export a public key and there
+are also several ways to do it. If you want to send the key
+directly to a mail recipient, you can select the key, right-click,
+and select "Send Key to Mail Recipient". As an alternative, you
+can also export it to the clipboard or to a file. To export a
+key to the clipboard, you can select "Copy key to Clipboard"
+in the popup menu of the selected key. To export it to a file,
+you need to select the menu "Key" and then "Export...". The
+program will automatically suggest a name for the output.
+
+ at subsection Import a Public Key
+Similar to the key import, the import of a key can be done in
+several ways. First, let's assume you got a mail with an OpenPGP
+key included as inline text. Then you can use the current window
+feature and "Decrypt/Verify" to import the key. Alternative you
+also may use the clipboard. To achieve this, you first need to
+select the entire key (CTRL+A) and then copy it to the clipboard
+(CTRL+C), then use the Key Manager (Edit->Paste) to import it.
+If the key is stored as an attachment, or you want to import
+a key from a file in general, just drag the file and drop it
+into the Key Manager window or use "Key" -> "Import...".
+
 @bye

Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Include/wptGPG.h	2006-06-12 13:40:21 UTC (rev 226)
@@ -166,7 +166,7 @@
 gpgme_error_t keycache_init (const char *pubring, const char * secring);
 gpg_keycache_t keycache_get_ctx (int _pub);
 
-int gpg_encrypt_symmetric (void);
+gpgme_error_t gpg_clip_sym_encrypt (void);
 const char *get_gpg_sigstat (gpgme_sigsum_t sum);
 int check_ultimate_trusted_key (void);
 bool secret_key_available (void);

Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Include/wptKeyserver.h	2006-06-12 13:40:21 UTC (rev 226)
@@ -23,6 +23,7 @@
 
 #define HKP_PORT     11371 /* Horowitz Keyserver Protocol */
 #define FINGER_PORT	79 /* Finger Protocol */
+#define LDAP_PORT      389 /* Light Weight Dir Access Protocol. */
 
 /* Default keyserver URL. */
 #define DEF_HKP_KEYSERVER "http://subkeys.pgp.net"

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/NEWS	2006-06-12 13:40:21 UTC (rev 226)
@@ -846,4 +846,14 @@
   a revoked user id as the primary ID. And similar
   that a fully trusted user ID cannot be signed again.
   
+* The Key Manager now remembers the window size and
+  restore the values from the registry and resize the
+  window accordingly.
+  
+* The key sign dialog now has a feature to display the
+  photo of the key owner if it is available.
+
+* Fix a problem in the key edit dialog when a new
+  subkey was added and the algorithm was displayed
+  as "???".
   
\ No newline at end of file

Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Po/ChangeLog	2006-06-12 13:40:21 UTC (rev 226)
@@ -1,3 +1,7 @@
+2006-06-09  Timo Schulz  <ts at g10code.de>
+
+	* de.po: Updated.
+	
 2006-06-04  Timo Schulz  <ts at g10code.de>
 
 	* de.po: Updated.

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Po/de.po	2006-06-12 13:40:21 UTC (rev 226)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 1.0.0\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-06 15:30+0200\n"
+"POT-Creation-Date: 2006-06-09 11:38+0200\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"
@@ -32,7 +32,7 @@
 #: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
 #: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
 #: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:353 Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:355 Src/wptMainProc.cpp:533
 msgid "WinPT Error"
 msgstr "WinPT Fehler"
 
@@ -40,7 +40,7 @@
 msgid "No useable secret key found."
 msgstr "Kein benutzbarer geheimer Schlüssel gefunden."
 
-#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:359 Src/wptKeyPropsDlg.cpp:366
+#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:356 Src/wptKeyPropsDlg.cpp:363
 msgid "WinPT Warning"
 msgstr "WinPT Warnung"
 
@@ -62,7 +62,7 @@
 msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
 
 #: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:959 Src/wptKeyserver.cpp:601
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyserver.cpp:601
 #: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
 #: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
 #: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
@@ -188,8 +188,8 @@
 msgstr ""
 "Die Datei AUTHORS enthält eine Liste aller Co-Autoren und aller Beitragenden"
 
-#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1790
-#: Src/wptMainProc.cpp:580
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1888
+#: Src/wptMainProc.cpp:582
 msgid "About WinPT"
 msgstr "Über WinPT"
 
@@ -239,11 +239,11 @@
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
 #: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2129
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:997
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:408
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:410
 msgid "Card Manager"
 msgstr "Kartenmanager"
 
@@ -267,7 +267,7 @@
 #: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
 #: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
 #: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:293
+#: Src/wptMainProc.cpp:295
 msgid "Card Edit"
 msgstr "Karten-Editor"
 
@@ -356,7 +356,7 @@
 msgid "Make off-card backup of encryption key"
 msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
 
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1686
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1784
 msgid "Card Key Generation"
 msgstr "Karten-Schlüsselerzeugung"
 
@@ -385,7 +385,7 @@
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
 
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1377 Src/wptKeygenDlg.cpp:453
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1378 Src/wptKeygenDlg.cpp:453
 msgid "The date you have chosen lies in the past."
 msgstr "Das gewählte Datum liegt in der Vergangenheit."
 
@@ -494,22 +494,22 @@
 #: Src/wptClipDecryptDlg.cpp:169 Src/wptClipVerifyDlg.cpp:157
 #: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
 #: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
-#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1567
-#: Src/wptFileManager.cpp:1620 Src/wptFileManagerDlg.cpp:590
+#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
+#: Src/wptFileManager.cpp:1622 Src/wptFileManagerDlg.cpp:590
 #: Src/wptFileVerifyDlg.cpp:82 Src/wptFileVerifyDlg.cpp:149
-#: Src/wptMainProc.cpp:182 Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:262
-#: Src/wptMainProc.cpp:270 Src/wptMainProc.cpp:419
+#: Src/wptMainProc.cpp:184 Src/wptMainProc.cpp:250 Src/wptMainProc.cpp:264
+#: Src/wptMainProc.cpp:272 Src/wptMainProc.cpp:421
 msgid "Verify"
 msgstr "Überprüfen"
 
 #: Src/wptClipDecryptDlg.cpp:176 Src/wptClipDecryptDlg.cpp:189
 #: Src/wptClipDecryptDlg.cpp:197 Src/wptClipDecryptDlg.cpp:204
-#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1271
-#: Src/wptFileManager.cpp:1322
+#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1276
+#: Src/wptFileManager.cpp:1327
 msgid "Decryption"
 msgstr "Entschlüsselung"
 
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1323
+#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1328
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -549,7 +549,7 @@
 #: Src/wptClipDecryptDlg.cpp:219 Src/wptClipEncryptDlg.cpp:210
 #: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
 #: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
-#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:91
+#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:92
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
@@ -557,12 +557,12 @@
 #: Src/wptClipEditDlg.cpp:120 Src/wptClipEditDlg.cpp:159
 #: Src/wptClipEditDlg.cpp:168 Src/wptClipEditDlg.cpp:238
 #: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:275
-#: Src/wptMainProc.cpp:431 Src/wptMainProc.cpp:512 Src/wptMainProc.cpp:517
+#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:232 Src/wptMainProc.cpp:277
+#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:519
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
-#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:569
+#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:572
 msgid "File Open"
 msgstr "Datei öffnen"
 
@@ -587,8 +587,8 @@
 "\"%s\" existiert bereits.\n"
 "Vorhandene Datei überschreiben?"
 
-#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:172 Src/wptMainProc.cpp:238
-#: Src/wptMainProc.cpp:574
+#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:174 Src/wptMainProc.cpp:240
+#: Src/wptMainProc.cpp:576
 msgid "Clipboard Editor"
 msgstr "Zwischenablagen-Editor"
 
@@ -631,8 +631,8 @@
 
 #: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:154
 #: Src/wptClipEncryptDlg.cpp:200 Src/wptClipEncryptDlg.cpp:207
-#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:144
-#: Src/wptMainProc.cpp:212
+#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:146
+#: Src/wptMainProc.cpp:214
 msgid "Encryption"
 msgstr "Verschlüsseln"
 
@@ -650,7 +650,7 @@
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
 #: Src/wptKeygenDlg.cpp:544 Src/wptKeyRevokeDlg.cpp:81
 #: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:293 Src/wptPassphraseCB.cpp:93
+#: Src/wptKeysignDlg.cpp:334 Src/wptPassphraseCB.cpp:93
 #: Src/wptPassphraseDlg.cpp:102 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
@@ -680,9 +680,9 @@
 #: Src/wptClipSignDlg.cpp:159 Src/wptClipSignDlg.cpp:227
 #: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:251
 #: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
-#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1081
-#: Src/wptFileManager.cpp:1097 Src/wptFileManager.cpp:1387
-#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
+#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1086
+#: Src/wptFileManager.cpp:1102 Src/wptFileManager.cpp:1392
+#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:220
 msgid "Signing"
 msgstr "Signieren"
 
@@ -701,7 +701,7 @@
 
 #: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
 #: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:150 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:226
 msgid "Sign & Encrypt"
 msgstr "Signieren & Verschlüsseln"
 
@@ -714,7 +714,7 @@
 msgid "Signing key:"
 msgstr "Signierer Schlüssel:"
 
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1202
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1205
 msgid "No key was selected."
 msgstr "Kein Schlüssel ausgewählt."
 
@@ -770,9 +770,9 @@
 #: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1036
 #: Src/wptKeyEditDlgs.cpp:1047 Src/wptKeyEditDlgs.cpp:1298
 #: Src/wptKeyEditDlgs.cpp:1303 Src/wptKeyEditDlgs.cpp:1307
-#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1353 Src/wptKeyEditDlgs.cpp:1363
-#: Src/wptKeyEditDlgs.cpp:1378 Src/wptKeyEditDlgs.cpp:1382
+#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1364
+#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1383
 #: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1427
 #: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1440
 #: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1488
@@ -790,8 +790,8 @@
 #: Src/wptKeyEditDlgs.cpp:2002 Src/wptKeyEditDlgs.cpp:2069
 #: Src/wptKeyEditDlgs.cpp:2106 Src/wptKeyEditDlgs.cpp:2119
 #: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2173
-#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:993
-#: Src/wptKeyManagerDlg.cpp:1814
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1912
 msgid "Key Edit"
 msgstr "Schlüssel bearbeiten"
 
@@ -1001,14 +1001,14 @@
 msgstr "Unbekannter Fehler=%d"
 
 #: Src/wptFileManager.cpp:107 Src/wptFileManager.cpp:129
-#: Src/wptFileManager.cpp:135 Src/wptFileManager.cpp:174
-#: Src/wptFileManager.cpp:299 Src/wptFileManager.cpp:663
-#: Src/wptFileManager.cpp:808 Src/wptFileManager.cpp:923
-#: Src/wptFileManager.cpp:1473 Src/wptFileManager.cpp:1500
-#: Src/wptFileManager.cpp:1519 Src/wptFileManager.cpp:1771
-#: Src/wptFileManager.cpp:1833 Src/wptFileManagerDlg.cpp:536
+#: Src/wptFileManager.cpp:135 Src/wptFileManager.cpp:176
+#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:668
+#: Src/wptFileManager.cpp:813 Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:1478 Src/wptFileManager.cpp:1505
+#: Src/wptFileManager.cpp:1524 Src/wptFileManager.cpp:1774
+#: Src/wptFileManager.cpp:1836 Src/wptFileManagerDlg.cpp:536
 #: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:406 Src/wptMDSumDlg.cpp:184
+#: Src/wptMainProc.cpp:408 Src/wptMDSumDlg.cpp:184
 msgid "File Manager"
 msgstr "Dateimanager"
 
@@ -1026,7 +1026,7 @@
 msgstr "Konnte Dateiattribut nicht auf normal zurücksetzen"
 
 # c:\oss\winpt-gpgme\src\wptFileManager.cpp:147
-#: Src/wptFileManager.cpp:170
+#: Src/wptFileManager.cpp:172
 msgid ""
 "Multi-Media files are already compressed, GPG would compress\n"
 "them anyway and this costs a lot of time.\n"
@@ -1039,26 +1039,26 @@
 "\n"
 "Möchten Sie die Kompression ausschalten?"
 
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1081
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1081
 #: Src/wptVerifyList.cpp:161
 msgid "Status"
 msgstr "Status"
 
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1171
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1171
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:112
 #: Src/wptVerifyList.cpp:160
 msgid "Name"
 msgstr "Name"
 
-#: Src/wptFileManager.cpp:384
+#: Src/wptFileManager.cpp:386
 msgid "Operation"
 msgstr "Prozess"
 
-#: Src/wptFileManager.cpp:662
+#: Src/wptFileManager.cpp:667
 msgid "Please select a file."
 msgstr "Bitte eine Datei auswählen."
 
-#: Src/wptFileManager.cpp:809
+#: Src/wptFileManager.cpp:814
 #, c-format
 msgid ""
 "\"%s\" does not seems to be a text file.\n"
@@ -1067,58 +1067,62 @@
 "\"%s\" scheint keine Text-Datei zu sein.\n"
 "Möchsten Sie wirklich diese Datei signieren?"
 
-#: Src/wptFileManager.cpp:924
+#: Src/wptFileManager.cpp:929
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "\"%s\" existiert nicht"
 
-#: Src/wptFileManager.cpp:1007 Src/wptFileStatDlg.cpp:273
+#: Src/wptFileManager.cpp:1012 Src/wptFileStatDlg.cpp:273
 #: Src/wptFileStatDlg.cpp:279
 msgid "File Status"
 msgstr "Dateistatus"
 
-#: Src/wptFileManager.cpp:1051
-msgid "Enter filename for encrypted file"
-msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
+#: Src/wptFileManager.cpp:1056
+msgid "Enter Filename for Encrypted File"
+msgstr "Namen für die verschlüsselte Datei auswählen"
 
-#: Src/wptFileManager.cpp:1080
+#: Src/wptFileManager.cpp:1085
 msgid "Could not get default secret key."
 msgstr "Konnte den geheimen Standardschlüssel nicht finden."
 
-#: Src/wptFileManager.cpp:1111 Src/wptFileManager.cpp:1423
-#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:200
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
+#: Src/wptFileManager.cpp:1116 Src/wptFileManager.cpp:1428
+#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:202
+#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
 msgid "Sign"
 msgstr "Signieren"
 
-#: Src/wptFileManager.cpp:1124 Src/wptFileManagerDlg.cpp:586
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1129 Src/wptFileManagerDlg.cpp:586
+#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: Src/wptFileManager.cpp:1151 Src/wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1189 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1156 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:90
+msgid "Symmetric Encryption"
+msgstr "Symmetrisch verschlüsseln"
+
+#: Src/wptFileManager.cpp:1189 Src/wptFileManager.cpp:1194
+#: Src/wptMainProc.cpp:416
 msgid "Symmetric"
 msgstr "Symmetrisch"
 
-#: Src/wptFileManager.cpp:1189
+#: Src/wptFileManager.cpp:1194
 msgid "Encryption failed."
 msgstr "Verschlüsselung fehlgeschlagen."
 
-#: Src/wptFileManager.cpp:1280
+#: Src/wptFileManager.cpp:1285
 msgid "Choose Filename for Output"
 msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1289
-msgid "Please enter filename for plaintext file"
-msgstr "Wählen Sie einen Namen für die Klartext-Datei"
+#: Src/wptFileManager.cpp:1294
+msgid "Enter Filename for Plaintext File"
+msgstr "Namen für die Klartext-Datei auswählen"
 
-#: Src/wptFileManager.cpp:1331 Src/wptFileManager.cpp:1351
+#: Src/wptFileManager.cpp:1336 Src/wptFileManager.cpp:1356
 #: Src/wptFileManagerDlg.cpp:587
 msgid "Decrypt"
 msgstr "Entschlüsseln"
 
-#: Src/wptFileManager.cpp:1337
+#: Src/wptFileManager.cpp:1342
 #, c-format
 msgid ""
 "Decryption failed.\n"
@@ -1127,7 +1131,7 @@
 "Entshlüsselung fehlgeschlagen.\n"
 "%s: existiert nicht."
 
-#: Src/wptFileManager.cpp:1352
+#: Src/wptFileManager.cpp:1357
 #, c-format
 msgid ""
 "The original file name is '%s'.\n"
@@ -1138,32 +1142,32 @@
 "\n"
 "Wollen Sie diesen anstatt von '%s' benutzen?"
 
-#: Src/wptFileManager.cpp:1400
-msgid "Enter filename for signed file"
-msgstr "Wählen Sie einen Namen für die signierte Datei"
+#: Src/wptFileManager.cpp:1405
+msgid "Enter Filename for Signed File"
+msgstr "Namen für die signierte Datei auswählen"
 
-#: Src/wptFileManager.cpp:1499
+#: Src/wptFileManager.cpp:1504
 msgid "Could not find detached signature in the clipboard."
 msgstr "Konnte abgetrennte Signatur in der Zwischenablage nicht finden."
 
 # c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1524
 msgid "No files to check."
 msgstr "Keine Datei(en) zu pruefen."
 
-#: Src/wptFileManager.cpp:1536
+#: Src/wptFileManager.cpp:1541
 msgid "Select Data File"
 msgstr "Bitte Datendatei auswählen"
 
-#: Src/wptFileManager.cpp:1538
+#: Src/wptFileManager.cpp:1543
 msgid "Selected Output File"
 msgstr "Bitte Ausgabedatei auswählen"
 
-#: Src/wptFileManager.cpp:1567
+#: Src/wptFileManager.cpp:1569
 msgid "Invalid file name. Exit"
 msgstr "Ungültiger Dateiname. Abbruch"
 
-#: Src/wptFileManager.cpp:1665 Src/wptFileManager.cpp:1676
+#: Src/wptFileManager.cpp:1667 Src/wptFileManager.cpp:1678
 #: Src/wptFileManagerDlg.cpp:257 Src/wptImportList.cpp:404
 #: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
 #: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
@@ -1172,7 +1176,7 @@
 msgid "Import"
 msgstr "Importieren"
 
-#: Src/wptFileManager.cpp:1673
+#: Src/wptFileManager.cpp:1675
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -1184,58 +1188,58 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren!"
 
-#: Src/wptFileManager.cpp:1699 Src/wptKeyManager.cpp:264
+#: Src/wptFileManager.cpp:1701 Src/wptKeyManager.cpp:264
 #: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
 msgid "No key was selected for export."
 msgstr "Kein Schlüssel zum Exportieren ausgewählt."
 
-#: Src/wptFileManager.cpp:1699 Src/wptFileManager.cpp:1722
+#: Src/wptFileManager.cpp:1702 Src/wptFileManager.cpp:1725
 #: Src/wptKeyserverDlg.cpp:92
 msgid "Export"
 msgstr "Exportieren"
 
-#: Src/wptFileManager.cpp:1707 Src/wptKeyManagerDlg.cpp:1750
-#: Src/wptKeyManagerDlg.cpp:1782
+#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1848
+#: Src/wptKeyManagerDlg.cpp:1880
 msgid "Choose Name for Key File"
 msgstr "Den Namen der Schlüsseldatei wählen"
 
-#: Src/wptFileManager.cpp:1726 Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1061
 #: Src/wptKeyEditDlgs.cpp:1329 Src/wptKeyEditDlgs.cpp:1401
 #: Src/wptKeyserverDlg.cpp:104
 msgid "GnuPG status"
 msgstr "GnuPG Status"
 
-#: Src/wptFileManager.cpp:1726
+#: Src/wptFileManager.cpp:1729
 #, c-format
 msgid "Finished (Output: %s)"
 msgstr "Fertig (Ausgabe: %s)"
 
-#: Src/wptFileManager.cpp:1772
+#: Src/wptFileManager.cpp:1775
 #, c-format
 msgid "%s: no valid OpenPGP data found."
 msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
 
-#: Src/wptFileManager.cpp:1832
+#: Src/wptFileManager.cpp:1835
 msgid "Encrypting into a ZIP archive makes sense with multiple files"
 msgstr "Verschlüsseln in eine ZIP-Datei macht nur mit mehreren Dateien Sinn"
 
-#: Src/wptFileManager.cpp:1837
+#: Src/wptFileManager.cpp:1840
 msgid "Choose File Name for Output"
 msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1907
+#: Src/wptFileManager.cpp:1910
 msgid "Choose a Name for the Archive"
 msgstr "Wählen Sie den Namen für das Archiv"
 
-#: Src/wptFileManager.cpp:1910
+#: Src/wptFileManager.cpp:1913
 msgid "Invalid archive name. Exit."
 msgstr "Ungültiger Archivename. Abbruch."
 
-#: Src/wptFileManager.cpp:1910 Src/wptFileManager.cpp:1917
+#: Src/wptFileManager.cpp:1914 Src/wptFileManager.cpp:1922
 msgid "Encrypt Directory"
 msgstr "Verzeichnis verschlüsseln"
 
-#: Src/wptFileManager.cpp:1917
+#: Src/wptFileManager.cpp:1921
 msgid "Could not create zip archive."
 msgstr "Konnte ZIP-Datei nicht erstellen."
 
@@ -1260,7 +1264,7 @@
 msgstr "&Schlüssel zum Signieren"
 
 #: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:299
-#: Src/wptKeyManagerDlg.cpp:957
+#: Src/wptKeyManagerDlg.cpp:989
 msgid "Options"
 msgstr "Optionen"
 
@@ -1284,7 +1288,7 @@
 msgstr "%s enthält %d Schlüssel."
 
 #: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:505
-#: Src/wptKeyManagerDlg.cpp:930 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:962 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Datei"
 
@@ -1321,12 +1325,12 @@
 msgstr "Signaturmodus"
 
 #: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1303
-#: Src/wptKeyEditDlgs.cpp:1353 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1427
 #: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:784
-#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1558
-#: Src/wptKeyManagerDlg.cpp:1574 Src/wptKeyManagerDlg.cpp:1602
-#: Src/wptKeyManagerDlg.cpp:1618 Src/wptKeyManagerDlg.cpp:1633
-#: Src/wptKeyManagerDlg.cpp:1740 Src/wptKeyManagerDlg.cpp:1759
+#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1656
+#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeyManagerDlg.cpp:1700
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
+#: Src/wptKeyManagerDlg.cpp:1838 Src/wptKeyManagerDlg.cpp:1857
 #: Src/wptKeyserverSearchDlg.cpp:143
 msgid "Please select a key."
 msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1340,16 +1344,16 @@
 msgid "%d Object(s) marked"
 msgstr "%d Objekt(e) markiert"
 
-#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:544
+#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:546
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Dateimanager (Drag & Drop möglich)"
 
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:931
-#: Src/wptKeyManagerDlg.cpp:936 Src/wptKeyManagerDlg.cpp:947
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:963
+#: Src/wptKeyManagerDlg.cpp:968 Src/wptKeyManagerDlg.cpp:979
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:964
 msgid "View"
 msgstr "Ansicht"
 
@@ -1369,13 +1373,13 @@
 msgid "&Decrypt"
 msgstr "&Entschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:948
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:1028
 msgid "&Sign"
 msgstr "&Signieren"
 
 #: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:589
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
 msgid "Sign && Encrypt"
 msgstr "Signieren && Verschlüsseln"
 
@@ -1395,7 +1399,7 @@
 msgid "E&xport"
 msgstr "E&xportieren"
 
-#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:413
+#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:415
 msgid "Exit"
 msgstr "Beenden"
 
@@ -1458,11 +1462,11 @@
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
 
-#: Src/wptFileManagerDlg.cpp:784 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:784 Src/wptMainProc.cpp:102
 msgid "&Yes"
 msgstr "&Ja"
 
-#: Src/wptFileManagerDlg.cpp:785 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:785 Src/wptMainProc.cpp:103
 msgid "&No"
 msgstr "&Nein"
 
@@ -1574,8 +1578,8 @@
 #: Src/wptGPGPrefsDlg.cpp:223 Src/wptGPGPrefsDlg.cpp:229
 #: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:239
 #: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:958
-#: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:225
+#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:990
+#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:225
 #: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
 #: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
 #: Src/wptRegistry.cpp:596
@@ -1714,8 +1718,8 @@
 "Aktuelle Daten gehen verloren\n"
 "Sind Sie sicher?"
 
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1712
-#: Src/wptMainProc.cpp:592
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1810
+#: Src/wptMainProc.cpp:594
 msgid "GnuPG Preferences"
 msgstr "GnuPG-Einstellungen"
 
@@ -1812,20 +1816,20 @@
 #: Src/wptKeyManager.cpp:835 Src/wptKeyManager.cpp:892
 #: Src/wptKeyManager.cpp:897 Src/wptKeyManager.cpp:953
 #: Src/wptKeyManager.cpp:983 Src/wptKeyManager.cpp:1070
-#: Src/wptKeyManagerDlg.cpp:1218 Src/wptKeyManagerDlg.cpp:1231
-#: Src/wptKeyManagerDlg.cpp:1241 Src/wptKeyManagerDlg.cpp:1537
-#: Src/wptKeyManagerDlg.cpp:1559 Src/wptKeyManagerDlg.cpp:1574
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyManagerDlg.cpp:1592
-#: Src/wptKeyManagerDlg.cpp:1602 Src/wptKeyManagerDlg.cpp:1608
-#: Src/wptKeyManagerDlg.cpp:1618 Src/wptKeyManagerDlg.cpp:1633
-#: Src/wptKeyManagerDlg.cpp:1650 Src/wptKeyManagerDlg.cpp:1682
-#: Src/wptKeyManagerDlg.cpp:1741 Src/wptKeyManagerDlg.cpp:1759
-#: Src/wptKeyManagerDlg.cpp:1764 Src/wptKeyManagerDlg.cpp:1769
-#: Src/wptKeyManagerDlg.cpp:1840 Src/wptKeyManagerDlg.cpp:1845
-#: Src/wptKeyManagerDlg.cpp:1978 Src/wptKeysigDlg.cpp:94
+#: Src/wptKeyManagerDlg.cpp:1311 Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1332 Src/wptKeyManagerDlg.cpp:1635
+#: Src/wptKeyManagerDlg.cpp:1657 Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1682 Src/wptKeyManagerDlg.cpp:1690
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1706
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
+#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1780
+#: Src/wptKeyManagerDlg.cpp:1839 Src/wptKeyManagerDlg.cpp:1857
+#: Src/wptKeyManagerDlg.cpp:1862 Src/wptKeyManagerDlg.cpp:1867
+#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeyManagerDlg.cpp:1943
+#: Src/wptKeyManagerDlg.cpp:2056 Src/wptKeysigDlg.cpp:94
 #: Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309 Src/wptKeysigDlg.cpp:381
-#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:407
-#: Src/wptMainProc.cpp:555 Src/wptMainProc.cpp:563
+#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:557 Src/wptMainProc.cpp:565
 msgid "Key Manager"
 msgstr "Schlüsselverwaltung"
 
@@ -1904,15 +1908,15 @@
 #: Src/wptKeyEditDlgs.cpp:1439 Src/wptKeyEditDlgs.cpp:1459
 #: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1529
 #: Src/wptKeyEditDlgs.cpp:1596 Src/wptKeyEditDlgs.cpp:1762
-#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:421 Src/wptKeylist.cpp:455
-#: Src/wptKeyPropsDlg.cpp:161 Src/wptKeysigDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
 #: Src/wptKeysigDlg.cpp:207
 msgid "Revoked"
 msgstr "Widerrufen"
 
 #: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeylist.cpp:423 Src/wptKeylist.cpp:453 Src/wptKeyPropsDlg.cpp:159
+#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
 msgid "Expired"
 msgstr "Abgelaufen"
@@ -1921,7 +1925,7 @@
 msgid "secret key"
 msgstr "geheimer Schlüssel"
 
-#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:462
 msgid "public key"
 msgstr "öffentlicher Schlüssel"
 
@@ -1929,35 +1933,35 @@
 msgid "Invalid user ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
+#: Src/wptKeyManagerDlg.cpp:907 Src/wptKeyManagerDlg.cpp:976
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
 #: Src/wptVerifyList.cpp:165
 msgid "User ID"
 msgstr "Benutzerkennung"
 
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:878 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "Größe"
 
 #: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:585 Src/wptKeyManagerDlg.cpp:876
-#: Src/wptKeyManagerDlg.cpp:967 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:908
+#: Src/wptKeyManagerDlg.cpp:999 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
 #: Src/wptVerifyList.cpp:164
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
 #: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1079
-#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:591
-#: Src/wptKeyManagerDlg.cpp:882 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:594
+#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:1002
 #: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
 msgid "Creation"
 msgstr "Erstellung"
 
-#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:586
-#: Src/wptKeyManagerDlg.cpp:877 Src/wptKeyManagerDlg.cpp:969
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
+#: Src/wptKeyManagerDlg.cpp:909 Src/wptKeyManagerDlg.cpp:1001
 msgid "Type"
 msgstr "Typ"
 
@@ -1971,7 +1975,7 @@
 "und deshalb ein CRC Fehler auftrat."
 
 # c:\oss\winpt-gpgme\src\wptKeyCache.cpp:479
-#: Src/wptKeyCache.cpp:807
+#: Src/wptKeyCache.cpp:813
 msgid "Load GPG Keyrings..."
 msgstr "Lade GPG Schlüsselbunde..."
 
@@ -1987,12 +1991,12 @@
 msgid "Key Cache"
 msgstr "Schlüsselcache"
 
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:388
+#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:391
 msgid "Ultimate"
 msgstr "Absolut"
 
 #: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1139
-#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
+#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:385
 msgid "Never"
 msgstr "Niemals"
 
@@ -2034,7 +2038,7 @@
 "Das Bild muss eine JPEG Datei sein."
 
 #: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:292
+#: Src/wptKeysignDlg.cpp:333
 msgid "Passphrase"
 msgstr "Passwort"
 
@@ -2078,7 +2082,7 @@
 #: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1531
 #: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1816
 #: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
-#: Src/wptKeyPropsDlg.cpp:382 Src/wptOwnertrustDlg.cpp:119
+#: Src/wptKeyPropsDlg.cpp:379 Src/wptOwnertrustDlg.cpp:119
 #: Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "GnuPG-Status"
@@ -2185,9 +2189,9 @@
 
 #: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:817
 #: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
-#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1349
 #: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyManagerDlg.cpp:1591
+#: Src/wptKeyManagerDlg.cpp:1689
 msgid "There is no secret key available!"
 msgstr "Kein geheimer Schlüssel vorhanden!"
 
@@ -2200,7 +2204,7 @@
 msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
 
 #: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:373
+#: Src/wptKeyPropsDlg.cpp:370
 msgid "Change Ownertrust"
 msgstr "Besitzervertrauen ändern"
 
@@ -2229,6 +2233,8 @@
 "Are you sure that you really don't want a passphrase?\n"
 "This is propably a bad idea, still proceed?"
 msgstr ""
+"Sind Sie sicher das Sie wirklich keine Passphrase wollen?\n"
+"Das ist generell keine gute Idee, trotzdem fortfahren?"
 
 #: Src/wptKeyEditDlgs.cpp:1045 Src/wptPassphraseDlg.cpp:248
 msgid ""
@@ -2246,7 +2252,7 @@
 msgid "Passphrase successfully changed."
 msgstr "Passwort erfolgreich geändert."
 
-#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:883
+#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:915
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2254,8 +2260,8 @@
 msgid "Expires"
 msgstr "Verfällt"
 
-#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
+#: Src/wptKeyManagerDlg.cpp:912
 msgid "Validity"
 msgstr "Gültigkeit"
 
@@ -2340,7 +2346,7 @@
 msgid "Subkey successfully deleted."
 msgstr "Unterschlüssel erfolgreich gelöscht."
 
-#: Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeyEditDlgs.cpp:1362
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -2350,11 +2356,11 @@
 "\n"
 "Wollen Sie das Ablaufdatum ändern?"
 
-#: Src/wptKeyEditDlgs.cpp:1370 Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1374
 msgid "Key Expiration Date"
 msgstr "Ablaufdatum"
 
-#: Src/wptKeyEditDlgs.cpp:1394
+#: Src/wptKeyEditDlgs.cpp:1395
 msgid "Expire Subkey"
 msgstr "Untschlüssel Ablauf"
 
@@ -2479,7 +2485,7 @@
 msgid "Do you really want to make this sig exportable?"
 msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
 
-#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:401
+#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:442
 msgid "Key successfully signed."
 msgstr "Schlüssel erfolgreich signiert."
 
@@ -2561,8 +2567,8 @@
 msgstr "Bitte wählen Sie einen Eintrag."
 
 #: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:938
-#: Src/wptKeyManagerDlg.cpp:1806 Src/wptKeyPropsDlg.cpp:294
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:1904 Src/wptKeyPropsDlg.cpp:285
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
 #: Src/wptOwnertrustDlg.cpp:128
 msgid "Ownertrust"
@@ -2585,7 +2591,7 @@
 #: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:432
 #: Src/wptKeygenDlg.cpp:440 Src/wptKeygenDlg.cpp:454 Src/wptKeygenDlg.cpp:461
 #: Src/wptKeygenDlg.cpp:470 Src/wptKeygenDlg.cpp:491 Src/wptKeygenDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1673 Src/wptPassphraseDlg.cpp:145
+#: Src/wptKeyManagerDlg.cpp:1771 Src/wptPassphraseDlg.cpp:145
 msgid "Key Generation"
 msgstr "Schlüsselerzeugung"
 
@@ -2743,7 +2749,7 @@
 
 #: Src/wptKeygenDlg.cpp:543 Src/wptKeygenDlg.cpp:561 Src/wptKeygenDlg.cpp:566
 #: Src/wptKeygenDlg.cpp:573 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:599
-#: Src/wptKeyManagerDlg.cpp:1696
+#: Src/wptKeyManagerDlg.cpp:1794
 msgid "Key Generation Wizard"
 msgstr "Schlüsselerzeugungs-Assistent"
 
@@ -2803,54 +2809,54 @@
 msgid "No keys updated."
 msgstr "Kein(e) Schlüssel aktualisiert."
 
-#: Src/wptKeylist.cpp:260
+#: Src/wptKeylist.cpp:261
 msgid "Key Pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:262
+#: Src/wptKeylist.cpp:263
 msgid "Key Pair (Card)"
 msgstr "Schlüsselpaar (Karte)"
 
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:264
 msgid "Public Key"
 msgstr "Öffentlicher Schlüssel"
 
-#: Src/wptKeylist.cpp:380
+#: Src/wptKeylist.cpp:383
 msgid "None"
 msgstr "Keine"
 
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:387
 msgid "Marginal"
 msgstr "Marginal"
 
 # c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:386
+#: Src/wptKeylist.cpp:389
 msgid "Full"
 msgstr "Voll"
 
-#: Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:451 Src/wptKeyPropsDlg.cpp:163
+#: Src/wptKeylist.cpp:428 Src/wptKeylist.cpp:454 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "Inaktiv"
 
-#: Src/wptKeylist.cpp:461
+#: Src/wptKeylist.cpp:464
 msgid "key pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:879
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1000
 msgid "Cipher"
 msgstr "Cipher"
 
-#: Src/wptKeylist.cpp:590 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:913
 #: Src/wptVerifyList.cpp:163
 msgid "Trust"
 msgstr "Vertrauen"
 
-#: Src/wptKeylist.cpp:761 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:764 Src/wptPassphraseCB.cpp:124
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptKeylist.cpp:1029
+#: Src/wptKeylist.cpp:1032
 #, c-format
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
@@ -2865,11 +2871,11 @@
 "\n"
 "\"%s\" trotzdem benutzen?"
 
-#: Src/wptKeylist.cpp:1037 Src/wptKeylist.cpp:1099
+#: Src/wptKeylist.cpp:1040 Src/wptKeylist.cpp:1102
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: Src/wptKeylist.cpp:1100
+#: Src/wptKeylist.cpp:1103
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -2878,7 +2884,7 @@
 "Schlüssel ID %s.\n"
 "Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
 
-#: Src/wptKeylist.cpp:1202
+#: Src/wptKeylist.cpp:1205
 msgid "Secret Key List"
 msgstr "Liste der geheimen Schlüssel"
 
@@ -3059,217 +3065,217 @@
 msgid "3. Key is no longer used"
 msgstr "3. Der Schlüssel wird nicht mehr benutzt"
 
-#: Src/wptKeyManagerDlg.cpp:455 Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:483 Src/wptKeyManagerDlg.cpp:1020
 msgid "Paste Key from Clipboard"
 msgstr "Schlüssel aus Ablage einfügen"
 
-#: Src/wptKeyManagerDlg.cpp:476
+#: Src/wptKeyManagerDlg.cpp:504
 #, c-format
 msgid "Default Key: %s"
 msgstr "Standardschlüssel: %s"
 
-#: Src/wptKeyManagerDlg.cpp:478
+#: Src/wptKeyManagerDlg.cpp:506
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "Standardschlüssel: 0x%s"
 
-#: Src/wptKeyManagerDlg.cpp:499
+#: Src/wptKeyManagerDlg.cpp:527
 #, c-format
 msgid "%d secret keys"
 msgstr "%d geheime Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:500
+#: Src/wptKeyManagerDlg.cpp:528
 #, c-format
 msgid "%d keys"
 msgstr "%d Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:933
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Key"
 msgstr "Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:1256
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptKeyManagerDlg.cpp:1348
 msgid "Groups"
 msgstr "Gruppen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Send Mail..."
 msgstr "E-Mail versenden..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopieren\tCtrl+C"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "&Paste\tCtrl+V"
 msgstr "&Einfügen\tCtrl+V"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:973
 msgid "Search...\tCtrl+F"
 msgstr "Suchen...\tCtrl+F"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:974
 msgid "Select All\tCtrl+A"
 msgstr "Alles markieren\tCtrl+A"
 
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:975
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:977
 msgid "&Expert"
 msgstr "&Experte"
 
-#: Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "&Normal"
 msgstr "&Normal"
 
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:950
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:981 Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:1026
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:983 Src/wptKeyManagerDlg.cpp:1027
 msgid "&Revoke Cert"
 msgstr "Widerruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:952 Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:1023
 msgid "&List Signatures"
 msgstr "Signaturen anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:1613
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:1711
 #: Src/wptKeyTrustPathDlg.cpp:129
 msgid "List Trust Path"
 msgstr "Zeige Vertrauenspfad"
 
-#: Src/wptKeyManagerDlg.cpp:954
+#: Src/wptKeyManagerDlg.cpp:986
 msgid "&Export..."
 msgstr "&Exportieren..."
 
-#: Src/wptKeyManagerDlg.cpp:955
+#: Src/wptKeyManagerDlg.cpp:987
 msgid "&Import..."
 msgstr "&Importieren..."
 
-#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1024
 #: Src/wptKeysigDlg.cpp:419
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:992
 msgid "E&xport Secret Key"
 msgstr "E&xportiere geheimen Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:961
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "Re&load Key Cache"
 msgstr "Erneuere Sch&lüsselcache"
 
-#: Src/wptKeyManagerDlg.cpp:962
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "R&everify Signatures"
 msgstr "Signaturen erneut prüfen"
 
-#: Src/wptKeyManagerDlg.cpp:963
+#: Src/wptKeyManagerDlg.cpp:995
 msgid "Refresh &Keys (Keyserver)"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:964 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "Über"
 
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1015
 msgid "Copy User ID to Clipboard"
 msgstr "Kopiere Benutzerkennung in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1016
 msgid "Copy Key ID to Clipboard"
 msgstr "Kopiere Schlüssel ID in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:1017
 msgid "Copy Fingerprint to Clipboard"
 msgstr "Kopiere Fingerprint in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1018
 msgid "Copy Key Info to Clipboard"
 msgstr "Kopiere Schlüssel Info in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1019
 msgid "Copy Key to Clipboard"
 msgstr "Kopiere Schlüssel in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1021
 msgid "Refresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:1022
 msgid "Set Implicit &Trust"
 msgstr "Setze impliziertes Vertrauen"
 
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1029
 msgid "&Enable"
 msgstr "&Aktivieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1030
 msgid "&Disable"
 msgstr "&Deaktivieren"
 
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:1031
 msgid "Re&fresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1032
 msgid "Set preferred Keyserver URL"
 msgstr "Setze bevorzugte Keyserver URL"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:1033
 msgid "Send Key to Mail Recipient"
 msgstr "Sende Schlüssel an Mailempfänger"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1034
 msgid "Set as Default Key"
 msgstr "Setze als Default Key"
 
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1036
 msgid "Key..."
 msgstr "Schlüssel..."
 
-#: Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:1037
 msgid "User ID..."
 msgstr "Benutzerkennung..."
 
-#: Src/wptKeyManagerDlg.cpp:1006
+#: Src/wptKeyManagerDlg.cpp:1038
 msgid "Photo ID..."
 msgstr "Photo ID..."
 
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyManagerDlg.cpp:1039
 msgid "Revoker..."
 msgstr "Widerrufer..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1010
+#: Src/wptKeyManagerDlg.cpp:1042
 msgid "Key Attributes"
 msgstr "Schlüsselattribute"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1011
+#: Src/wptKeyManagerDlg.cpp:1043
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: Src/wptKeyManagerDlg.cpp:1012
+#: Src/wptKeyManagerDlg.cpp:1044
 msgid "Send to Keyserver"
 msgstr "Sende an Keyserver"
 
-#: Src/wptKeyManagerDlg.cpp:1229
+#: Src/wptKeyManagerDlg.cpp:1320
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
@@ -3277,98 +3283,98 @@
 "Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
 "Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
 
-#: Src/wptKeyManagerDlg.cpp:1240
+#: Src/wptKeyManagerDlg.cpp:1331
 msgid "Could not set keylist window procedure."
 msgstr "Konnte \"keylist window procedure\" nicht setzen."
 
-#: Src/wptKeyManagerDlg.cpp:1257
+#: Src/wptKeyManagerDlg.cpp:1349
 msgid "&Show"
 msgstr "&Anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:1258
+#: Src/wptKeyManagerDlg.cpp:1350
 msgid "&New..."
 msgstr "&Neu..."
 
 # c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1363
+#: Src/wptKeyManagerDlg.cpp:1461
 msgid "Generate new key pair"
 msgstr "Neues Schlüsselpaar erzeugen"
 
-#: Src/wptKeyManagerDlg.cpp:1367
+#: Src/wptKeyManagerDlg.cpp:1465
 msgid "Search for a specific key"
 msgstr "Suche nach einem bestimmten Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1371
+#: Src/wptKeyManagerDlg.cpp:1469
 msgid "Delete key from keyring"
 msgstr "Schlüssel aus Keyring löschen"
 
-#: Src/wptKeyManagerDlg.cpp:1375
+#: Src/wptKeyManagerDlg.cpp:1473
 msgid "Show key properties"
 msgstr "Schlüsseleigenschaften anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:1379
+#: Src/wptKeyManagerDlg.cpp:1477
 msgid "Sign key"
 msgstr "Signiere Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:1383
+#: Src/wptKeyManagerDlg.cpp:1481
 msgid "Copy key to clipboard"
 msgstr "Kopiere Schlüssel in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:1387
+#: Src/wptKeyManagerDlg.cpp:1485
 msgid "Paste key from clipboard"
 msgstr "Schlüssel aus Ablage einfügen"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1391
+#: Src/wptKeyManagerDlg.cpp:1489
 msgid "Import key to keyring"
 msgstr "In Schlüsselbund importieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1395
+#: Src/wptKeyManagerDlg.cpp:1493
 msgid "Export key to a file"
 msgstr "Schlüssel in Datei exportieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1524
+#: Src/wptKeyManagerDlg.cpp:1622
 msgid "New"
 msgstr "Neu"
 
-#: Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1634
 msgid "Could not access public keyring"
 msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
 
-#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeysignDlg.cpp:282
-#: Src/wptKeysignDlg.cpp:296 Src/wptKeysignDlg.cpp:358
-#: Src/wptKeysignDlg.cpp:374 Src/wptKeysignDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:396 Src/wptKeysignDlg.cpp:401
+#: Src/wptKeyManagerDlg.cpp:1665 Src/wptKeysignDlg.cpp:323
+#: Src/wptKeysignDlg.cpp:337 Src/wptKeysignDlg.cpp:399
+#: Src/wptKeysignDlg.cpp:415 Src/wptKeysignDlg.cpp:432
+#: Src/wptKeysignDlg.cpp:437 Src/wptKeysignDlg.cpp:442
 msgid "Key Signing"
 msgstr "Schlüsselsignierung"
 
-#: Src/wptKeyManagerDlg.cpp:1583
+#: Src/wptKeyManagerDlg.cpp:1681
 msgid "Key already revoked!"
 msgstr "Schlüssel ist bereits widerrufen!"
 
-#: Src/wptKeyManagerDlg.cpp:1597 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1695 Src/wptKeyRevokeDlg.cpp:70
 #: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:164
 #: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:177
 #: Src/wptKeyRevokeDlg.cpp:186 Src/wptKeyRevokeDlg.cpp:192
 msgid "Key Revocation Cert"
 msgstr "Schlüsselwiderruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:1607
+#: Src/wptKeyManagerDlg.cpp:1705
 msgid "It does not make any sense with a key pair!"
 msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
 
-#: Src/wptKeyManagerDlg.cpp:1624
+#: Src/wptKeyManagerDlg.cpp:1722
 msgid "Key Signature List"
 msgstr "Schlüssel-Signatur-Liste"
 
-#: Src/wptKeyManagerDlg.cpp:1641 Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyManagerDlg.cpp:1739 Src/wptKeyPropsDlg.cpp:281
 msgid "Key Properties"
 msgstr "Schlüsseleigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:1651
+#: Src/wptKeyManagerDlg.cpp:1749
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
@@ -3377,27 +3383,27 @@
 "Signierung etc.)\n"
 "Möchten Sie den Zwischenspeicher reinitialisieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1779
 msgid "Smart Card support is not available."
 msgstr "SmartCard-Unterstützung ist nicht verfügbar."
 
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1802 Src/wptKeyserverDlg.cpp:576
 msgid "Keyserver Access"
 msgstr "Schlüsselserver-Zugriff"
 
-#: Src/wptKeyManagerDlg.cpp:1721
+#: Src/wptKeyManagerDlg.cpp:1819
 msgid "GnuPG Options"
 msgstr "GnuPG Optionen"
 
-#: Src/wptKeyManagerDlg.cpp:1763
+#: Src/wptKeyManagerDlg.cpp:1861
 msgid "There is no corresponding secret key for this key."
 msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel vorhanden."
 
-#: Src/wptKeyManagerDlg.cpp:1768
+#: Src/wptKeyManagerDlg.cpp:1866
 msgid "You can only export one secret key."
 msgstr "Sie können nur einen geheimen Schlüssel exportieren."
 
-#: Src/wptKeyManagerDlg.cpp:1773
+#: Src/wptKeyManagerDlg.cpp:1871
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -3415,15 +3421,15 @@
 "\n"
 "Wirklich den Schlüssel exportieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1778
+#: Src/wptKeyManagerDlg.cpp:1876
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: Src/wptKeyManagerDlg.cpp:1839
+#: Src/wptKeyManagerDlg.cpp:1937
 msgid "No key was selected, select all by default."
 msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
 
-#: Src/wptKeyManagerDlg.cpp:1844
+#: Src/wptKeyManagerDlg.cpp:1942
 msgid "Keyserver refresh finished."
 msgstr "Erneuerung von Keyserver abgeschlossen."
 
@@ -3436,17 +3442,17 @@
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: Src/wptKeyPropsDlg.cpp:165
+#: Src/wptKeyPropsDlg.cpp:156
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: Src/wptKeyPropsDlg.cpp:213
+#: Src/wptKeyPropsDlg.cpp:204
 #, c-format
 msgid "Card-Type: %s\r\n"
 msgstr "Karten-Typ: %s\r\n"
 
 # c:\oss\winpt-gpgme\src\wptKeyPropsDlg.cpp:214
-#: Src/wptKeyPropsDlg.cpp:252
+#: Src/wptKeyPropsDlg.cpp:243
 #, c-format
 msgid ""
 "Type: %s\r\n"
@@ -3469,25 +3475,25 @@
 "Cipher: %s\r\n"
 "%s\r\n"
 
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:282
 msgid "&Change"
 msgstr "&Ändern"
 
-#: Src/wptKeyPropsDlg.cpp:292
+#: Src/wptKeyPropsDlg.cpp:283
 msgid "&Revokers"
 msgstr "&Widerrufer"
 
-#: Src/wptKeyPropsDlg.cpp:293
+#: Src/wptKeyPropsDlg.cpp:284
 msgid "Change &Password"
 msgstr "&Passwort ändern"
 
-#: Src/wptKeyPropsDlg.cpp:300
+#: Src/wptKeyPropsDlg.cpp:291
 msgid "Photo-ID not validated."
 msgstr "Foto-ID nicht geprüft."
 
 # msgid "Unknown"
 # msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:357
+#: Src/wptKeyPropsDlg.cpp:354
 msgid ""
 "The status of this key is 'revoked' or 'expired'.\n"
 "You cannot change the ownertrust of such keys."
@@ -3495,7 +3501,7 @@
 "Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
 "Sie können das Vertrauen in solche Schlüssel nicht ändern."
 
-#: Src/wptKeyPropsDlg.cpp:363
+#: Src/wptKeyPropsDlg.cpp:360
 msgid ""
 "This is a non-valid key.\n"
 "Modifying the ownertrust has no effect on such keys.\n"
@@ -3506,11 +3512,11 @@
 "Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptKeyPropsDlg.cpp:381
+#: Src/wptKeyPropsDlg.cpp:378
 msgid "Ownertrust successfully changed."
 msgstr "Besitzervertrauen erfolgreich geändert."
 
-#: Src/wptKeyPropsDlg.cpp:394 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:391 Src/wptKeyRevokersDlg.cpp:160
 msgid "Key Revokers"
 msgstr "Schlüsselwiderrufer"
 
@@ -3927,17 +3933,22 @@
 msgid "&Receive Key"
 msgstr "&Schlüssel empfangen"
 
-#: Src/wptKeysignDlg.cpp:73
+#: Src/wptKeysignDlg.cpp:77
 #, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr "%d-bit %s Schlüssel, ID 0x%s"
 
-#: Src/wptKeysignDlg.cpp:170 Src/wptKeysignDlg.cpp:341
+#: Src/wptKeysignDlg.cpp:179
+#, c-format
+msgid "Photo of %s"
+msgstr "Foto von %s"
+
+#: Src/wptKeysignDlg.cpp:219 Src/wptKeysignDlg.cpp:382
 msgid "Choose Signature Class"
 msgstr "Signaturklasse auswählen"
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:172
+#: Src/wptKeysignDlg.cpp:221
 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\"."
@@ -3946,30 +3957,30 @@
 "gehört? Wenn Sie nicht antworten wollen, bitte \"0\" benutzen."
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:174
+#: Src/wptKeysignDlg.cpp:223
 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:176
+#: Src/wptKeysignDlg.cpp:225
 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:178
+#: Src/wptKeysignDlg.cpp:227
 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:180
+#: Src/wptKeysignDlg.cpp:229
 msgid "(3) I have done very careful checkings."
 msgstr "(3) Ich habe gründliche Überprüfungen gemacht."
 
-#: Src/wptKeysignDlg.cpp:219
+#: Src/wptKeysignDlg.cpp:268
 msgid "never"
 msgstr "niemals"
 
-#: Src/wptKeysignDlg.cpp:270
+#: Src/wptKeysignDlg.cpp:311
 #, c-format
 msgid ""
 "pub %d/%s  created: %s    expires: %s\n"
@@ -3990,47 +4001,47 @@
 "\n"
 "Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
 
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:323
 msgid "No valid secret key found."
 msgstr "Keine gültigen geheimen Schlüssel gefunden."
 
-#: Src/wptKeysignDlg.cpp:288
+#: Src/wptKeysignDlg.cpp:329
 msgid "Sign local only (non exportable signature)"
 msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
 
-#: Src/wptKeysignDlg.cpp:289
+#: Src/wptKeysignDlg.cpp:330
 msgid "Signature expires on"
 msgstr "Signatur läuft ab am"
 
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:290
+#: Src/wptKeysignDlg.cpp:331
 msgid "Sign non-revocably"
 msgstr "Nicht-widerrufbar signieren"
 
-#: Src/wptKeysignDlg.cpp:291
+#: Src/wptKeysignDlg.cpp:332
 msgid "&Ask for certification level"
 msgstr "Zertifizierungslevel erfragen"
 
-#: Src/wptKeysignDlg.cpp:294
+#: Src/wptKeysignDlg.cpp:335
 msgid "&Show photo"
 msgstr "&Photo anzeigen"
 
 # c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:295 Src/wptPassphraseCB.cpp:96
+#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:96
 #: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:101
 #: Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "&Maskiere Eingabe"
 
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:398
 msgid "You cannot select today as the expiration date."
 msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
 
-#: Src/wptKeysignDlg.cpp:374
+#: Src/wptKeysignDlg.cpp:415
 msgid "Could not get Key ID from key."
 msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
 
-#: Src/wptKeysignDlg.cpp:395
+#: Src/wptKeysignDlg.cpp:436
 msgid "This key is already signed by your key"
 msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
 
@@ -4043,62 +4054,62 @@
 msgid "Delete Clipboard Contents"
 msgstr "Lösche Inhalt der Zwischenablage"
 
-#: Src/wptMainProc.cpp:98
+#: Src/wptMainProc.cpp:99
 msgid "&Remember the answer"
 msgstr "&Nicht mehr nachfragen"
 
-#: Src/wptMainProc.cpp:99
+#: Src/wptMainProc.cpp:101
 msgid "Do you want to delete the contents from the clipboard?"
 msgstr "Wollen Sie den Inhalt der Zwischenablage löschen?"
 
-#: Src/wptMainProc.cpp:200
+#: Src/wptMainProc.cpp:202
 msgid "Could not access secret keyring."
 msgstr "Auf denn geheimen Schlüsselbund konnte nicht zugegriffen werden."
 
-#: Src/wptMainProc.cpp:254 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:256 Src/wptTextInputDlg.cpp:79
 msgid "Text Input"
 msgstr "Texteingabe"
 
-#: Src/wptMainProc.cpp:275
+#: Src/wptMainProc.cpp:277
 msgid "Unknown OpenPGP type."
 msgstr "Unbekannter OpenPGP-Typ."
 
-#: Src/wptMainProc.cpp:352
+#: Src/wptMainProc.cpp:354
 msgid "Could not set current window mode hooks."
 msgstr "Konnte \"Current Window\" Hooks nicht setzen."
 
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:413
 msgid "Edit Clipboard"
 msgstr "Zwischenablage bearbeiten"
 
-#: Src/wptMainProc.cpp:412
+#: Src/wptMainProc.cpp:414
 msgid "About..."
 msgstr "Über..."
 
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
 msgid "Decrypt/Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
 # c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:434
 msgid "Current Window"
 msgstr "Aktuelles Fenster"
 
-#: Src/wptMainProc.cpp:488
+#: Src/wptMainProc.cpp:490
 msgid "Remove all passphrases from cache?"
 msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
 
-#: Src/wptMainProc.cpp:489 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
 msgid "WinPT"
 msgstr "WinPT"
 
-#: Src/wptMainProc.cpp:499
+#: Src/wptMainProc.cpp:501
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 "Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
 "WinPT beenden?"
 
-#: Src/wptMainProc.cpp:532
+#: Src/wptMainProc.cpp:534
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4107,7 +4118,7 @@
 "Stellen Sie sicher, dass das Fenster Text enthält.\n"
 "%s."
 
-#: Src/wptMainProc.cpp:586 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:588 Src/wptPreferencesDlg.cpp:139
 msgid "WinPT Preferences"
 msgstr "WinPT Einstellungen"
 
@@ -4505,10 +4516,6 @@
 msgid "Edit..."
 msgstr "Edit..."
 
-#: Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:89
-msgid "Symmetric Encryption"
-msgstr "Symmetrisch verschlüsseln"
-
 #: Src/wptTextInputDlg.cpp:49
 msgid "Data is too large for copying."
 msgstr "Die Daten sind zu groß zum Kopieren."
@@ -4536,6 +4543,9 @@
 "                   There is no indication that the signature belongs to the "
 "owner.\r\n"
 msgstr ""
+"WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signature!\r\n"
+"                   Es gibt keinen Hinweis, dass die Signatur wirklich zu "
+"dieser Person gehört.\r\n"
 
 #: Src/wptVerifyList.cpp:162
 msgid "Signed"

Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Po/jp.po	2006-06-12 13:40:21 UTC (rev 226)
@@ -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-06-06 15:30+0200\n"
+"POT-Creation-Date: 2006-06-09 11:38+0200\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"
@@ -35,7 +35,7 @@
 #: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
 #: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
 #: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:353 Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:355 Src/wptMainProc.cpp:533
 msgid "WinPT Error"
 msgstr "WinPT ƒGƒ‰["
 
@@ -46,7 +46,7 @@
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:173
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:180
-#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:359 Src/wptKeyPropsDlg.cpp:366
+#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:356 Src/wptKeyPropsDlg.cpp:363
 msgid "WinPT Warning"
 msgstr "WinPT Œx"
 
@@ -86,7 +86,7 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
 #: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:959 Src/wptKeyserver.cpp:601
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyserver.cpp:601
 #: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
 #: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
 #: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
@@ -222,8 +222,8 @@
 # c:\oss\winpt\src\wptAboutDlgs.cpp:78
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
 # c:\oss\winpt\src\wptMainProc.cpp:560
-#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1790
-#: Src/wptMainProc.cpp:580
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1888
+#: Src/wptMainProc.cpp:582
 msgid "About WinPT"
 msgstr "WinPT‚É‚Â‚¢‚Ä"
 
@@ -275,13 +275,13 @@
 msgstr "GPG‚É‚Â‚¢‚Ä..."
 
 #: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2129
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:997
 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:141 Src/wptMainProc.cpp:408
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:410
 msgid "Card Manager"
 msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
 
@@ -318,7 +318,7 @@
 #: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
 #: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
 #: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:293
+#: Src/wptMainProc.cpp:295
 msgid "Card Edit"
 msgstr "ƒJ[ƒh•ÒW"
 
@@ -428,7 +428,7 @@
 msgstr "ˆÃ†‰»ƒL[‚ÌƒJ[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1686
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1784
 msgid "Card Key Generation"
 msgstr "ƒJ[ƒhƒL[ì¬"
 
@@ -464,7 +464,7 @@
 # c:\oss\winpt\src\wptCardDlg.cpp:580
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
 # c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1377 Src/wptKeygenDlg.cpp:453
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1378 Src/wptKeygenDlg.cpp:453
 msgid "The date you have chosen lies in the past."
 msgstr "‚ ‚È‚½‚Í‘I‚Î‚ê‚½“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
 
@@ -614,11 +614,11 @@
 #: Src/wptClipDecryptDlg.cpp:169 Src/wptClipVerifyDlg.cpp:157
 #: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
 #: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
-#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1567
-#: Src/wptFileManager.cpp:1620 Src/wptFileManagerDlg.cpp:590
+#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
+#: Src/wptFileManager.cpp:1622 Src/wptFileManagerDlg.cpp:590
 #: Src/wptFileVerifyDlg.cpp:82 Src/wptFileVerifyDlg.cpp:149
-#: Src/wptMainProc.cpp:182 Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:262
-#: Src/wptMainProc.cpp:270 Src/wptMainProc.cpp:419
+#: Src/wptMainProc.cpp:184 Src/wptMainProc.cpp:250 Src/wptMainProc.cpp:264
+#: Src/wptMainProc.cpp:272 Src/wptMainProc.cpp:421
 msgid "Verify"
 msgstr "Šm”F‚·‚é"
 
@@ -630,14 +630,14 @@
 # c:\oss\winpt\src\wptFileManager.cpp:996
 #: Src/wptClipDecryptDlg.cpp:176 Src/wptClipDecryptDlg.cpp:189
 #: Src/wptClipDecryptDlg.cpp:197 Src/wptClipDecryptDlg.cpp:204
-#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1271
-#: Src/wptFileManager.cpp:1322
+#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1276
+#: Src/wptFileManager.cpp:1327
 msgid "Decryption"
 msgstr "•œ†"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
 # c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1323
+#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1328
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -686,7 +686,7 @@
 #: Src/wptClipDecryptDlg.cpp:219 Src/wptClipEncryptDlg.cpp:210
 #: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
 #: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
-#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:91
+#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:92
 msgid "GnuPG Status: Finished"
 msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
 
@@ -704,14 +704,14 @@
 #: Src/wptClipEditDlg.cpp:120 Src/wptClipEditDlg.cpp:159
 #: Src/wptClipEditDlg.cpp:168 Src/wptClipEditDlg.cpp:238
 #: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:275
-#: Src/wptMainProc.cpp:431 Src/wptMainProc.cpp:512 Src/wptMainProc.cpp:517
+#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:232 Src/wptMainProc.cpp:277
+#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:519
 msgid "Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:114
 # c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:569
+#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:572
 msgid "File Open"
 msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
 
@@ -741,8 +741,8 @@
 
 # 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:195 Src/wptMainProc.cpp:172 Src/wptMainProc.cpp:238
-#: Src/wptMainProc.cpp:574
+#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:174 Src/wptMainProc.cpp:240
+#: Src/wptMainProc.cpp:576
 msgid "Clipboard Editor"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
 
@@ -802,8 +802,8 @@
 # c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
 #: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:154
 #: Src/wptClipEncryptDlg.cpp:200 Src/wptClipEncryptDlg.cpp:207
-#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:144
-#: Src/wptMainProc.cpp:212
+#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:146
+#: Src/wptMainProc.cpp:214
 msgid "Encryption"
 msgstr "ˆÃ†‰»"
 
@@ -824,7 +824,7 @@
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
 #: Src/wptKeygenDlg.cpp:544 Src/wptKeyRevokeDlg.cpp:81
 #: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:293 Src/wptPassphraseCB.cpp:93
+#: Src/wptKeysignDlg.cpp:334 Src/wptPassphraseCB.cpp:93
 #: Src/wptPassphraseDlg.cpp:102 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
 msgid "&Cancel"
@@ -874,9 +874,9 @@
 #: Src/wptClipSignDlg.cpp:159 Src/wptClipSignDlg.cpp:227
 #: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:251
 #: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
-#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1081
-#: Src/wptFileManager.cpp:1097 Src/wptFileManager.cpp:1387
-#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
+#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1086
+#: Src/wptFileManager.cpp:1102 Src/wptFileManager.cpp:1392
+#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:220
 msgid "Signing"
 msgstr "–¼"
 
@@ -902,7 +902,7 @@
 # c:\oss\winpt\src\wptMainProc.cpp:159 c:\oss\winpt\src\wptMainProc.cpp:235
 #: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
 #: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:150 Src/wptMainProc.cpp:224
+#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:226
 msgid "Sign & Encrypt"
 msgstr "–¼‹y‚ÑˆÃ†‰»"
 
@@ -918,7 +918,7 @@
 
 # c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1202
+#: Src/wptClipSignEncDlg.cpp:159 Src/wptKeylist.cpp:1205
 msgid "No key was selected."
 msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
 
@@ -1029,9 +1029,9 @@
 #: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1036
 #: Src/wptKeyEditDlgs.cpp:1047 Src/wptKeyEditDlgs.cpp:1298
 #: Src/wptKeyEditDlgs.cpp:1303 Src/wptKeyEditDlgs.cpp:1307
-#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1353 Src/wptKeyEditDlgs.cpp:1363
-#: Src/wptKeyEditDlgs.cpp:1378 Src/wptKeyEditDlgs.cpp:1382
+#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1364
+#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1383
 #: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1427
 #: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1440
 #: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1488
@@ -1049,8 +1049,8 @@
 #: Src/wptKeyEditDlgs.cpp:2002 Src/wptKeyEditDlgs.cpp:2069
 #: Src/wptKeyEditDlgs.cpp:2106 Src/wptKeyEditDlgs.cpp:2119
 #: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2173
-#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:993
-#: Src/wptKeyManagerDlg.cpp:1814
+#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1912
 msgid "Key Edit"
 msgstr "ƒL[‚Ì•ÒW"
 
@@ -1318,14 +1318,14 @@
 # c:\oss\winpt\src\wptFileStatDlg.cpp:124
 # c:\oss\winpt\src\wptMainProc.cpp:387 c:\oss\winpt\src\wptMainProc.cpp:526
 #: Src/wptFileManager.cpp:107 Src/wptFileManager.cpp:129
-#: Src/wptFileManager.cpp:135 Src/wptFileManager.cpp:174
-#: Src/wptFileManager.cpp:299 Src/wptFileManager.cpp:663
-#: Src/wptFileManager.cpp:808 Src/wptFileManager.cpp:923
-#: Src/wptFileManager.cpp:1473 Src/wptFileManager.cpp:1500
-#: Src/wptFileManager.cpp:1519 Src/wptFileManager.cpp:1771
-#: Src/wptFileManager.cpp:1833 Src/wptFileManagerDlg.cpp:536
+#: Src/wptFileManager.cpp:135 Src/wptFileManager.cpp:176
+#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:668
+#: Src/wptFileManager.cpp:813 Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:1478 Src/wptFileManager.cpp:1505
+#: Src/wptFileManager.cpp:1524 Src/wptFileManager.cpp:1774
+#: Src/wptFileManager.cpp:1836 Src/wptFileManagerDlg.cpp:536
 #: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:406 Src/wptMDSumDlg.cpp:184
+#: Src/wptMainProc.cpp:408 Src/wptMDSumDlg.cpp:184
 msgid "File Manager"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
 
@@ -1345,7 +1345,7 @@
 msgstr "ƒtƒ@ƒCƒ‹‘®«‚ð•’Ê‚É’u‚«’¼‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:137
-#: Src/wptFileManager.cpp:170
+#: Src/wptFileManager.cpp:172
 msgid ""
 "Multi-Media files are already compressed, GPG would compress\n"
 "them anyway and this costs a lot of time.\n"
@@ -1361,7 +1361,7 @@
 # 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:382 Src/wptKeyEditDlgs.cpp:1081
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1081
 #: Src/wptVerifyList.cpp:161
 msgid "Status"
 msgstr "ó‹µ"
@@ -1370,24 +1370,24 @@
 # 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:383 Src/wptKeyEditDlgs.cpp:1171
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1171
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:112
 #: Src/wptVerifyList.cpp:160
 msgid "Name"
 msgstr "–¼‘O"
 
 # c:\oss\winpt\src\wptFileManager.cpp:181
-#: Src/wptFileManager.cpp:384
+#: Src/wptFileManager.cpp:386
 msgid "Operation"
 msgstr "‘€ì"
 
 # c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:662
+#: Src/wptFileManager.cpp:667
 msgid "Please select a file."
 msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:809
+#: Src/wptFileManager.cpp:814
 #, c-format
 msgid ""
 "\"%s\" does not seems to be a text file.\n"
@@ -1397,25 +1397,26 @@
 "‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:924
+#: Src/wptFileManager.cpp:929
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "%s ‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptFileManager.cpp:779
 # c:\oss\winpt\src\wptFileStatDlg.cpp:225
-#: Src/wptFileManager.cpp:1007 Src/wptFileStatDlg.cpp:273
+#: Src/wptFileManager.cpp:1012 Src/wptFileStatDlg.cpp:273
 #: Src/wptFileStatDlg.cpp:279
 msgid "File Status"
 msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
 
 # c:\oss\winpt\src\wptFileManager.cpp:825
-#: Src/wptFileManager.cpp:1051
-msgid "Enter filename for encrypted file"
+#: Src/wptFileManager.cpp:1056
+#, fuzzy
+msgid "Enter Filename for Encrypted File"
 msgstr "ˆÃ†‰»‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:837
-#: Src/wptFileManager.cpp:1080
+#: Src/wptFileManager.cpp:1085
 msgid "Could not get default secret key."
 msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -1424,54 +1425,60 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:296
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:403
 # c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
-#: Src/wptFileManager.cpp:1111 Src/wptFileManager.cpp:1423
-#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:200
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
+#: Src/wptFileManager.cpp:1116 Src/wptFileManager.cpp:1428
+#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:202
+#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
 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:1124 Src/wptFileManagerDlg.cpp:586
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1129 Src/wptFileManagerDlg.cpp:586
+#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
 msgid "Encrypt"
 msgstr "ŒöŠJˆÃ†‰»"
 
+# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
+#: Src/wptFileManager.cpp:1156 Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:90
+msgid "Symmetric Encryption"
+msgstr "‹¤’ÊˆÃ†‰»"
+
 # c:\oss\winpt\src\wptFileManager.cpp:893
 # c:\oss\winpt\src\wptFileManager.cpp:914
 # c:\oss\winpt\src\wptFileManager.cpp:919
 # c:\oss\winpt\src\wptMainProc.cpp:401
-#: Src/wptFileManager.cpp:1151 Src/wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1189 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1189 Src/wptFileManager.cpp:1194
+#: Src/wptMainProc.cpp:416
 msgid "Symmetric"
 msgstr "‹¤’ÊˆÃ†‰»"
 
 # c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1189
+#: Src/wptFileManager.cpp:1194
 msgid "Encryption failed."
 msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1280
+#: Src/wptFileManager.cpp:1285
 msgid "Choose Filename for Output"
 msgstr "o—Íƒtƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1289
-msgid "Please enter filename for plaintext file"
+#: Src/wptFileManager.cpp:1294
+#, fuzzy
+msgid "Enter Filename for Plaintext File"
 msgstr "ƒvƒŒ[ƒ“ƒeƒLƒX—p‚Ìƒgƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1006
 # c:\oss\winpt\src\wptFileManager.cpp:1011
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:402
-#: Src/wptFileManager.cpp:1331 Src/wptFileManager.cpp:1351
+#: Src/wptFileManager.cpp:1336 Src/wptFileManager.cpp:1356
 #: Src/wptFileManagerDlg.cpp:587
 msgid "Decrypt"
 msgstr "•œ†"
 
 # c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1337
+#: Src/wptFileManager.cpp:1342
 #, c-format
 msgid ""
 "Decryption failed.\n"
@@ -1480,7 +1487,7 @@
 "•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
 "%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
 
-#: Src/wptFileManager.cpp:1352
+#: Src/wptFileManager.cpp:1357
 #, c-format
 msgid ""
 "The original file name is '%s'.\n"
@@ -1492,32 +1499,33 @@
 "‚±‚ê‚ð '%s' ‚Ì‘ã‚í‚è‚É–{“–‚ÉŽg—p‚µ‚Ü‚·‚©?"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1400
-msgid "Enter filename for signed file"
+#: Src/wptFileManager.cpp:1405
+#, fuzzy
+msgid "Enter Filename for Signed File"
 msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1499
+#: Src/wptFileManager.cpp:1504
 msgid "Could not find detached signature in the clipboard."
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ÉŽæ‚èo‚µ‚½–¼‚ðŒ©‚Â‚¯‚é‚±‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1524
 msgid "No files to check."
 msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1536
+#: Src/wptFileManager.cpp:1541
 msgid "Select Data File"
 msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1538
+#: Src/wptFileManager.cpp:1543
 msgid "Selected Output File"
 msgstr "‘I‘ð‚µ‚½o—Íƒtƒ@ƒCƒ‹"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1567
+#: Src/wptFileManager.cpp:1569
 msgid "Invalid file name. Exit"
 msgstr "–³Œø‚Èƒtƒ@ƒCƒ‹–¼BI—¹"
 
@@ -1532,7 +1540,7 @@
 # c:\oss\winpt\src\wptImportList.cpp:220
 # c:\oss\winpt\src\wptKeyManager.cpp:516
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptFileManager.cpp:1665 Src/wptFileManager.cpp:1676
+#: Src/wptFileManager.cpp:1667 Src/wptFileManager.cpp:1678
 #: Src/wptFileManagerDlg.cpp:257 Src/wptImportList.cpp:404
 #: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
 #: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
@@ -1543,7 +1551,7 @@
 
 # c:\oss\winpt\src\wptFileManager.cpp:1285
 # c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptFileManager.cpp:1673
+#: Src/wptFileManager.cpp:1675
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -1559,7 +1567,7 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:262
 # c:\oss\winpt\src\wptKeyManager.cpp:294
 # c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1699 Src/wptKeyManager.cpp:264
+#: Src/wptFileManager.cpp:1701 Src/wptKeyManager.cpp:264
 #: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
 msgid "No key was selected for export."
 msgstr "ƒGƒLƒXƒ|[ƒg‚·‚é‚½‚ß‚ÌƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -1567,7 +1575,7 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1309
 # c:\oss\winpt\src\wptFileManager.cpp:1335
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptFileManager.cpp:1699 Src/wptFileManager.cpp:1722
+#: Src/wptFileManager.cpp:1702 Src/wptFileManager.cpp:1725
 #: Src/wptKeyserverDlg.cpp:92
 msgid "Export"
 msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1575,8 +1583,8 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1327
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1707 Src/wptKeyManagerDlg.cpp:1750
-#: Src/wptKeyManagerDlg.cpp:1782
+#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1848
+#: Src/wptKeyManagerDlg.cpp:1880
 msgid "Choose Name for Key File"
 msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
 
@@ -1585,51 +1593,51 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1726 Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1061
 #: Src/wptKeyEditDlgs.cpp:1329 Src/wptKeyEditDlgs.cpp:1401
 #: Src/wptKeyserverDlg.cpp:104
 msgid "GnuPG status"
 msgstr "GnuPG‚Ìó‘Ô"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1726
+#: Src/wptFileManager.cpp:1729
 #, c-format
 msgid "Finished (Output: %s)"
 msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1772
+#: Src/wptFileManager.cpp:1775
 #, c-format
 msgid "%s: no valid OpenPGP data found."
 msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚Â‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: Src/wptFileManager.cpp:1832
+#: Src/wptFileManager.cpp:1835
 msgid "Encrypting into a ZIP archive makes sense with multiple files"
 msgstr "‘½”‚Ìƒtƒ@ƒCƒ‹‚ðZipƒA[ƒJƒCƒu‚ÉˆÃ†‰»‚·‚é‚±‚Æ‚ª—Ç‚¢‚±‚Æ‚Å‚·B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1837
+#: Src/wptFileManager.cpp:1840
 msgid "Choose File Name for Output"
 msgstr "o—Íƒtƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1907
+#: Src/wptFileManager.cpp:1910
 msgid "Choose a Name for the Archive"
 msgstr "ƒA[ƒJƒCƒu‚É–¼‘O‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1453
-#: Src/wptFileManager.cpp:1910
+#: Src/wptFileManager.cpp:1913
 msgid "Invalid archive name. Exit."
 msgstr "–³Œø‚ÈƒA[ƒJƒCƒu–¼BI—¹B"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1453
 # c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1910 Src/wptFileManager.cpp:1917
+#: Src/wptFileManager.cpp:1914 Src/wptFileManager.cpp:1922
 msgid "Encrypt Directory"
 msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1917
+#: Src/wptFileManager.cpp:1921
 msgid "Could not create zip archive."
 msgstr "ˆ³kƒA[ƒJƒCƒu‚ðì¬‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -1664,7 +1672,7 @@
 # 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:299
-#: Src/wptKeyManagerDlg.cpp:957
+#: Src/wptKeyManagerDlg.cpp:989
 msgid "Options"
 msgstr "ƒIƒvƒVƒ‡ƒ“"
 
@@ -1694,7 +1702,7 @@
 
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
 #: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:505
-#: Src/wptKeyManagerDlg.cpp:930 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:962 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "ƒtƒ@ƒCƒ‹"
 
@@ -1753,12 +1761,12 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
 #: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1303
-#: Src/wptKeyEditDlgs.cpp:1353 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1427
 #: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:784
-#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1558
-#: Src/wptKeyManagerDlg.cpp:1574 Src/wptKeyManagerDlg.cpp:1602
-#: Src/wptKeyManagerDlg.cpp:1618 Src/wptKeyManagerDlg.cpp:1633
-#: Src/wptKeyManagerDlg.cpp:1740 Src/wptKeyManagerDlg.cpp:1759
+#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1656
+#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeyManagerDlg.cpp:1700
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
+#: Src/wptKeyManagerDlg.cpp:1838 Src/wptKeyManagerDlg.cpp:1857
 #: Src/wptKeyserverSearchDlg.cpp:143
 msgid "Please select a key."
 msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1773,17 +1781,17 @@
 msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:544
+#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:546
 msgid "File Manager (use drag & drop to add files)"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚Ä’Ç‰Á‚·‚é)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:931
-#: Src/wptKeyManagerDlg.cpp:936 Src/wptKeyManagerDlg.cpp:947
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:963
+#: Src/wptKeyManagerDlg.cpp:968 Src/wptKeyManagerDlg.cpp:979
 msgid "Edit"
 msgstr "•ÒW"
 
-#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:964
 msgid "View"
 msgstr "ƒrƒ…["
 
@@ -1814,8 +1822,8 @@
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:357
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:948
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:1028
 msgid "&Sign"
 msgstr "–¼(&S)"
 
@@ -1823,7 +1831,7 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:404
 # c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
 #: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:589
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
 msgid "Sign && Encrypt"
 msgstr "–¼‹y‚ÑˆÃ†‰»"
 
@@ -1850,7 +1858,7 @@
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:364
 # c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:413
+#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:415
 msgid "Exit"
 msgstr "I—¹"
 
@@ -1932,11 +1940,11 @@
 msgid "Are you sure you want to secure delete these files?"
 msgstr "–{“–‚É‚±‚ê‚ç‚Ìƒtƒ@ƒCƒ‹‚ðˆÀ‘Síœ‚µ‚Ü‚·‚©Hn"
 
-#: Src/wptFileManagerDlg.cpp:784 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:784 Src/wptMainProc.cpp:102
 msgid "&Yes"
 msgstr "‚Í‚¢(&Y)"
 
-#: Src/wptFileManagerDlg.cpp:785 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:785 Src/wptMainProc.cpp:103
 msgid "&No"
 msgstr "‚¢‚¢‚¦(&N)"
 
@@ -2086,8 +2094,8 @@
 #: Src/wptGPGPrefsDlg.cpp:223 Src/wptGPGPrefsDlg.cpp:229
 #: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:239
 #: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:958
-#: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:225
+#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:990
+#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:225
 #: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
 #: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
 #: Src/wptRegistry.cpp:596
@@ -2253,8 +2261,8 @@
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:61
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
 # c:\oss\winpt\src\wptMainProc.cpp:572
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1712
-#: Src/wptMainProc.cpp:592
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1810
+#: Src/wptMainProc.cpp:594
 msgid "GnuPG Preferences"
 msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
 
@@ -2435,20 +2443,20 @@
 #: Src/wptKeyManager.cpp:835 Src/wptKeyManager.cpp:892
 #: Src/wptKeyManager.cpp:897 Src/wptKeyManager.cpp:953
 #: Src/wptKeyManager.cpp:983 Src/wptKeyManager.cpp:1070
-#: Src/wptKeyManagerDlg.cpp:1218 Src/wptKeyManagerDlg.cpp:1231
-#: Src/wptKeyManagerDlg.cpp:1241 Src/wptKeyManagerDlg.cpp:1537
-#: Src/wptKeyManagerDlg.cpp:1559 Src/wptKeyManagerDlg.cpp:1574
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyManagerDlg.cpp:1592
-#: Src/wptKeyManagerDlg.cpp:1602 Src/wptKeyManagerDlg.cpp:1608
-#: Src/wptKeyManagerDlg.cpp:1618 Src/wptKeyManagerDlg.cpp:1633
-#: Src/wptKeyManagerDlg.cpp:1650 Src/wptKeyManagerDlg.cpp:1682
-#: Src/wptKeyManagerDlg.cpp:1741 Src/wptKeyManagerDlg.cpp:1759
-#: Src/wptKeyManagerDlg.cpp:1764 Src/wptKeyManagerDlg.cpp:1769
-#: Src/wptKeyManagerDlg.cpp:1840 Src/wptKeyManagerDlg.cpp:1845
-#: Src/wptKeyManagerDlg.cpp:1978 Src/wptKeysigDlg.cpp:94
+#: Src/wptKeyManagerDlg.cpp:1311 Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1332 Src/wptKeyManagerDlg.cpp:1635
+#: Src/wptKeyManagerDlg.cpp:1657 Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1682 Src/wptKeyManagerDlg.cpp:1690
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1706
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
+#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1780
+#: Src/wptKeyManagerDlg.cpp:1839 Src/wptKeyManagerDlg.cpp:1857
+#: Src/wptKeyManagerDlg.cpp:1862 Src/wptKeyManagerDlg.cpp:1867
+#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeyManagerDlg.cpp:1943
+#: Src/wptKeyManagerDlg.cpp:2056 Src/wptKeysigDlg.cpp:94
 #: Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309 Src/wptKeysigDlg.cpp:381
-#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:407
-#: Src/wptMainProc.cpp:555 Src/wptMainProc.cpp:563
+#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:409
+#: Src/wptMainProc.cpp:557 Src/wptMainProc.cpp:565
 msgid "Key Manager"
 msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
 
@@ -2551,8 +2559,8 @@
 #: Src/wptKeyEditDlgs.cpp:1439 Src/wptKeyEditDlgs.cpp:1459
 #: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1529
 #: Src/wptKeyEditDlgs.cpp:1596 Src/wptKeyEditDlgs.cpp:1762
-#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:421 Src/wptKeylist.cpp:455
-#: Src/wptKeyPropsDlg.cpp:161 Src/wptKeysigDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
 #: Src/wptKeysigDlg.cpp:207
 msgid "Revoked"
 msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2563,8 +2571,8 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
 # c:\oss\winpt\src\wptKeysigDlg.cpp:192
 #: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1360
-#: Src/wptKeylist.cpp:423 Src/wptKeylist.cpp:453 Src/wptKeyPropsDlg.cpp:159
+#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
 #: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
 msgid "Expired"
 msgstr "ŠúŒÀØ‚ê"
@@ -2575,7 +2583,7 @@
 msgstr "”é–§Œ®"
 
 # c:\oss\winpt\src\wptImportList.cpp:57
-#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:459
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:462
 msgid "public key"
 msgstr "ŒöŠJŒ®"
 
@@ -2591,8 +2599,8 @@
 # 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:345 Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
+#: Src/wptKeyManagerDlg.cpp:907 Src/wptKeyManagerDlg.cpp:976
 #: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
 #: Src/wptVerifyList.cpp:165
 msgid "User ID"
@@ -2602,8 +2610,8 @@
 # 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:346 Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:878 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyserverSearchDlg.cpp:54
 msgid "Size"
 msgstr "ƒTƒCƒY"
 
@@ -2614,8 +2622,8 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
 # c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
 #: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:585 Src/wptKeyManagerDlg.cpp:876
-#: Src/wptKeyManagerDlg.cpp:967 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:908
+#: Src/wptKeyManagerDlg.cpp:999 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
 #: Src/wptVerifyList.cpp:164
 msgid "Key ID"
@@ -2627,15 +2635,15 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
 # c:\oss\winpt\src\wptSigList.cpp:44
 #: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1079
-#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:591
-#: Src/wptKeyManagerDlg.cpp:882 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:594
+#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:1002
 #: 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:349 Src/wptKeylist.cpp:586
-#: Src/wptKeyManagerDlg.cpp:877 Src/wptKeyManagerDlg.cpp:969
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
+#: Src/wptKeyManagerDlg.cpp:909 Src/wptKeyManagerDlg.cpp:1001
 msgid "Type"
 msgstr "Ží—Þ"
 
@@ -2650,7 +2658,7 @@
 
 # c:\oss\winpt\src\WinPT.cpp:247 c:\oss\winpt\src\wptGPG.cpp:864
 # c:\oss\winpt\src\wptGPG.cpp:884
-#: Src/wptKeyCache.cpp:807
+#: Src/wptKeyCache.cpp:813
 msgid "Load GPG Keyrings..."
 msgstr "GPGƒL[ƒŠƒ“ƒO‚ðƒ[ƒh‚·‚é..."
 
@@ -2670,7 +2678,7 @@
 msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:388
+#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:391
 msgid "Ultimate"
 msgstr "ÅI“I"
 
@@ -2678,7 +2686,7 @@
 # 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:1139
-#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
+#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:385
 msgid "Never"
 msgstr "‚Í‚¸‚Í‚È‚¢"
 
@@ -2725,7 +2733,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
 #: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:292
+#: Src/wptKeysignDlg.cpp:333
 msgid "Passphrase"
 msgstr "ƒpƒXƒtƒŒ[ƒY"
 
@@ -2799,7 +2807,7 @@
 #: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1531
 #: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1816
 #: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
-#: Src/wptKeyPropsDlg.cpp:382 Src/wptOwnertrustDlg.cpp:119
+#: Src/wptKeyPropsDlg.cpp:379 Src/wptOwnertrustDlg.cpp:119
 #: Src/wptOwnertrustDlg.cpp:131
 msgid "GnuPG Status"
 msgstr "GnuPG‚Ìó‘Ô"
@@ -2954,9 +2962,9 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
 #: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:817
 #: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
-#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1349
 #: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyManagerDlg.cpp:1591
+#: Src/wptKeyManagerDlg.cpp:1689
 msgid "There is no secret key available!"
 msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
 
@@ -2975,7 +2983,7 @@
 # c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:58
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:189
 #: Src/wptKeyEditDlgs.cpp:964 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:373
+#: Src/wptKeyPropsDlg.cpp:370
 msgid "Change Ownertrust"
 msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Ì•ÏX"
 
@@ -3031,7 +3039,7 @@
 msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚Í³‚µ‚‚Å‚«‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:883
+#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:915
 msgid "Description"
 msgstr "Ú×"
 
@@ -3042,8 +3050,8 @@
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
 # c:\oss\winpt\src\wptKeylist.cpp:53
-#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
+#: Src/wptKeyManagerDlg.cpp:912
 msgid "Validity"
 msgstr "—LŒø«"
 
@@ -3137,7 +3145,7 @@
 msgid "Subkey successfully deleted."
 msgstr "ƒTƒuƒL[‚ð³‚µ‚íœ‚³‚ê‚Ü‚µ‚½B"
 
-#: Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeyEditDlgs.cpp:1362
 msgid ""
 "Key already expired.\n"
 "\n"
@@ -3150,12 +3158,12 @@
 # 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:1370 Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1374
 msgid "Key Expiration Date"
 msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1394
+#: Src/wptKeyEditDlgs.cpp:1395
 msgid "Expire Subkey"
 msgstr "ŠúŒÀ‚ÌØ‚ê‚½ƒTƒuƒL["
 
@@ -3304,7 +3312,7 @@
 msgstr "‚±‚Ì–¼‚ð–{“–‚ÉƒGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:401
+#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:442
 msgid "Key successfully signed."
 msgstr "ƒL[‚ð–¼‚·‚é‚±‚Æ‚É¬Œ÷‚µ‚Ü‚µ‚½B"
 
@@ -3406,8 +3414,8 @@
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:81
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:86
 #: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:938
-#: Src/wptKeyManagerDlg.cpp:1806 Src/wptKeyPropsDlg.cpp:294
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:1904 Src/wptKeyPropsDlg.cpp:285
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
 #: Src/wptOwnertrustDlg.cpp:128
 msgid "Ownertrust"
@@ -3445,7 +3453,7 @@
 #: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:432
 #: Src/wptKeygenDlg.cpp:440 Src/wptKeygenDlg.cpp:454 Src/wptKeygenDlg.cpp:461
 #: Src/wptKeygenDlg.cpp:470 Src/wptKeygenDlg.cpp:491 Src/wptKeygenDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1673 Src/wptPassphraseDlg.cpp:145
+#: Src/wptKeyManagerDlg.cpp:1771 Src/wptPassphraseDlg.cpp:145
 msgid "Key Generation"
 msgstr "ƒL[‚Ìì¬"
 
@@ -3631,7 +3639,7 @@
 # c:\oss\winpt\src\wptKeygenDlg.cpp:389 c:\oss\winpt\src\wptKeygenDlg.cpp:413
 #: Src/wptKeygenDlg.cpp:543 Src/wptKeygenDlg.cpp:561 Src/wptKeygenDlg.cpp:566
 #: Src/wptKeygenDlg.cpp:573 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:599
-#: Src/wptKeyManagerDlg.cpp:1696
+#: Src/wptKeyManagerDlg.cpp:1794
 msgid "Key Generation Wizard"
 msgstr "ƒL[ì¬‚ÌƒEƒBƒU[ƒh"
 
@@ -3707,51 +3715,51 @@
 msgstr "ƒL[‚ªƒAƒbƒvƒf[ƒg‚³‚ê‚Ä‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:260
+#: Src/wptKeylist.cpp:261
 msgid "Key Pair"
 msgstr "ƒL[ƒyƒA"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:262
+#: Src/wptKeylist.cpp:263
 msgid "Key Pair (Card)"
 msgstr "ƒL[ƒyƒA(ƒJ[ƒh)"
 
 # c:\oss\winpt\src\wptKeylist.cpp:168
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:264
 msgid "Public Key"
 msgstr "ŒöŠJŒ®"
 
-#: Src/wptKeylist.cpp:380
+#: Src/wptKeylist.cpp:383
 msgid "None"
 msgstr "‚È‚µ"
 
 # c:\oss\winpt\src\wptMAPI.cpp:396 c:\oss\winpt\src\wptMAPI.cpp:404
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:387
 msgid "Marginal"
 msgstr "‚Ù‚ñ‚Ì‚í‚¸‚©‚Î‚©‚è"
 
-#: Src/wptKeylist.cpp:386
+#: Src/wptKeylist.cpp:389
 msgid "Full"
 msgstr "ƒtƒ‹"
 
-#: Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:451 Src/wptKeyPropsDlg.cpp:163
+#: Src/wptKeylist.cpp:428 Src/wptKeylist.cpp:454 Src/wptKeyPropsDlg.cpp:154
 msgid "Disabled"
 msgstr "–³Œø‰»‚È‚Á‚½"
 
 # c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:461
+#: Src/wptKeylist.cpp:464
 msgid "key pair"
 msgstr "ƒL[ƒyƒA"
 
 # c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:879
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1000
 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:590 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:913
 #: Src/wptVerifyList.cpp:163
 msgid "Trust"
 msgstr "M—p"
@@ -3760,12 +3768,12 @@
 # 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:761 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:764 Src/wptPassphraseCB.cpp:124
 msgid "Invalid User ID"
 msgstr "–³Œø‚Èƒ†[ƒU[ID"
 
 # c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1029
+#: Src/wptKeylist.cpp:1032
 #, c-format
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
@@ -3781,12 +3789,12 @@
 "‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1037 Src/wptKeylist.cpp:1099
+#: Src/wptKeylist.cpp:1040 Src/wptKeylist.cpp:1102
 msgid "Recipients"
 msgstr "ŽóMŽÒ"
 
 # c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1100
+#: Src/wptKeylist.cpp:1103
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -3796,7 +3804,7 @@
 "–{“–‚É–³Œø‚ÈƒL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1202
+#: Src/wptKeylist.cpp:1205
 msgid "Secret Key List"
 msgstr "”é–§Œ®‚Ìˆê——‚Ð‚å‚¤"
 
@@ -4009,29 +4017,29 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:455 Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:483 Src/wptKeyManagerDlg.cpp:1020
 msgid "Paste Key from Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:476
+#: Src/wptKeyManagerDlg.cpp:504
 #, c-format
 msgid "Default Key: %s"
 msgstr "‹K’èƒL[‚Í: %s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:478
+#: Src/wptKeyManagerDlg.cpp:506
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "‹K’èƒL[‚Í: 0x%s"
 
 # c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:499
+#: Src/wptKeyManagerDlg.cpp:527
 #, c-format
 msgid "%d secret keys"
 msgstr "%d ”é–§Œ®"
 
-#: Src/wptKeyManagerDlg.cpp:500
+#: Src/wptKeyManagerDlg.cpp:528
 #, c-format
 msgid "%d keys"
 msgstr "%d ƒL["
@@ -4042,71 +4050,71 @@
 # 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/wptKeyManagerDlg.cpp:933
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Key"
 msgstr "ƒL["
 
 # c:\oss\winpt\src\wptGroupsDlg.cpp:49
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:1256
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptKeyManagerDlg.cpp:1348
 msgid "Groups"
 msgstr "ƒOƒ‹[ƒv"
 
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Send Mail..."
 msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
 
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "&Copy\tCtrl+C"
 msgstr "ƒRƒs[(&C)\tCtrl+C"
 
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "&Paste\tCtrl+V"
 msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
 
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:973
 msgid "Search...\tCtrl+F"
 msgstr "ŒŸõ...\tCtrl+F"
 
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:974
 msgid "Select All\tCtrl+A"
 msgstr "‚·‚×‚ÄŒŸõ\tCtrl+A"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:975
 msgid "&Quit"
 msgstr "I—¹(&Q)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:977
 msgid "&Expert"
 msgstr "ƒGƒNƒXƒp[ƒg(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "&Normal"
 msgstr "•’Ê(&N)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:950
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:981 Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:1026
 msgid "&Delete"
 msgstr "íœ(&D)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:983 Src/wptKeyManagerDlg.cpp:1027
 msgid "&Revoke Cert"
 msgstr "Ø–¾‘‚ð–³Œø‰»‚·‚é(&R)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:952 Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:1023
 msgid "&List Signatures"
 msgstr "–¼‚Ìˆê——‚Ð‚å‚¤(&L)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:578
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:958
 # c:\oss\winpt\src\wptKeyTrustPathDlg.cpp:126
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:1613
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:1711
 #: Src/wptKeyTrustPathDlg.cpp:129
 msgid "List Trust Path"
 msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ð‚å‚¤"
@@ -4114,112 +4122,112 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1309
 # c:\oss\winpt\src\wptFileManager.cpp:1335
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptKeyManagerDlg.cpp:954
+#: Src/wptKeyManagerDlg.cpp:986
 msgid "&Export..."
 msgstr "ƒGƒLƒXƒ|[ƒg(&E)..."
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:181
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptKeyManagerDlg.cpp:955
+#: Src/wptKeyManagerDlg.cpp:987
 msgid "&Import..."
 msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
 # c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1024
 #: Src/wptKeysigDlg.cpp:419
 msgid "&Properties"
 msgstr "‘®«(&P)"
 
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:992
 msgid "E&xport Secret Key"
 msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:961
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "Re&load Key Cache"
 msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:962
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "R&everify Signatures"
 msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:963
+#: Src/wptKeyManagerDlg.cpp:995
 msgid "Refresh &Keys (Keyserver)"
 msgstr "ƒL[‚ðƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&K)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:586
 # c:\oss\winpt\src\wptTextInputDlg.cpp:47
-#: Src/wptKeyManagerDlg.cpp:964 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1015
 msgid "Copy User ID to Clipboard"
 msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1016
 msgid "Copy Key ID to Clipboard"
 msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:1017
 msgid "Copy Fingerprint to Clipboard"
 msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1018
 msgid "Copy Key Info to Clipboard"
 msgstr "ƒL[ƒCƒ“ƒtƒH‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1019
 msgid "Copy Key to Clipboard"
 msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1021
 msgid "Refresh from Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:1022
 msgid "Set Implicit &Trust"
 msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1029
 msgid "&Enable"
 msgstr "—LŒø‚·‚é(&E)"
 
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1030
 msgid "&Disable"
 msgstr "–³Œø‚·‚é(&D)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:1031
 msgid "Re&fresh from Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1032
 msgid "Set preferred Keyserver URL"
 msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:1033
 msgid "Send Key to Mail Recipient"
 msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1034
 msgid "Set as Default Key"
 msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1036
 msgid "Key..."
 msgstr "ƒL[..."
 
@@ -4229,24 +4237,24 @@
 # 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/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:1037
 msgid "User ID..."
 msgstr "ƒ†[ƒU[ID"
 
-#: Src/wptKeyManagerDlg.cpp:1006
+#: Src/wptKeyManagerDlg.cpp:1038
 msgid "Photo ID..."
 msgstr "ƒtƒHƒgID..."
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyManagerDlg.cpp:1039
 msgid "Revoker..."
 msgstr "–³Œø‰»‚«‚Ì‚¤"
 
-#: Src/wptKeyManagerDlg.cpp:1010
+#: Src/wptKeyManagerDlg.cpp:1042
 msgid "Key Attributes"
 msgstr "ƒL[‚Ì‘®«"
 
-#: Src/wptKeyManagerDlg.cpp:1011
+#: Src/wptKeyManagerDlg.cpp:1043
 msgid "Add"
 msgstr "’Ç‰Á"
 
@@ -4265,11 +4273,11 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1012
+#: Src/wptKeyManagerDlg.cpp:1044
 msgid "Send to Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1229
+#: Src/wptKeyManagerDlg.cpp:1320
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
@@ -4279,73 +4287,73 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
 # c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1240
+#: Src/wptKeyManagerDlg.cpp:1331
 msgid "Could not set keylist window procedure."
 msgstr "ƒL[ƒŠƒXƒgƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeyManagerDlg.cpp:1257
+#: Src/wptKeyManagerDlg.cpp:1349
 #, fuzzy
 msgid "&Show"
 msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptKeyManagerDlg.cpp:1258
+#: Src/wptKeyManagerDlg.cpp:1350
 #, fuzzy
 msgid "&New..."
 msgstr "ŠJ‚(&O)..."
 
 # c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1363
+#: Src/wptKeyManagerDlg.cpp:1461
 msgid "Generate new key pair"
 msgstr "V‚µ‚¢ƒL[ƒyƒA‚ðì¬‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1367
+#: Src/wptKeyManagerDlg.cpp:1465
 msgid "Search for a specific key"
 msgstr "“Á’è‚ÈƒL[‚ðƒT[ƒ`‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1371
+#: Src/wptKeyManagerDlg.cpp:1469
 msgid "Delete key from keyring"
 msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ðíœ‚·‚éB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1375
+#: Src/wptKeyManagerDlg.cpp:1473
 msgid "Show key properties"
 msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1379
+#: Src/wptKeyManagerDlg.cpp:1477
 msgid "Sign key"
 msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1383
+#: Src/wptKeyManagerDlg.cpp:1481
 msgid "Copy key to clipboard"
 msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:1387
+#: Src/wptKeyManagerDlg.cpp:1485
 msgid "Paste key from clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1391
+#: Src/wptKeyManagerDlg.cpp:1489
 msgid "Import key to keyring"
 msgstr "ƒL[ƒŠƒ“ƒO‚ÉƒL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1395
+#: Src/wptKeyManagerDlg.cpp:1493
 msgid "Export key to a file"
 msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ÉƒGƒLƒXƒ|[ƒg‚Æ‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1524
+#: Src/wptKeyManagerDlg.cpp:1622
 msgid "New"
 msgstr "V‹Kì¬"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1634
 msgid "Could not access public keyring"
 msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -4357,15 +4365,15 @@
 # c:\oss\winpt\src\wptKeysignDlg.cpp:318
 # c:\oss\winpt\src\wptKeysignDlg.cpp:320
 # c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeysignDlg.cpp:282
-#: Src/wptKeysignDlg.cpp:296 Src/wptKeysignDlg.cpp:358
-#: Src/wptKeysignDlg.cpp:374 Src/wptKeysignDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:396 Src/wptKeysignDlg.cpp:401
+#: Src/wptKeyManagerDlg.cpp:1665 Src/wptKeysignDlg.cpp:323
+#: Src/wptKeysignDlg.cpp:337 Src/wptKeysignDlg.cpp:399
+#: Src/wptKeysignDlg.cpp:415 Src/wptKeysignDlg.cpp:432
+#: Src/wptKeysignDlg.cpp:437 Src/wptKeysignDlg.cpp:442
 msgid "Key Signing"
 msgstr "ƒL[‚ð–¼‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1583
+#: Src/wptKeyManagerDlg.cpp:1681
 msgid "Key already revoked!"
 msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
 
@@ -4376,7 +4384,7 @@
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:140
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:151
-#: Src/wptKeyManagerDlg.cpp:1597 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1695 Src/wptKeyRevokeDlg.cpp:70
 #: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:164
 #: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:177
 #: Src/wptKeyRevokeDlg.cpp:186 Src/wptKeyRevokeDlg.cpp:192
@@ -4384,23 +4392,23 @@
 msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
-#: Src/wptKeyManagerDlg.cpp:1607
+#: Src/wptKeyManagerDlg.cpp:1705
 msgid "It does not make any sense with a key pair!"
 msgstr "ƒL[ƒyƒA‚Æ‚ÌˆÓ–¡‚ª•s–¾‚Å‚·I"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1624
+#: Src/wptKeyManagerDlg.cpp:1722
 msgid "Key Signature List"
 msgstr "ƒL[–¼‚Ìˆê——‚Ð‚å‚¤"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1641 Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyManagerDlg.cpp:1739 Src/wptKeyPropsDlg.cpp:281
 msgid "Key Properties"
 msgstr "ƒL[‚Ì‘®«"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1651
+#: Src/wptKeyManagerDlg.cpp:1749
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
@@ -4409,34 +4417,34 @@
 "–{“–‚ÉƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1779
 msgid "Smart Card support is not available."
 msgstr "ƒXƒ}[ƒgƒJ[ƒh‚É‘Î‰ž‚µ‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1802 Src/wptKeyserverDlg.cpp:576
 msgid "Keyserver Access"
 msgstr "ƒL[ƒT[ƒo[‚ÌƒAƒNƒZƒX"
 
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:46
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
-#: Src/wptKeyManagerDlg.cpp:1721
+#: Src/wptKeyManagerDlg.cpp:1819
 msgid "GnuPG Options"
 msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1763
+#: Src/wptKeyManagerDlg.cpp:1861
 msgid "There is no corresponding secret key for this key."
 msgstr "‚±‚ÌƒL[‚É‘Î‚µ‚Ä‚Ì”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1768
+#: Src/wptKeyManagerDlg.cpp:1866
 msgid "You can only export one secret key."
 msgstr "ˆêŒÂ‚Ì”é–§Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1773
+#: Src/wptKeyManagerDlg.cpp:1871
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -4455,17 +4463,17 @@
 "‚±‚ÌƒL[‚ð–{“–‚ÉƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1778
+#: Src/wptKeyManagerDlg.cpp:1876
 msgid "WARNING"
 msgstr "Œx"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1839
+#: Src/wptKeyManagerDlg.cpp:1937
 msgid "No key was selected, select all by default."
 msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyManagerDlg.cpp:1844
+#: Src/wptKeyManagerDlg.cpp:1942
 #, fuzzy
 msgid "Keyserver refresh finished."
 msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
@@ -4483,17 +4491,17 @@
 msgstr "–³–¼"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyPropsDlg.cpp:165
+#: Src/wptKeyPropsDlg.cpp:156
 #, fuzzy
 msgid "Invalid"
 msgstr "–³Œø‚ÈURLB"
 
-#: Src/wptKeyPropsDlg.cpp:213
+#: Src/wptKeyPropsDlg.cpp:204
 #, c-format
 msgid "Card-Type: %s\r\n"
 msgstr "ƒJ[ƒhƒ^ƒCƒv: %s\r\n"
 
-#: Src/wptKeyPropsDlg.cpp:252
+#: Src/wptKeyPropsDlg.cpp:243
 #, fuzzy, c-format
 msgid ""
 "Type: %s\r\n"
@@ -4517,26 +4525,26 @@
 "%s\r\n"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:282
 msgid "&Change"
 msgstr "•ÏX(&C)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyPropsDlg.cpp:292
+#: Src/wptKeyPropsDlg.cpp:283
 msgid "&Revokers"
 msgstr "–³Œø‰»‚«‚Ì‚¤(&R)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
-#: Src/wptKeyPropsDlg.cpp:293
+#: Src/wptKeyPropsDlg.cpp:284
 msgid "Change &Password"
 msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX(&P)"
 
-#: Src/wptKeyPropsDlg.cpp:300
+#: Src/wptKeyPropsDlg.cpp:291
 msgid "Photo-ID not validated."
 msgstr "ƒtƒHƒgID—LŒø‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:171
-#: Src/wptKeyPropsDlg.cpp:357
+#: Src/wptKeyPropsDlg.cpp:354
 msgid ""
 "The status of this key is 'revoked' or 'expired'.\n"
 "You cannot change the ownertrust of such keys."
@@ -4545,7 +4553,7 @@
 "‚±‚ê‚ç‚ÌƒL[‚ÌŠ—LŽÒ‚ÌM—Š(ownertrust)‚ð•ÏX‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:177
-#: Src/wptKeyPropsDlg.cpp:363
+#: Src/wptKeyPropsDlg.cpp:360
 msgid ""
 "This is a non-valid key.\n"
 "Modifying the ownertrust has no effect on such keys.\n"
@@ -4557,12 +4565,12 @@
 "–{“–‚ÉŒp‘±‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:208
-#: Src/wptKeyPropsDlg.cpp:381
+#: Src/wptKeyPropsDlg.cpp:378
 msgid "Ownertrust successfully changed."
 msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Í³‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:394 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:391 Src/wptKeyRevokersDlg.cpp:160
 msgid "Key Revokers"
 msgstr "ƒL[‚ð–³Œø‰»‚«‚Ì‚¤"
 
@@ -5123,19 +5131,24 @@
 msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1026
-#: Src/wptKeysignDlg.cpp:73
+#: Src/wptKeysignDlg.cpp:77
 #, fuzzy, c-format
 msgid "%d-bit %s key, ID 0x%s"
 msgstr "%s ƒL[ID‚ðŽg—p 0x%s"
 
+#: Src/wptKeysignDlg.cpp:179
+#, c-format
+msgid "Photo of %s"
+msgstr ""
+
 # c:\oss\winpt\src\wptKeysignDlg.cpp:152
 # c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:170 Src/wptKeysignDlg.cpp:341
+#: Src/wptKeysignDlg.cpp:219 Src/wptKeysignDlg.cpp:382
 msgid "Choose Signature Class"
 msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:153
-#: Src/wptKeysignDlg.cpp:172
+#: Src/wptKeysignDlg.cpp:221
 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\"."
@@ -5144,34 +5157,34 @@
 "‚ð”»‚ç‚È‚¢ê‡‚ÍˆÈ‰º‚ðŽg—p‚µ‚Ä‰º‚³‚¢B\"0\""
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:154
-#: Src/wptKeysignDlg.cpp:174
+#: Src/wptKeysignDlg.cpp:223
 msgid "(0) I will not answer (default)"
 msgstr "(0)‚Í•ÔŽ–‚ð‚µ‚Ü‚¹‚ñ(‹K’è)"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:176
+#: Src/wptKeysignDlg.cpp:225
 msgid "(1) I have not checked at all."
 msgstr "(1) ‚Ü‚Á‚½‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:178
+#: Src/wptKeysignDlg.cpp:227
 msgid "(2) I have done causal checking."
 msgstr "(2) ‚³‚è‚°‚È‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:180
+#: Src/wptKeysignDlg.cpp:229
 msgid "(3) I have done very careful checkings."
 msgstr "(3) Td‚Éƒ`ƒ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:219
+#: Src/wptKeysignDlg.cpp:268
 msgid "never"
 msgstr "‚Í‚¸‚Í‚È‚¢"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:270
+#: Src/wptKeysignDlg.cpp:311
 #, c-format
 msgid ""
 "pub %d/%s  created: %s    expires: %s\n"
@@ -5193,52 +5206,52 @@
 "‚±‚ÌƒL[‚ðŽ©•ª‚ÌƒL[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:323
 msgid "No valid secret key found."
 msgstr "—LŒø‚È”é–§Œ®‚ªŒ©‚Â‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:288
+#: Src/wptKeysignDlg.cpp:329
 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:289
+#: Src/wptKeysignDlg.cpp:330
 msgid "Signature expires on"
 msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:290
+#: Src/wptKeysignDlg.cpp:331
 msgid "Sign non-revocably"
 msgstr "–³Œø‰»‚Å‚«‚È‚¢‚æ‚¤‚É–¼‚·‚é"
 
-#: Src/wptKeysignDlg.cpp:291
+#: Src/wptKeysignDlg.cpp:332
 msgid "&Ask for certification level"
 msgstr "–¼‚·‚éƒŒƒxƒ‹‚ð—v‹‚·‚é(&A)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:294
+#: Src/wptKeysignDlg.cpp:335
 msgid "&Show photo"
 msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:295 Src/wptPassphraseCB.cpp:96
+#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:96
 #: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:101
 #: Src/wptPINDlg.cpp:53
 msgid "&Hide Typing"
 msgstr "“ü—Í‚ð‰B‚·(&H)"
 
-#: Src/wptKeysignDlg.cpp:357
+#: Src/wptKeysignDlg.cpp:398
 msgid "You cannot select today as the expiration date."
 msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:288
-#: Src/wptKeysignDlg.cpp:374
+#: Src/wptKeysignDlg.cpp:415
 msgid "Could not get Key ID from key."
 msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:395
+#: Src/wptKeysignDlg.cpp:436
 msgid "This key is already signed by your key"
 msgstr "ƒL[‚ª‚ ‚È‚½‚ÌƒL[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
 
@@ -5251,76 +5264,76 @@
 msgid "Delete Clipboard Contents"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh“à—e‚ðíœ‚·‚éB"
 
-#: Src/wptMainProc.cpp:98
+#: Src/wptMainProc.cpp:99
 msgid "&Remember the answer"
 msgstr "“š‚ðŠo‚¦‚Ä‚‚¾‚³‚¢(&R)"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptMainProc.cpp:99
+#: Src/wptMainProc.cpp:101
 msgid "Do you want to delete the contents from the clipboard?"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì“à—e‚ðíœ‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptMainProc.cpp:211
-#: Src/wptMainProc.cpp:200
+#: Src/wptMainProc.cpp:202
 msgid "Could not access secret keyring."
 msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptMainProc.cpp:265
 # c:\oss\winpt\src\wptTextInputDlg.cpp:76
-#: Src/wptMainProc.cpp:254 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:256 Src/wptTextInputDlg.cpp:79
 msgid "Text Input"
 msgstr "ƒeƒLƒXƒg“ü—Í"
 
 # c:\oss\winpt\src\wptMainProc.cpp:284
-#: Src/wptMainProc.cpp:275
+#: Src/wptMainProc.cpp:277
 msgid "Unknown OpenPGP type."
 msgstr "–¢’m‚ÌOpenPGPƒ^ƒCƒv"
 
 # c:\oss\winpt\src\wptMainProc.cpp:336
-#: Src/wptMainProc.cpp:352
+#: Src/wptMainProc.cpp:354
 msgid "Could not set current window mode hooks."
 msgstr ""
 "Œ»Ý‚ÌƒEƒBƒ“ƒhƒ‚[ƒh‚ÉƒtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptMainProc.cpp:398
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:413
 msgid "Edit Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì•ÒW"
 
 # c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:412
+#: Src/wptMainProc.cpp:414
 msgid "About..."
 msgstr "WinPT‚É‚Â‚¢‚Ä..."
 
 # c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
 msgid "Decrypt/Verify"
 msgstr "•œ†/Šm”F"
 
-#: Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:434
 msgid "Current Window"
 msgstr "Œ»Ý‚ÌƒEƒBƒ“ƒhƒE"
 
 # c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:488
+#: Src/wptMainProc.cpp:490
 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:489 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
 msgid "WinPT"
 msgstr "WinPT"
 
 # c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:499
+#: Src/wptMainProc.cpp:501
 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:532
+#: Src/wptMainProc.cpp:534
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -5331,7 +5344,7 @@
 
 # c:\oss\winpt\src\wptMainProc.cpp:566
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptMainProc.cpp:586 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:588 Src/wptPreferencesDlg.cpp:139
 msgid "WinPT Preferences"
 msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
 
@@ -5807,11 +5820,6 @@
 msgid "Edit..."
 msgstr "•ÒW..."
 
-# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
-#: Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:89
-msgid "Symmetric Encryption"
-msgstr "‹¤’ÊˆÃ†‰»"
-
 # c:\oss\winpt\src\wptTextInputDlg.cpp:47
 #: Src/wptTextInputDlg.cpp:49
 msgid "Data is too large for copying."

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/ChangeLog	2006-06-12 13:40:21 UTC (rev 226)
@@ -1,3 +1,18 @@
+2006-06-09  Timo Schulz  <ts at g10code.de>
+
+	* wptKeyEditDlgs.cpp (do_add_new_subkey): Properly handle
+	RSA_E and RSA_S.
+	* wptFileManager.cpp (fm_sym_encrypt): Better dialog title.
+	
+2006-06-08  Timo Schulz  <ts at g10code.de>
+
+	* wptKeyserver.cpp (parse_keyserver_url): Handle special case.
+	* wptKeySignDlg.cpp (keysign_dlg_proc): Show photo if possible.
+	(showphoto_dlg_proc): New.
+	* wptKeyManagerDlg.cpp (restore_window_size): New.
+	(keymanager_dlg_proc): Restore original window size on startup.
+	(copy_key_info): Allow to copy multiple key items.
+	
 2006-06-06  Timo Schulz  <ts at g10code.de>
 
 	* wptKeyEditCB.cpp (cmd_sign_handler): Return 0 by default

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/WinPT-en.rc	2006-06-12 13:40:21 UTC (rev 226)
@@ -1411,7 +1411,16 @@
     DEFPUSHBUTTON   "OK",IDOK,209,186,50,14
 END
 
+IDD_WINPT_SHOWPHOTO DIALOG DISCARDABLE  0, 0, 93, 106
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Photo of"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,48,86,39,14
+    CONTROL         "",IDC_SHOWPHOTO_IMG,"Static",SS_BLACKFRAME,2,5,83,68
+END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -1931,6 +1940,14 @@
         TOPMARGIN, 3
         BOTTOMMARGIN, 200
     END
+
+    IDD_WINPT_SHOWPHOTO, DIALOG
+    BEGIN
+        LEFTMARGIN, 2
+        RIGHTMARGIN, 87
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 100
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/WinPT.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -448,7 +448,6 @@
     HACCEL accel_tab;
     MSG msg;
     HWND hwnd = NULL;
-    /*WORD ver[3], ptdver[4];*/
     int rc, ec, created = 0;
     int first_start = 0, start_gpgprefs = 0;
     int winpt_inst_found = 0;
@@ -469,6 +468,7 @@
     #endif
 
     /* XXX
+    WORD ver[3], ptdver[4];
     get_file_version ("WinPT.exe", &ver[0], &ver[1], &ver[2], &ver[3]);
     get_file_version ("PTD.dll", &ptdver[0], &ptdver[1], 
 				 &ptdver[2], &ptdver[3]);

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/resource.h	2006-06-12 13:40:21 UTC (rev 226)
@@ -166,6 +166,7 @@
 #define IDI_USERID                      243
 #define IDD_WINPT_LANGUAGE              245
 #define IDR_WINPT_KEYEDIT               246
+#define IDD_WINPT_SHOWPHOTO             247
 #define IDC_CLIPEDIT_SEND               1000
 #define IDC_CLIPEDIT_CLEAR              1001
 #define IDC_CLIPEDIT_CLIPTEXT           1002
@@ -657,6 +658,7 @@
 #define IDC_PREFS_BAKSECRING            1532
 #define IDC_VERIFY_SIGNOT               1533
 #define IDC_PASSWD_KEYINF               1534
+#define IDC_SHOWPHOTO_IMG               1535
 #define ID_GPG_ENCRYPT                  40003
 #define ID_GPG_DECRYPT                  40004
 #define ID_GPG_SIGN                     40005
@@ -839,9 +841,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        247
+#define _APS_NEXT_RESOURCE_VALUE        248
 #define _APS_NEXT_COMMAND_VALUE         40190
-#define _APS_NEXT_CONTROL_VALUE         1535
+#define _APS_NEXT_CONTROL_VALUE         1536
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/Src/wptClipboard.cpp
===================================================================
--- trunk/Src/wptClipboard.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptClipboard.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -90,8 +90,8 @@
 	type |= PGP_SIG;
     if (strstr (data, "BEGIN PGP PUBLIC KEY BLOCK"))
 	type |= PGP_PUBKEY;
-    if (strstr (data, "BEGIN PGP PRIVATE KEY BLOCK") 
-	|| strstr (data, "BEGIN PGP SECRET KEY BLOCK"))
+    if (strstr (data, "BEGIN PGP PRIVATE KEY BLOCK") ||
+	strstr (data, "BEGIN PGP SECRET KEY BLOCK"))
 	type |= PGP_SECKEY;
     if (strstr (data, "- -----BEGIN"))
 	type |= PGP_DASH_ESCAPED;

Modified: trunk/Src/wptCurrWnd.cpp
===================================================================
--- trunk/Src/wptCurrWnd.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptCurrWnd.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -42,11 +42,13 @@
     OpenClipboard (NULL);
     EmptyClipboard ();
     CloseClipboard ();
-} /* clip_clear */
+}
 
 
+/* Check if the clipboard returns any data.
+   Return value: 0 on success. */
 static int
-clip_check( void )
+clip_check (void)
 {
     HANDLE clipmem;
 
@@ -63,9 +65,10 @@
     }
     CloseClipboard( );
     return 0;
-} /* clip_check */
+}
 
 
+/* Fabricate a "select all" keystroke sequence. */
 static void
 wnd_msg_markall (void)
 {
@@ -127,14 +130,14 @@
 	KEYUP( (BYTE)'C', 0x2e );
 	KEYUP( VK_CONTROL, 0x1d );	
     }
-} /* msg_wm_copy */
+}
 
 
 static inline void
 wnd_msg_em_set_pos( HWND hwnd, int begin )
 {
     SendMessage( hwnd, EM_SETSEL, 0, begin? 1 : -1 );
-} /* wnd_msg_em_set_pos */
+}
 
 
 static HWND
@@ -164,7 +167,7 @@
 	*r_main = prev;
 
     return fg;
-} /* get_curr_wnd */
+}
 
 
 int
@@ -216,7 +219,7 @@
 	*r_hotkey = 0; /* reset: we need this in any case */
     
     return rc;
-} /* get_window_contents */
+}
 
 
 int
@@ -246,4 +249,4 @@
     SetForegroundWindow( lost );
 
     return 0;
-} /* set_window_contents */
+}

Modified: trunk/Src/wptFileCBS.cpp
===================================================================
--- trunk/Src/wptFileCBS.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptFileCBS.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -1,5 +1,5 @@
 /* wptFileCBS.cpp - Customized I/O callbacks for GPGME
- *	Copyright (C) 2005 Timo Schulz
+ *	Copyright (C) 2005, 2006 Timo Schulz
  *	Copyright (C) 2005 g10 Code GmbH
  *
  * This file is part of WinPT.

Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptFileManager.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -149,8 +149,10 @@
 int
 is_openpgp_ext (const char *name)
 {
-    if (stristr (name, ".gpg") || stristr (name, ".asc")
-	|| stristr (name, ".sig") || stristr (name, ".pgp"))
+    if (stristr (name, ".gpg") || 
+	stristr (name, ".asc") ||
+	stristr (name, ".sig") ||
+	stristr (name, ".pgp"))
 	return -1;
     return 0;
 }
@@ -438,16 +440,17 @@
 }
 
 
+/* Check if file @file is already in the list (view). */
 static int
-fm_check_for_entry( listview_ctrl_t lv, const char *file )
+fm_check_for_entry (listview_ctrl_t lv, const char *file)
 {
     char name[512];
     int i;
 
     memset (name, 0, sizeof (name));
-    for (i = 0; i < listview_count_items( lv, 0 ); i++) {
-	listview_get_item_text( lv, i, 1, name, sizeof (name) - 1 );
-	if( !strcmp( name, file ) )
+    for (i = 0; i < listview_count_items (lv, 0); i++) {
+	listview_get_item_text (lv, i, FM_COL_NAME, name, sizeof (name) - 1);
+	if (!strcmp( name, file))
 	    return 1; /* found */	
     }
 
@@ -470,8 +473,8 @@
     rc = listview_add_item (lv, " ");
     if (rc)
 	return -1;
-    listview_add_sub_item (lv, 0, 0, type);
-    listview_add_sub_item (lv, 0, 1, name);
+    listview_add_sub_item (lv, 0, FM_COL_STAT, type);
+    listview_add_sub_item (lv, 0, FM_COL_NAME, name);
     return 0;
 }
 
@@ -481,13 +484,13 @@
 fm_add_dir_files (listview_ctrl_t lv, char *path)
 {
     struct _finddata_t fd;
-    char * p;
+    char *p;
     long hd;
 
     strcat (path, "\\*");
     hd = _findfirst (path, &fd);
     do {
-	p = new char [(strlen (path) + strlen (fd.name))+1];
+	p = new char [strlen (path) + strlen (fd.name)+1];
 	if (!p)
 	    BUG (0);
 	memcpy (p, path, strlen (path)-1);
@@ -544,8 +547,8 @@
 	type = gnupg_check_file_ext (name, NULL);
     rc = listview_add_item (lv, "");
     if (!rc) {
-	listview_add_sub_item (lv, 0, 0, type);
-	listview_add_sub_item (lv, 0, 1, name);
+	listview_add_sub_item (lv, 0, FM_COL_STAT, type);
+	listview_add_sub_item (lv, 0, FM_COL_NAME, name);
     }
     return rc;
 }
@@ -577,6 +580,8 @@
     if (!GetOpenFileName (&open))
 	return 0;
 
+    /* It is possible that multiple files are returned
+       and then they are separated by \0 chars. */
     s = file;
     len = sizeof (file)-1;
     for (;;) {
@@ -591,17 +596,17 @@
 	    name[i] = *s++;
 	}
 	if (n == 0)
-	    path = strdup (name);
+	    path = m_strdup (name);
 	else {
 	    char *p = make_filename (path, name, NULL);
 	    rc = add_single_file (lv, p);
-	    safe_free (p);
+	    free_if_alloc (p);
 	}
 	n++;
     }
     if (n == 1) /* single file selected. */
 	rc = add_single_file (lv, path);
-    safe_free (path);
+    free_if_alloc (path);
     return rc;
 }
 
@@ -636,7 +641,7 @@
 	    check = 1;	
 	gpg_free_packet (pkt);
 	gpg_iobuf_close (fp);
-	remove (tmpfile);
+	DeleteFile (tmpfile);
     }
     /* XXX: implement it for real files */
     safe_free (pkt);
@@ -698,10 +703,10 @@
 	break;
 	
     case FM_DECRYPT: 
-	if (!strcmp (status, "DATA")
-	    || !strcmp (status, "ENCRYPTED")
-	    || !strcmp (status, "SYMKEYENC") 
-	    || !strcmp (status, "ARMORED"))
+	if (!strcmp (status, "DATA") ||
+	    !strcmp (status, "ENCRYPTED") ||
+	    !strcmp (status, "SYMKEYENC") ||
+	    !strcmp (status, "ARMORED"))
 	    rc = 1;
 	break;
 	
@@ -790,18 +795,18 @@
 
     if (ctx->sigmode != GPGME_SIG_MODE_CLEAR)
 	return 0;
-    listview_get_item_text (lv, -1, 1, name, sizeof (name)-1);
+    listview_get_item_text (lv, -1, FM_COL_NAME, name, sizeof (name)-1);
     if (stristr (name, ".TXT"))
 	return 0;
     f = fopen (name, "rb");
     if (!f)
 	return -1; /* should never happen */
     n = fread (buf, 1, 32, f);
+    fclose (f);
     for (i = 0; i < n; i++) {
 	if (buf[i] == 0x00 || buf[i] > 170)
 	    cnt++;
     }
-    fclose (f);
     if (!cnt)
 	return 0;
     n = -1;
@@ -1013,7 +1018,7 @@
 static int
 ask_filename (fm_state_t c, const char *msg, char **dst)
 {
-    const char * s;
+    const char *s;
 
     s = get_filesave_dlg (c->dlg, msg, NULL, NULL);
     if (!s)
@@ -1048,7 +1053,7 @@
     strcat (c->output, ext); 
     
     if (!overwrite_file (c->output)) {
-	rc = ask_filename (c, _("Enter filename for encrypted file"), NULL);
+	rc = ask_filename (c, _("Enter Filename for Encrypted File"), NULL);
 	if (rc)
 	    goto leave;
     }
@@ -1146,15 +1151,16 @@
     gpgme_error_t err;    
     file_data_t in=NULL, out=NULL;
     int rc = 0, cancel = 0;
-    char ext[5], * pass;    
+    char ext[5], *pass;    
     
-    pass = request_passphrase2 (_("Symmetric"), 0, &cancel);
+    pass = request_passphrase2 (_("Symmetric Encryption"), 0, &cancel);
     if (cancel) {
 	c->cancel = 1;
 	return 0;
     }
     
-    /* XXX gpgme_control (ctx, GPGME_CTRL_CIPHER, -1);*/
+    /* XXX: a convenient feature could be to select the preferred
+	    symmetric algorithm. */
     c->output = new char[strlen (name) + 5 + 1];
     if (!c->output)
 	BUG (0);
@@ -1167,8 +1173,7 @@
 	goto leave;	
     }
 
-    gpgme_set_passphrase_cb (ctx, sym_passphrase_cb, pass);    
-
+    gpgme_set_passphrase_cb (ctx, sym_passphrase_cb, pass);
     err = gpg_file_data_new (name, 1, &in);
     if (err)
 	goto leave;
@@ -1286,7 +1291,7 @@
     }
 
     if (overwrite_file (c->output) == 0) {
-	rc = ask_filename (c, _("Please enter filename for plaintext file"), NULL);
+	rc = ask_filename (c, _("Enter Filename for Plaintext File"), NULL);
 	if (rc)
 	    goto leave;
     }
@@ -1397,7 +1402,7 @@
     strcat (c->output, ext);
     
     if (!overwrite_file (c->output)) {
-	rc = ask_filename (c, _("Enter filename for signed file"), NULL);
+	rc = ask_filename (c, _("Enter Filename for Signed File"), NULL);
 	if (rc)
 	    goto leave;
     }
@@ -1462,15 +1467,15 @@
     char file[256], *fname = NULL;
     int del_end = 0;
 
-    listview_get_item_text (lv, pos, 0, stat, sizeof (stat)-1);
-    listview_get_item_text (lv, pos, 1, file, sizeof (file)-1);
+    listview_get_item_text (lv, pos, FM_COL_STAT, stat, sizeof (stat)-1);
+    listview_get_item_text (lv, pos, FM_COL_NAME, file, sizeof (file)-1);
     if (strcmp (stat, "UNKNOWN"))
 	return 0;
     fname = make_filename (NULL, file, "asc");
     if (file_exist_check (fname) != 0) {
 	fp = fopen (fname, "wb");
 	if (fp == NULL) {
-	    log_box (_("File Manager"), MB_ERR, "could not create '%s'", fname);
+	    log_box (_("File Manager"), MB_ERR, "Could not create '%s'", fname);
 	    free_if_alloc (fname);
 	    return WPTERR_GENERAL;
 	}
@@ -1480,7 +1485,7 @@
     }
     fm_verify (ctx, 1, fname);
     if (del_end)
-	remove (fname);
+	DeleteFile (fname);
     free_if_alloc (fname);
     return 0;
 }
@@ -1537,10 +1542,7 @@
     else
 	title = _("Selected Output File");
 
-    if (stristr (name, ".sig") ||
-	stristr (name, ".asc") ||
-	stristr (name, ".gpg") ||
-	stristr (name, ".pgp")) {
+    if (is_openpgp_ext (name)) {
 	_snprintf (fname, sizeof (fname) - 1, "%s", name);
 	fname[strlen (fname) - 4] = '\0';
 	if (file_exist_check (fname) == 0 && detached)	
@@ -1696,7 +1698,8 @@
     int rc = 0;
 
     if (!rset || !rset[0]) {
-	msg_box (c->dlg, _("No key was selected for export."), _("Export"), MB_ERR);
+	msg_box (c->dlg, _("No key was selected for export."), 
+		 _("Export"), MB_ERR);
 	rc = WPTERR_GENERAL; 
 	goto leave;
     }
@@ -1876,8 +1879,8 @@
     PK_FILE_LIST list = NULL;
     WIN32_FIND_DATA findbuf;
     HANDLE hd;
-    const char * s;
-    char * patt = NULL, * p;
+    const char *s;
+    char *patt = NULL, *p;
     int rc = 0;
     
     if (!is_directory (name))
@@ -1892,10 +1895,10 @@
 	free_if_alloc (patt);
 	return WPTERR_GENERAL;
     }
-    if( strcmp( findbuf.cFileName, "." ) && strcmp( findbuf.cFileName, ".." ) ) {
-	p = make_filename( name, findbuf.cFileName, NULL );
-	pk_list_add( &list, p );
-	free_if_alloc( p );
+    if (strcmp (findbuf.cFileName, ".") && strcmp (findbuf.cFileName, "..")) {
+	p = make_filename (name, findbuf.cFileName, NULL);
+	pk_list_add (&list, p);
+	free_if_alloc (p);
     }
     while( FindNextFile( hd, &findbuf ) ) {
 	if( strcmp( findbuf.cFileName, "." ) && strcmp( findbuf.cFileName, ".." ) ) {
@@ -1907,22 +1910,24 @@
     s = get_filesave_dlg (c->dlg, _("Choose a Name for the Archive"),
 			  NULL, default_dirname (name));
     if( !s ) {
-	msg_box( c->dlg, _("Invalid archive name. Exit."), _("Encrypt Directory"), MB_ERR );
+	msg_box (c->dlg, _("Invalid archive name. Exit."), 
+		 _("Encrypt Directory"), MB_ERR);
 	rc = -1;
 	goto leave;
     }
 
-    rc = pk_archiv_create( list, s );
+    rc = pk_archiv_create (list, s);
     if( rc )
-	msg_box( c->dlg, _("Could not create zip archive."), _("Encrypt Directory"), MB_ERR );
+	msg_box (c->dlg, _("Could not create zip archive."), 
+		 _("Encrypt Directory"), MB_ERR);
     else {
-	fm_encrypt( c, s, 0 );
-	remove( s );
+	fm_encrypt (c, s, 0);
+	DeleteFile (s);
     }
 leave:
     FindClose (hd);
-    pk_list_free( list );
-    free_if_alloc( patt );
+    pk_list_free (list);
+    free_if_alloc (patt);
     return rc;
 }
 
@@ -1930,8 +1935,8 @@
 static int CALLBACK
 fm_cmp_cb (LPARAM first, LPARAM second, LPARAM sortby)
 {
-    const char *a = 0;
-    const char *b = 0;
+    const char *a = "";
+    const char *b = "";
 
     switch ((int)sortby) {
     case FM_SORT_STAT:

Modified: trunk/Src/wptFileStatDlg.cpp
===================================================================
--- trunk/Src/wptFileStatDlg.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptFileStatDlg.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -70,9 +70,9 @@
     case 4: return "BLOWFISH";
     case 5: return "RESERVED";
     case 6: return "RESERVED";
-    case 7: return "AES-128";
-    case 8: return "AES-192";
-    case 9: return "AES-256";
+    case 7: return "AES128";
+    case 8: return "AES192";
+    case 9: return "AES256";
     default: break;
     }    
     return "UNKNOWN";

Modified: trunk/Src/wptGPGMEData.cpp
===================================================================
--- trunk/Src/wptGPGMEData.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptGPGMEData.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -266,6 +266,7 @@
 }
 
 
+
 /* Write a single byte to data object @hd. */
 void
 gpg_data_putc (gpgme_data_t hd, int c)

Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyCache.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -55,6 +55,17 @@
 typedef struct attr_list_s *attr_list_t;
 
 
+/* XXX: convert it to an inline function and place it in a header file. */
+static unsigned char*
+safe_uchar_alloc (size_t n)
+{
+    unsigned char *p = new unsigned char[n];
+    if (!p)
+	BUG (0);
+    return p;
+}
+
+
 /* Free attribute list @ctx. */
 void
 free_attr_list (attr_list_t ctx)
@@ -122,9 +133,7 @@
 		;
 	    t->next = c;
 	}
-	c->d = new unsigned char[c->octets];
-	if (!c->d)
-	    BUG (0);
+	c->d = safe_uchar_alloc (c->octets);
 	memcpy (c->d, data, c->octets);
 	data += c->octets;
 	datlen -= c->octets;
@@ -231,9 +240,7 @@
     free_if_alloc (fnd->attrib.d);
     fnd->attrib.flags = dat->flags;
     fnd->attrib.len = dat->octets;
-    fnd->attrib.d = new unsigned char[dat->octets];
-    if (!fnd->attrib.d)
-	BUG (0);
+    fnd->attrib.d = safe_uchar_alloc (dat->octets);
     memcpy (fnd->attrib.d, dat->d, dat->octets);
     return 0;
 }
@@ -393,12 +400,10 @@
 	    err = gpg_keycache_find_key2 (ctx, keyid, 0, &key, &c);
 	    if (err || !c)
 		goto next;
-	    if (c->sym_prefs) /* only use the prefs from the primary uid. */
+	    if (c->sym_prefs) // only use the prefs from the primary uid.
 		goto next;
 	    else if (nsym > 0) {
-		c->sym_prefs = new unsigned char[nsym+1];
-		if (!c->sym_prefs)
-		    BUG (0);
+		c->sym_prefs = safe_uchar_alloc (nsym+1);
 		memset (c->sym_prefs, 0, nsym+1);
 		memcpy (c->sym_prefs, sym_prefs, nsym);
 	    }
@@ -638,6 +643,7 @@
 }
 
 
+/* Helper to retrieve a GPG key. */
 static gpgme_error_t
 get_gpg_key (const char *keyid, int is_sec, gpgme_key_t *r_key)
 {
@@ -817,12 +823,15 @@
 }
 
 
-/* XXX: kludge to see if the key is stored on a card. */
+/* Return 1 if we can assume that the actual private key is
+   stored on a smart card. This is not bullet proof, but the
+   card provides 3 keys (RSA) and each key for a different purpose. */
 static int
 key_divert_to_card (gpgme_key_t key)
 {
     gpgme_subkey_t k;
-    int n=0, n_alg=0, can_auth = 0;
+    int n=0, n_alg=0;
+    int can_auth = 0, can_encr = 0;
 
     for (k = key->subkeys; k; k = k->next) {
 	n++;
@@ -830,8 +839,10 @@
 	    n_alg++;
 	if (k->can_authenticate)
 	    can_auth++;
+	if (k->can_encrypt)
+	    can_encr++;
     }
-    if (n == 3 && n_alg == 3 && can_auth == 1)
+    if (n == 3 && n_alg == 3 && can_auth == 1 && can_encr == 1)
 	return 1;
     return 0;
 }
@@ -845,9 +856,7 @@
 
     while (prefs[pos] != 0)
 	pos++;
-    p = new unsigned char[pos+1];
-    if (!p)
-	BUG (0);
+    p = safe_uchar_alloc (pos+1);
     memset (p, 0, pos+1);
     memcpy (p, prefs, pos);
     return p;
@@ -865,7 +874,8 @@
 	return gpg_error (GPG_ERR_INV_ARG);
     
     for (c=sec->item; c; c=c->next) {
-	if (!gpg_keycache_find_key2 (pub, c->key->subkeys->keyid, 0, &key, &c_sec)) {
+	if (!gpg_keycache_find_key2 (pub, c->key->subkeys->keyid, 0, 
+				     &key, &c_sec)) {
 	    c_sec->gloflags.is_protected = c->gloflags.is_protected;
 	    c_sec->gloflags.divert_to_card = c->gloflags.divert_to_card;
 	    if (!c->gloflags.divert_to_card)

Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyEditDlgs.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -983,9 +983,9 @@
     memset (&k, 0, sizeof (k));
     if (winpt_get_pubkey (keyid, &k))
 	BUG (0);
-    sym_prefs = k.ext->sym_prefs;
     if (!k.is_v3)
 	return 0;
+    sym_prefs = k.ext->sym_prefs;
     if (!sym_prefs)
 	return 1; /* assume that only v3 keys have no symmetric cipher preferences
 		     and thus IDEA is explicit. */
@@ -1342,6 +1342,7 @@
     GpgKeyEdit *ke;
     date_s udd = {0};
     char buf[256], * pass = NULL;
+    time_t exp;
     int pos, cancel = 0;
 
     if (!k->key_pair) {
@@ -1383,18 +1384,17 @@
 	if (cancel)
 	    return FALSE;
     }
-
+    exp = w32_mktime (&udd.st);
     ke = create_GpgKeyEdit (k->keyid);
     if (k->is_protected)
 	ke->setPassphrase (pass);
     else
 	ke->setNoPassphrase (true);
-    err = ke->setKeyExpireDate (pos, w32_mktime (&udd.st), false);
+    err = ke->setKeyExpireDate (pos, exp, false);
     if (err)
 	msg_box (dlg, gpgme_strerror (err), _("Expire Subkey"), MB_ERR);
     else {
-	_snprintf (buf, sizeof (buf)-1, "%04d-%02d-%02d",
-		   udd.st.wYear, udd.st.wMonth, udd.st.wDay);
+	_snprintf (buf, sizeof (buf)-1, "%s", get_key_created (exp));
 	listview_add_sub_item (lv, pos, SUBK_COL_EXPIRES, buf);
 	k->update = 1;
 	msg_box (dlg, _("Subkey expire date successfully set."), 

Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyManager.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -54,7 +54,7 @@
 
 /* Return a user friendly key representation in @buf of
    the key given by @keyid. */
-static void 
+void 
 key_get_clip_info (const char *keyid, char *buf, size_t buflen)
 {
     winpt_key_s key;

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyManagerDlg.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -104,6 +104,7 @@
 
 
 static void km_gui_import (struct km_info_s *kmi, int cmd_id, void *param);
+void key_get_clip_info (const char *keyid, char *buf, size_t buflen);
 
 
 /* Subclass the keylist listview control to allow extended commands. */
@@ -301,6 +302,30 @@
 }
 
 
+/* Restore the original size of the dialog. */
+static void
+restore_window_size (HWND dlg, struct km_info_s *kmi)
+{
+    char *p;
+    int height = 0, width = 0;
+
+    /* Restore the original window size. */
+    p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width");
+    if (p) {
+	width = atoi (p);
+	free_if_alloc (p);
+    }
+    p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height");
+    if (p) {
+	height = atoi (p);
+	free_if_alloc (p);
+    }
+    if (height > 0 && width > 0)
+	SetWindowPos (dlg, HWND_TOP, kmi->pos_x, kmi->pos_y, 
+		      height, width, SWP_SHOWWINDOW);
+}
+
+
 /* Center window @dlg. */
 static void
 do_center_window (HWND dlg, struct km_info_s *kmi)
@@ -323,7 +348,7 @@
 	return;
     }
     else if (p)
-	pos_x = atol (p);
+	pos_x = atoi (p);
 
     p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
     if (p && !strcmp (p, " ")) {
@@ -332,7 +357,7 @@
 	return;
     }
     else if (p)
-	pos_y = atol (p);
+	pos_y = atoi (p);
 
     if (!pos_y && !pos_x) {
 	center_window (dlg, NULL);
@@ -345,6 +370,9 @@
 	|| pos_y > GetSystemMetrics (SM_CYSCREEN)) {
 	pos_x = pos_y = 0;
     }
+    kmi->pos_x = pos_x;
+    kmi->pos_y = pos_y;
+
     GetClientRect (dlg, &rect);
     MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
 }
@@ -400,7 +428,7 @@
         
     /* Place the keylist above the separator */
     h = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
-    MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left, 
+    MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
 		kmi->ypos_sep - rclient.top, bRepaint);
     rclient.top = kmi->ypos_sep + 5 + 8;
 
@@ -525,27 +553,31 @@
         FillRect (ps.hdc, &rect, (HBRUSH)(COLOR_3DFACE+1));
 
         /* The lines from the light into the dark */
-        MoveToEx(ps.hdc, 0,0, NULL);
-        if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT))) != NULL) {
+        MoveToEx (ps.hdc, 0,0, NULL);
+        hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DHILIGHT));
+	if (hpen != NULL) {
             SelectObject (ps.hdc, (LPVOID)hpen);
             LineTo (ps.hdc, rect.right, 0);
             DeleteObject (hpen);
         }
-	MoveToEx(ps.hdc, 0, 1, NULL);
-	if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT))) != NULL) {
+	MoveToEx (ps.hdc, 0, 1, NULL);
+	hpen = CreatePen (PS_SOLID, 0, GetSysColor (COLOR_3DLIGHT));
+	if (hpen != NULL) {
              SelectObject (ps.hdc, (LPVOID)hpen);
              LineTo (ps.hdc, rect.right, rect.bottom);
              DeleteObject (hpen);
          }
 
-        MoveToEx(ps.hdc, 0, rect.bottom-1, NULL);
-        if ((hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW))) != NULL) {
+        MoveToEx (ps.hdc, 0, rect.bottom-1, NULL);
+        hpen = CreatePen (PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+	if (hpen != NULL) {
             SelectObject (ps.hdc, (LPVOID)hpen);
             LineTo (ps.hdc, rect.right, rect.bottom-1);
             DeleteObject (hpen);
         }
-        MoveToEx(ps.hdc, 0, rect.bottom, NULL);
-        if ((hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW))) != NULL) {
+        MoveToEx (ps.hdc, 0, rect.bottom, NULL);
+        hpen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
+	if (hpen != NULL) {
             SelectObject (ps.hdc, (LPVOID)hpen);
             LineTo (ps.hdc, rect.right, rect.bottom);
             DeleteObject (hpen);
@@ -576,8 +608,8 @@
                 break;
 
             /* Calculate mouse movement */
-            p.x = LOWORD(lparam);
-            p.y = HIWORD(lparam);
+            p.x = LOWORD (lparam);
+            p.y = HIWORD (lparam);
             ClientToScreen (hwnd, &p);
 
             GetWindowRect (hwnd, &r);
@@ -591,7 +623,7 @@
             MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);
             kmi->ypos_sep = r.top;
             kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
-	    do_resize_window (GetParent(hwnd), kmi);
+	    do_resize_window (GetParent (hwnd), kmi);
 	    return 0;
         }
     }
@@ -1173,15 +1205,76 @@
 }
 
 
+/* Copy the requested key information (@what) to the clipboard.
+   If multiple items were selected, each key info is copied to
+   the clipboard. The data is separated by \r\n. */
+static void
+copy_key_info (int what, struct km_info_s *kmi)
+{
+    gpgme_data_t out;
+    gpgme_key_t key;
+    struct keycache_s *kci = NULL;
+    size_t n=0;
+    char *p, tmp[256];
+    int i=0, end = listview_count_items (kmi->lv, 0);
+    bool single = false;
+
+    /* Do not iterate over the entire list if just one item is selected. */
+    n = listview_count_items (kmi->lv, 1);
+    if (n == 1) {
+	i = kmi->lv_idx;
+	end = i+1;
+	single = true;
+    }
+
+    gpgme_data_new (&out);
+    for (; i < end; i++) {
+	if (!listview_get_item_state (kmi->lv, i))
+	    continue;
+	switch (what) {
+	case ID_KEYCTX_UID_COPY:
+	    key = km_get_key_ptr (kmi->lv, i, &kci);
+	    gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
+	    if (!single) gpgme_data_write (out, "\r\n", 2);
+	    break;
+
+	case ID_KEYCTX_KEYID_COPY:
+	    key = km_get_key_ptr (kmi->lv, i, NULL);
+	    gpgme_data_write (out, "0x", 2);
+	    gpgme_data_write (out, key->subkeys->keyid+8, 8);
+	    if (!single) gpgme_data_write (out, "\r\n", 2);
+	    break;
+
+	case ID_KEYCTX_FPR_COPY:
+	    key = km_get_key_ptr (kmi->lv, i, NULL);
+	    gpgme_data_write (out, key->subkeys->fpr, strlen (key->subkeys->fpr));
+	    if (!single) gpgme_data_write (out, "\r\n", 2);
+	    break;
+
+	case ID_KEYCTX_KINFO_COPY:
+	    key = km_get_key_ptr (kmi->lv, i, NULL);
+	    key_get_clip_info (key->subkeys->keyid+8, tmp, sizeof (tmp)-1);
+	    gpgme_data_write (out, tmp, strlen (tmp));
+	    if (!single) gpgme_data_write (out, "\r\n", 2);
+	    break;
+	}
+    }
+    gpgme_data_write (out, "\0", 1);
+    p = gpgme_data_release_and_get_mem (out, &n);
+    set_clip_text (NULL, p, n);
+    gpgme_free (p);
+}
+
+
 /* Dialog box procedure for the Key Manager. */
 BOOL CALLBACK
 keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
     HWND kl;
     HMENU hm;
+    RECT r;
     gpg_keycache_t c;
     gpgme_key_t key;
-    struct keycache_s *kci;
     km_info_t kmi = NULL;    
     struct genkey_s genkey;
     struct winpt_key_s k = {0};
@@ -1218,8 +1311,6 @@
 	SetWindowText (dlg, _("Key Manager"));
 
         c = keycache_get_ctx (KEYCACHE_PUB);
-        if (!c)
-            BUG (NULL);
 	kl = GetDlgItem (dlg, IDC_KEYMISC_KEYLIST);
         kmi->keylist_sortby = KEY_SORT_USERID;
         Header_SetImageList(ListView_GetHeader (kl), glob_imagelist);
@@ -1249,6 +1340,7 @@
 
 	do_center_window (dlg, kmi);
         do_resize_window (dlg, kmi);
+	restore_window_size (dlg, kmi);
         update_ui_items (dlg, kmi->lv);
 	restore_column_info (kmi);
 	keylist_sort (kmi->lv, kmi->keylist_sortby);
@@ -1279,8 +1371,15 @@
 	set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X", type);
 	ltoa (kmi->pos_y, type, 10);
 	set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y", type);
-	/* XXX: store window size. */
-	
+
+	GetWindowRect (dlg, &r);
+	sprintf (type, "%d", (int)(r.bottom-r.top));
+	set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Width",
+			   type);
+	sprintf (type, "%d", (int)(r.right-r.left));
+	set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height",
+			type);
+
 	/* Remove runtime information. This should be the last action taken here. */
 	delete kmi;
 	kmi = NULL;
@@ -1288,7 +1387,6 @@
 	return FALSE;
 
     case WM_MOVE:
-        RECT r;
         GetWindowRect (dlg, &r);
 	kmi->pos_x = r.left;
 	kmi->pos_y = r.top;	
@@ -1914,30 +2012,10 @@
 	    break;
 
 	case ID_KEYCTX_UID_COPY:
-	    /* XXX: add generic function to support multiple selection
-	            with a callback */
-	    key = km_get_key_ptr (kmi->lv, kmi->lv_idx, &kci);
-	    name = kci->uids->name;
-	    set_clip_text (NULL, name, strlen (name));
-	    break;
-
 	case ID_KEYCTX_KEYID_COPY:
-	    key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
-	    memset (type, 0, sizeof (type));
-	    type[0] = '0'; type[1] = 'x';
-	    memcpy (type+2, key->subkeys->keyid+8, 8);
-	    set_clip_text (NULL, type, strlen (type));
-	    break;
-
 	case ID_KEYCTX_FPR_COPY:
-	    key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
-	    t = key->subkeys->fpr;
-	    set_clip_text (NULL, t? t : "", t? strlen (t): 0);
-	    break;
-
 	case ID_KEYCTX_KINFO_COPY:
-	    key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
-	    km_set_clip_info (key->subkeys->keyid+8);
+	    copy_key_info (LOWORD (wparam), kmi);
 	    break;
 
         case ID_KEYCTX_COPY:

Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyPropsDlg.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -78,13 +78,13 @@
 
 /* Generate a unique temp name for the photo which
    depends on the dialog handle and return it. */
-static const char*
+const char*
 get_photo_tmpname (HWND dlg)
 {
     static char buf[MAX_PATH+128+1];
     char name[64];
 
-    _snprintf (name, sizeof (name)-1, "winpt_photo_%08lX.tmp", (DWORD)dlg);
+    _snprintf (name, DIM (name)-1, "winpt_photo_%08lX.tmp", (DWORD)dlg);
     get_temp_name (buf, DIM (buf)-1, name);
     return buf;
 }
@@ -99,9 +99,18 @@
 }
 
 
+
+/* Delete temporary photo file. */
+void
+key_unload_photo (HWND dlg)
+{
+    DeleteFile (get_photo_tmpname (dlg));
+}
+
+
 /* Load the photo from the key @key */
-static int
-keyprops_load_photo (HWND dlg, gpgme_key_t key, gpgme_validity_t *r_valid)
+int
+key_load_photo (HWND dlg, gpgme_key_t key, gpgme_validity_t *r_valid)
 {
     winpt_key_s k;
     FILE *f;
@@ -115,7 +124,8 @@
     imglen = k.ext->attrib.len;
     if (img && !k.ext->attrib.validity)
 	get_uat_validity (key->subkeys->keyid, &k.ext->attrib.validity);
-    *r_valid = k.ext->attrib.validity;
+    if (r_valid)
+	*r_valid = k.ext->attrib.validity;
 
     if (!img || !imglen) {
 	draw_nophoto_img (dlg);
@@ -132,25 +142,6 @@
 }
 
 
-/* Display the photo in the image control in the dialog @dlg. */
-static int
-keyprops_show_photo (HWND dlg)
-{
-    RECT r;	
-    POINT p;
-    HWND h;
-
-    h = GetDlgItem (dlg, IDC_KEYPROPS_IMG);
-    GetWindowRect (h, &r);
-    p.x = r.left + 5;
-    p.y = r.top - 2;
-    memset (&p, 0, sizeof (p));
-    PTD_jpg_show (h, &p, get_photo_tmpname (dlg));
-    
-    return 0;
-}
-
-
 /* Return string representation of the key validity. @key. */
 static const char*
 get_validity (gpgme_key_t key)
@@ -294,7 +285,7 @@
     SetDlgItemText (dlg, IDC_KEYPROPS_OTINF, _("Ownertrust"));	
     
     display_key_info (dlg, k);
-    if (!keyprops_load_photo (dlg, k->ctx, &valid)) {
+    if (!key_load_photo (dlg, k->ctx, &valid)) {
 	k->has_photo = 1;
 	if (valid < GPGME_VALIDITY_MARGINAL)
 	    SetDlgItemText (dlg, IDC_KEYPROPS_IMGINF, _("Photo-ID not validated."));
@@ -332,16 +323,22 @@
         return TRUE;
 
     case WM_DESTROY:
-	remove (get_photo_tmpname (dlg));
-	delete prop;prop=NULL;
+	key_unload_photo (dlg);
+	delete prop;prop = NULL;
 	SetWindowLong (dlg, GWL_USERDATA, 0);
 	break;
       
     case WM_PAINT:
-	if (prop->key->has_photo)
-	    keyprops_show_photo (dlg);
+	/* Display the photo in the frame of the dialog @dlg.
+	   The coordinates are fixed to (0,0). */
+	if (prop->key->has_photo) {
+	    POINT p;
+	    p.x = p.y = 0;
+	    PTD_jpg_show (GetDlgItem (dlg, IDC_KEYPROPS_IMG), 
+			    &p, get_photo_tmpname (dlg));
+	}
 	break;
-        
+
     case WM_COMMAND:
         switch (LOWORD (wparam)) {
         case IDOK:

Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeylist.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -224,6 +224,7 @@
     dat = get_locale_date (timestamp, timebuf, sizeof (timebuf)-1);
     if (dat)
 	return dat;
+    /* Fallback if locate date conversion failed. */
     warp = localtime (&timestamp);
     _snprintf (timebuf, sizeof timebuf - 1, "%04d-%02d-%02d",
 	       warp->tm_year + 1900, warp->tm_mon + 1, warp->tm_mday);
@@ -311,8 +312,10 @@
     case GPGME_PK_DSA: return "DSA";
     case GPGME_PK_ELG:
     case GPGME_PK_ELG_E: return "ELG";
-    case 0: /* XXX: gpgme returned pubkey algo 0 for a RSA made sig. */
-    case GPGME_PK_RSA: return "RSA";
+    case 0: /* XXX: do we still need this?? */
+    case GPGME_PK_RSA: 
+    case GPGME_PK_RSA_S:
+    case GPGME_PK_RSA_E: return "RSA";
     default: return "???";
     }
     return "???";

Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeyserver.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -527,7 +527,7 @@
 port_from_proto (int proto)
 {
     switch (proto) {
-    case KSPROTO_LDAP:   return 0;
+    case KSPROTO_LDAP:   return LDAP_PORT;
     case KSPROTO_FINGER: return FINGER_PORT;
     case KSPROTO_HTTP:   return HKP_PORT;
     }
@@ -541,7 +541,7 @@
 {
     if (strstr (buf, "ldap"))
 	return KSPROTO_LDAP;
-    else if (strstr( buf, "finger"))
+    else if (strstr (buf, "finger"))
 	return KSPROTO_FINGER;
     return KSPROTO_HKP;
 }
@@ -1508,6 +1508,7 @@
 {
     char *p;
     char *url = *r_keyserver;
+    int off = 0;
 
     /* no port is given so use the default port. */
     p = strrchr (url, ':');
@@ -1518,8 +1519,11 @@
 	*r_port = port;
 	return 0;
     }
-    /* XXX: remove / in .de/:11371 */
-    *r_keyserver = substr (url, 0, (p-url));    
+
+    if (url[(p-url)-1] == '/') /* remove / in .de/:11371 */
+	off = 1;
+
+    *r_keyserver = substr (url, 0, (p-url)-off);
     *r_port = atoi (url+(p-url)+1);
     free_if_alloc (url);
     return 0;

Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptKeysignDlg.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -41,6 +41,10 @@
 #include "wptKeyEdit.h"
 
 
+void key_unload_photo (HWND dlg);
+int  key_load_photo (HWND dlg, gpgme_key_t key, gpgme_validity_t *r_valid);
+const char* get_photo_tmpname (HWND dlg);
+
 /* Return a beautified printable fingerprint of @fpr. */
 static const char*
 get_printable_fpr (const char *fpr)
@@ -159,6 +163,51 @@
 }
 
 
+/* Show the photographic ID of the key in a separate dialog window. */
+BOOL CALLBACK
+showphoto_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    static winpt_key_t key;
+    char buf[100];
+
+    switch (msg) {
+    case WM_INITDIALOG:
+	key = (winpt_key_t)lparam;
+	if (!key)
+	    BUG (0);
+	key_load_photo (dlg, key->ctx, NULL);
+	_snprintf (buf, sizeof (buf)-1, _("Photo of %s"), key->uid);
+	SetWindowText (dlg, buf);
+	SetForegroundWindow (dlg);
+	break;
+
+    case WM_PAINT:
+	if (key->ext && key->ext->attrib.len > 0) {
+	    POINT p;
+	    p.x = p.y = 0;
+	    PTD_jpg_show (GetDlgItem (dlg, IDC_SHOWPHOTO_IMG), 
+			    &p, get_photo_tmpname (dlg));
+	}
+	break;
+
+    case WM_DESTROY:
+	key_unload_photo (dlg);
+	break;
+
+    case WM_COMMAND:
+	switch (LOWORD (wparam)) {
+	case IDCANCEL:
+	case IDOK:
+	    EndDialog (dlg, TRUE);
+	    break;
+	}
+	break;
+    }
+
+    return FALSE;
+}
+
+
 /* Dialog box procedure to choose the signature class. */
 BOOL CALLBACK
 sig_class_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -221,14 +270,6 @@
 }
 
 
-/* Display photo of key @key in a separate window. */
-static void
-show_photo (winpt_key_t key)
-{
-    /* XXX: fill it with life. */
-}
-
-
 /* Check if the given system time @st points to today. */
 static int
 date_is_today (SYSTEMTIME *st)
@@ -410,7 +451,8 @@
             return TRUE;
 
 	case IDC_KEYSIGN_SHOWIMG:
-	    show_photo (key);
+	    DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_SHOWPHOTO,
+			    dlg, showphoto_dlg_proc, (LPARAM)key);
 	    return TRUE;
         }
         break;

Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptMainProc.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -95,8 +95,10 @@
     switch (msg) {
     case WM_INITDIALOG:
 	SetWindowText (dlg, _("Delete Clipboard Contents"));
-	SetDlgItemText (dlg, IDC_CONFDELCLIP_BRAIN, _("&Remember the answer"));
-	SetDlgItemText (dlg, IDC_CONFDELCLIP_INFO, _("Do you want to delete the contents from the clipboard?"));
+	SetDlgItemText (dlg, IDC_CONFDELCLIP_BRAIN, 
+			_("&Remember the answer"));
+	SetDlgItemText (dlg, IDC_CONFDELCLIP_INFO, 
+			_("Do you want to delete the contents from the clipboard?"));
 	SetDlgItemText (dlg, IDYES, _("&Yes"));
 	SetDlgItemText (dlg, IDNO, _("&No"));
 	center_window (dlg, NULL);
@@ -135,7 +137,7 @@
 	*ret_set = 1;
     switch (id) {
     case ID_WINPT_CURRWND_SYMENC:
-	gpg_encrypt_symmetric ();
+	gpg_clip_sym_encrypt ();
 	break;
 
     case ID_WINPT_CURRWND_ENCRYPT:
@@ -203,7 +205,7 @@
     
     switch( id ) {
     case ID_WINPT_SYMENC:
-        gpg_encrypt_symmetric ();
+        gpg_clip_sym_encrypt ();
         break;
         
     case ID_WINPT_ENCRYPT:

Modified: trunk/Src/wptSigList.cpp
===================================================================
--- trunk/Src/wptSigList.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptSigList.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -177,12 +177,11 @@
     strcat (t, " ");
     if (!ks->exportable)
 	strcat (t, "L");
-    /*if (key_attr & GPGME_SIGF_NREV)
-	strcat (t, "R");*/
+    /* XXX: if gpgme supports non-revocable status, add 'R' */
     listview_add_sub_item (lv, pos, 2, t);
 
     key_attr = ks->timestamp;
-    if( key_attr ) {
+    if (key_attr) {
 	s = get_key_created (key_attr);
 	listview_add_sub_item (lv, pos, 3, s);
     }

Modified: trunk/Src/wptSymEnc.cpp
===================================================================
--- trunk/Src/wptSymEnc.cpp	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/Src/wptSymEnc.cpp	2006-06-12 13:40:21 UTC (rev 226)
@@ -1,5 +1,5 @@
 /* wptSymEnc.cpp - Symmetric encryption support
- *	Copyright (C) 2002, 2003, 2004, 2005, 2006 Timo Schulz
+ *	Copyright (C) 2002-2006 Timo Schulz
  *
  * This file is part of WinPT.
  *
@@ -59,8 +59,8 @@
 
 /* Perform symmetric encryption on the current clipboard data.
    Return 0 for success. */
-int
-gpg_encrypt_symmetric (void)
+gpgme_error_t
+gpg_clip_sym_encrypt (void)
 {
     gpgme_ctx_t ctx;
     gpgme_data_t plain=NULL;
@@ -81,10 +81,11 @@
 	goto leave;
     rc = gpgme_data_new (&ciph);
     gpgme_set_armor (ctx, 1);
+    gpgme_set_textmode (ctx, 1);
 
     gpgme_set_passphrase_cb (ctx, sym_passphrase_cb, pass);
 
-    rc = gpgme_op_encrypt (ctx, NULL, (gpgme_encrypt_flags_t)0, plain, ciph);    
+    rc = gpgme_op_encrypt (ctx, NULL, (gpgme_encrypt_flags_t)0, plain, ciph);
     if (rc)
 	msg_box (NULL, gpgme_strerror (rc), _("Symmetric Encryption"), MB_ERR);
     else {
@@ -100,5 +101,5 @@
 	gpgme_data_release (ciph);
     gpgme_release (ctx);
     sfree_if_alloc (pass);
-    return rc? WPTERR_GENERAL : 0;
+    return rc;
 }

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-06-06 13:37:59 UTC (rev 225)
+++ trunk/configure.ac	2006-06-12 13:40:21 UTC (rev 226)
@@ -15,7 +15,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 1.0.0pre0-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 1.0.0pre0, http://www.winpt.org)
 NEED_GPG_VERSION=1.4.2
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.1

