[Winpt-commits] r194 - in trunk: . MyGPGME Po

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Sat Apr 1 14:37:01 CEST 2006


Author: twoaday
Date: 2006-04-01 14:36:58 +0200 (Sat, 01 Apr 2006)
New Revision: 194

Removed:
   trunk/MyGPGME/gpgme-c++.cpp
   trunk/MyGPGME/gpgme-c++.h
Modified:
   trunk/NEWS
   trunk/Po/ChangeLog
   trunk/Po/de.po
   trunk/Po/fr.po
   trunk/Po/jp.po
   trunk/README-0.11.txt
Log:
2006-03-31  Timo Schulz  <ts at g10code.de>
 
        * wptCommonDlg.cpp (nls_load_langlist): New.
        (nsl_set_language): New.
        (nls_dlg_proc): New.
        (select_language): New. Allow user to select the language.
        * wptNLS.c (get_gettext_langid): Updated available languages.
        * WinPT.cpp (WinMain): Allow to select the languag on first
        start in non-installer environments.
        * wptVerifyList.cpp (verlist_build): Simplified.
        (verlist_add_sig_log): Likewise.
        * wptListview.cpp (listview_set_column_width,
        listview_get_selected_item): New.
        * wptKeyManager.cpp (gpg_clip_export): Merged into..
        (km_clip_export): ..this function.



Deleted: trunk/MyGPGME/gpgme-c++.cpp
===================================================================
--- trunk/MyGPGME/gpgme-c++.cpp	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/MyGPGME/gpgme-c++.cpp	2006-04-01 12:36:58 UTC (rev 194)
@@ -1,85 +0,0 @@
-#ifdef WITH_CPP_WRAPPER
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "gpgme.h"
-#include "gpgme-c++.h"
-
-
-gpgme_key::gpgme_key (gpgme_key_t key)
-{
-    if (!key)
-	abort ();
-    key = key;
-    ctx = NULL;
-    edit_ctx = NULL;
-    passphrase = NULL;
-}
-
-gpgme_key::~gpgme_key (void)
-{
-    if (key)
-	gpgme_key_release (key);
-    if (ctx)
-	gpgme_release (ctx);
-    if (edit_ctx)
-	gpgme_editkey_release (edit_ctx);
-}
-
-
-int
-gpgme_key::set_passwd (const char * passwd)
-{
-    if (!passwd)
-	return GPG_ERR_INV_VALUE;
-
-    if (passphrase) {
-	delete [] passphrase;
-	passphrase = NULL;
-    }
-    passphrase = new char[strlen (passwd)+1];
-    if (!passphrase)
-	abort ();
-    strcpy (passphrase, passwd);
-    return GPG_ERR_SUCCESS;
-}
-
-unsigned
-gpgme_key::ulong_attr (int what, int idx)
-{
-    assert (key);
-    return gpgme_key_get_ulong_attr (key, (gpgme_attr_t)what, NULL, idx);
-}
-
-
-const char *
-gpgme_key::string_attr (int what, int idx)
-{
-    assert (key);
-    return gpgme_key_get_string_attr (key, (gpgme_attr_t)what, NULL, idx);
-}
-
-
-const void * 
-gpgme_key::attrib_attr (int * nbytes)
-{
-    assert (key);
-    return gpgme_key_get_string_attr (key, GPGME_ATTR_PHOTO, (void **)&nbytes, 0);
-}
-
-
-int
-gpgme_key::sign (int sigclass, int local)
-{
-    gpgme_error_t rc;
-
-    if (!passphrase)
-	return GPG_ERR_PWD_NOT_SET;
-    return 0;
-}
-
-
-#endif /* WITH_CPP_WRAPPER */
\ No newline at end of file

Deleted: trunk/MyGPGME/gpgme-c++.h
===================================================================
--- trunk/MyGPGME/gpgme-c++.h	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/MyGPGME/gpgme-c++.h	2006-04-01 12:36:58 UTC (rev 194)
@@ -1,46 +0,0 @@
-//#ifdef GPGME_CPP_H
-//#define GPGME_CPP_H
-
-#ifdef WITH_CPP_WRAPPER
-
-typedef enum {
-    GPG_ERR_SUCCESS = 0,
-    GPG_ERR_INV_VALUE = 1,
-    GPG_ERR_INV_MODE = 2,
-    GPG_ERR_PWD_NOT_SET = 3
-};
-
-class gpgme_key {
-public:
-    gpgme_key (gpgme_key_t key);
-    ~gpgme_key ();
-    int sign (int sigclass, int local);
-    int trust (int val);
-    int adduid (const char * name, const char * comment, const char * mail);
-    int addkey (int algo);
-    int addphoto (const char * file);
-    int addrevoker (const char * name);
-    int deluid (int id);
-    int delkey (int id);
-    int passwd (const char * old, const char * new_);
-    int primary (const char * pwd);
-    int expire (const char *isodate);
-    int revkey (int id);
-    int revoke (const char * pwd);
-    int enable (const char * pwd);
-    int disable (const char * pwd);
-    int setpref (int id, const char * prefs);
-    int set_passwd (const char * pwd);
-    unsigned ulong_attr (int what, int idx);
-    const char * string_attr (int what, int idx);
-    const void * attrib_attr (int * nbytes);
-
-private:
-    gpgme_key_t key;
-    gpgme_ctx_t ctx;
-    gpgme_editkey_t edit_ctx;
-    char * passphrase;
-};
-
-#endif /* WITH_CPP_WRAPPER */
-//#endif /* GPGME_CPP_H */

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/NEWS	2006-04-01 12:36:58 UTC (rev 194)
@@ -775,4 +775,8 @@
 * In some dialogs the UTF8 decoding was incomplete.
 * Reload key cache when GPG settings were changed via
   the taskbar menu.
-  
\ No newline at end of file
+* Better input checks for the key generation.
+* Allow no interactive input when --stop is used.
+* Allow to select the language on first start when no
+  installer has been used for installation.
+ 
\ No newline at end of file

Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/Po/ChangeLog	2006-04-01 12:36:58 UTC (rev 194)
@@ -1,3 +1,7 @@
+2006-03-31  Timo Schulz  <ts at g10code.de>
+
+	* de.po: Updated.
+	
 2006-03-25  Timo Schulz  <ts at g10code.de>
 
 	* de.po: Updated.

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/Po/de.po	2006-04-01 12:36:58 UTC (rev 194)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 0.11.9\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-26 19:46+0200\n"
+"POT-Creation-Date: 2006-03-31 18:47+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"
@@ -22,29 +22,29 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:194
+#: Src/WinPT.cpp:183
 msgid "Could not create GPG home directory"
 msgstr "Konnte Heimatverzeichnis von GPG nicht erstellen"
 
-#: Src/WinPT.cpp:195 Src/WinPT.cpp:227 Src/WinPT.cpp:277 Src/WinPT.cpp:281
-#: Src/WinPT.cpp:486 Src/WinPT.cpp:493 Src/WinPT.cpp:533 Src/WinPT.cpp:561
-#: Src/WinPT.cpp:570 Src/WinPT.cpp:574 Src/WinPT.cpp:591 Src/WinPT.cpp:659
-#: Src/WinPT.cpp:672 Src/WinPT.cpp:719 Src/WinPT.cpp:745 Src/WinPT.cpp:763
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
-#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:349
-#: Src/wptMainProc.cpp:535
+#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
+#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
+#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
 msgid "WinPT Error"
 msgstr "WinPT Fehler"
 
-#: Src/WinPT.cpp:226
+#: Src/WinPT.cpp:215
 msgid "No useable secret key found."
 msgstr "Kein benutzbarer geheimer Schlüssel gefunden."
 
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:265
 msgid "Could not read GnuPG version."
 msgstr "Konnte Version von GnuPG nicht auslesen."
 
-#: Src/WinPT.cpp:282
+#: Src/WinPT.cpp:271
 #, c-format
 msgid ""
 "Sorry, you need a newer GPG version.\n"
@@ -53,12 +53,12 @@
 "Sorry, Sie benötigen eine neuere Version von GPG.\n"
 "Aktuelle Version von GPG %d.%d.%d benötigte Version von GPG "
 
-#: Src/WinPT.cpp:310
+#: Src/WinPT.cpp:299
 msgid "Failed to create WinPT directory"
 msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
 
-#: Src/WinPT.cpp:311 Src/WinPT.cpp:329 Src/WinPT.cpp:340
-#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
+#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
 #: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
 #: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
 #: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
@@ -71,21 +71,21 @@
 msgid "Keyserver"
 msgstr "Schlüsselserver"
 
-#: Src/WinPT.cpp:328
+#: Src/WinPT.cpp:316
 msgid "Failed to copy the keyserver.conf"
 msgstr "Das Kopieren der keyserver.conf ist fehlgeschlagen"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:245
-#: Src/WinPT.cpp:485
+#: Src/WinPT.cpp:463
 msgid "Cryptographic selftest failed."
 msgstr "Kryptographischer Selbsttest ist fehlgeschlagen."
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:252
-#: Src/WinPT.cpp:492
+#: Src/WinPT.cpp:470
 msgid "A newer GPGME version is needed; at least "
 msgstr "Eine neuere Version von GPGME wird benötigt; mindestens "
 
-#: Src/WinPT.cpp:534
+#: Src/WinPT.cpp:512
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -96,16 +96,16 @@
 "Bitte überprüfen Sie die Registryseinträge von GPG:\n"
 "%s."
 
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:516
 msgid "Select GPG Public Keyring"
 msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:560
+#: Src/WinPT.cpp:538
 msgid "GPG home directory could not be determited."
 msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
 
-#: Src/WinPT.cpp:568
+#: Src/WinPT.cpp:546
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -114,7 +114,7 @@
 "öffnen um das Problem zu beheben?"
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:583
+#: Src/WinPT.cpp:561
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -129,20 +129,20 @@
 # c:\oss\winpt-gpgme\src\WinPT.cpp:376
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
-#: Src/WinPT.cpp:616 Src/wptFileManagerDlg.cpp:494
+#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
 #: Src/wptFileManagerDlg.cpp:809
 msgid "Wipe Free Space"
 msgstr "Freien Speicher Löschen"
 
-#: Src/WinPT.cpp:658
+#: Src/WinPT.cpp:636
 msgid "Could not register window class"
 msgstr "Konnte Fensterklasse nicht registrieren"
 
-#: Src/WinPT.cpp:672
+#: Src/WinPT.cpp:650
 msgid "Could not create window"
 msgstr "Konnte Fenster nicht erstellen"
 
-#: Src/WinPT.cpp:743
+#: Src/WinPT.cpp:725
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -150,7 +150,7 @@
 "Der Schlüsselspeicher wurde nicht initialisiert oder ist leer.\n"
 "Bitte überprüfen Sie die Konfiguration von GPG (Schlüsselbunde, Pfade)"
 
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:728
 msgid ""
 "It seems that GPG is not set properly.\n"
 "Do you want to start the GPG preferences dialog?"
@@ -158,7 +158,7 @@
 "GPG ist nicht richtig konfiguriert.\n"
 "Den GPG-Einstellungsdialog starten?"
 
-#: Src/WinPT.cpp:764
+#: Src/WinPT.cpp:746
 #, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found.\n"
@@ -172,7 +172,7 @@
 "\n"
 "%s: öffentlicher Schlüssel nicht gefunden."
 
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:140
 msgid "About the GNU Privacy Guard"
 msgstr "Über den GNU Privacy Guard"
 
@@ -180,29 +180,34 @@
 msgid "About GnuPG"
 msgstr "Über GnuPG"
 
-#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
+#: Src/wptAboutDlgs.cpp:61
+msgid "The AUTHORS files contains a list of all contributors and co-authors."
+msgstr ""
+"Die Datei AUTHORS enthält eine Liste aller Co-Autoren und aller Beitragenden"
+
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1755
 #: Src/wptMainProc.cpp:586
 msgid "About WinPT"
 msgstr "Über WinPT"
 
-#: Src/wptAboutDlgs.cpp:95
+#: Src/wptAboutDlgs.cpp:97
 msgid "Warranty"
 msgstr "Gewährleistung"
 
-#: Src/wptAboutDlgs.cpp:97
+#: Src/wptAboutDlgs.cpp:99
 msgid "A free open source privacy tray for Windows based on GnuPG."
 msgstr "Ein freies OpenSource Privacy Tool für Windows basierend auf GnuPG."
 
-#: Src/wptAboutDlgs.cpp:99
+#: Src/wptAboutDlgs.cpp:101
 msgid "For more information you can visit the homepage: http://www.winpt.org"
 msgstr "Mehr Informationen können Sie die auf http://www.winpt.org bekommen"
 
-#: Src/wptAboutDlgs.cpp:101
+#: Src/wptAboutDlgs.cpp:103
 msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
 msgstr ""
 "Bitte melden Sie Fehler oder Anregungen zu WinPT an <winpt at freakmail.de>"
 
-#: Src/wptAboutDlgs.cpp:103
+#: Src/wptAboutDlgs.cpp:105
 msgid ""
 "WinPT is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -214,7 +219,7 @@
 "weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder "
 "(nach Ihrer Option) jeder späteren Version."
 
-#: Src/wptAboutDlgs.cpp:108
+#: Src/wptAboutDlgs.cpp:110
 msgid ""
 "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
@@ -225,78 +230,78 @@
 "Nähere Details entnehmen Sie bitte der General Public License."
 
 # c:\oss\winpt-gpgme\src\wptAboutDlgs.cpp:97
-#: Src/wptAboutDlgs.cpp:112
+#: Src/wptAboutDlgs.cpp:114
 msgid "&About GPG..."
 msgstr "Über &GPG..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyManagerDlg.cpp:963
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyManagerDlg.cpp:947
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Src/wptCardDlg.cpp:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:405
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:414
 msgid "Card Manager"
 msgstr "Kartenmanager"
 
-#: Src/wptCardDlg.cpp:197
+#: Src/wptCardDlg.cpp:177
 msgid "No Fingerprint"
 msgstr "Kein Fingerabdruck"
 
-#: Src/wptCardDlg.cpp:227
+#: Src/wptCardDlg.cpp:207
 msgid "No OpenPGP smart card detected."
 msgstr "Keine OpenPGP-Smartcard erkannt."
 
-#: Src/wptCardDlg.cpp:346
+#: Src/wptCardDlg.cpp:326
 msgid "No PINs found."
 msgstr "Keine PINs gefunden."
 
-#: Src/wptCardDlg.cpp:346 Src/wptCardDlg.cpp:360 Src/wptCardDlg.cpp:365
-#: Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:383 Src/wptCardDlg.cpp:397
-#: Src/wptCardDlg.cpp:526 Src/wptCardDlg.cpp:631 Src/wptCardDlg.cpp:636
-#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:649 Src/wptCardDlg.cpp:654
-#: Src/wptCardDlg.cpp:662 Src/wptCardDlg.cpp:684 Src/wptCardDlg.cpp:711
-#: Src/wptCardDlg.cpp:716 Src/wptCardDlg.cpp:719 Src/wptCardDlg.cpp:744
-#: Src/wptCardDlg.cpp:746 Src/wptCardDlg.cpp:751 Src/wptCardDlg.cpp:756
-#: Src/wptCardDlg.cpp:820 Src/wptCardDlg.cpp:835 Src/wptCardDlg.cpp:838
-#: Src/wptMainProc.cpp:299
+#: Src/wptCardDlg.cpp:326 Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:345
+#: Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:363 Src/wptCardDlg.cpp:377
+#: Src/wptCardDlg.cpp:506 Src/wptCardDlg.cpp:611 Src/wptCardDlg.cpp:616
+#: Src/wptCardDlg.cpp:622 Src/wptCardDlg.cpp:629 Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:664 Src/wptCardDlg.cpp:691
+#: 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:301
 msgid "Card Edit"
 msgstr "Karten-Editor"
 
-#: Src/wptCardDlg.cpp:359
+#: Src/wptCardDlg.cpp:339
 msgid "Only plain ASCII is currently allowed."
 msgstr "Aktuell ist nur 7bit-ASCII-Text erlaubt."
 
-#: Src/wptCardDlg.cpp:364
+#: Src/wptCardDlg.cpp:344
 msgid "Only alphabetic characters are allowed."
 msgstr "Nur alphanumerische Zeichen zulässig."
 
-#: Src/wptCardDlg.cpp:371
+#: Src/wptCardDlg.cpp:351
 msgid "Invalid URL."
 msgstr "Ungültige URL."
 
-#: Src/wptCardDlg.cpp:384
+#: Src/wptCardDlg.cpp:364
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "Konnte Daten der Carde nicht ändern: %s"
 
-#: Src/wptCardDlg.cpp:397
+#: Src/wptCardDlg.cpp:377
 msgid "Card attribute changed."
 msgstr "Karteneinstellung geändert."
 
-#: Src/wptCardDlg.cpp:437
+#: Src/wptCardDlg.cpp:417
 msgid "Please enter the 'Admin PIN'"
 msgstr "Bitte 'Admin PIN' eingeben"
 
-#: Src/wptCardDlg.cpp:439
+#: Src/wptCardDlg.cpp:419
 msgid "Please enter the 'User PIN'"
 msgstr "Bitte 'Benutzer PIN' eingeben"
 
-#: Src/wptCardDlg.cpp:441 Src/wptPINDlg.cpp:53
+#: Src/wptCardDlg.cpp:421 Src/wptPINDlg.cpp:53
 msgid "Please enter the PIN"
 msgstr "Bitte PIN eingeben"
 
-#: Src/wptCardDlg.cpp:445
+#: Src/wptCardDlg.cpp:425
 #, c-format
 msgid ""
 "%s\n"
@@ -308,7 +313,7 @@
 "Serien-Nr: %s\n"
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:522
-#: Src/wptCardDlg.cpp:525
+#: Src/wptCardDlg.cpp:505
 msgid ""
 "This operation will override the keys on the card.\n"
 "Still proceed?"
@@ -316,73 +321,73 @@
 "Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
 msgid "&Name"
 msgstr "&Name"
 
-#: Src/wptCardDlg.cpp:601 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
 msgid "&Comment (optional)"
 msgstr "&Kommentar (optional)"
 
-#: Src/wptCardDlg.cpp:602 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
 msgid "&Expire date"
 msgstr "&Ablaufdatum"
 
-#: Src/wptCardDlg.cpp:603
+#: Src/wptCardDlg.cpp:583
 msgid "Off-card passphrase"
 msgstr "\"Off-card\" Passwort"
 
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
 msgid "&Never"
 msgstr "&Niemals"
 
-#: Src/wptCardDlg.cpp:605 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
 msgid "Email &address"
 msgstr "E-Mail-&Adresse"
 
-#: Src/wptCardDlg.cpp:606
+#: Src/wptCardDlg.cpp:586
 msgid "Overwrite old keys on the card"
 msgstr "Alte Schlüssel auf der Karte übeerschreiben?"
 
-#: Src/wptCardDlg.cpp:607
+#: Src/wptCardDlg.cpp:587
 msgid "Make off-card backup of encryption key"
 msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
 
-#: Src/wptCardDlg.cpp:608 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1649
 msgid "Card Key Generation"
 msgstr "Karten-Schlüsselerzeugung"
 
-#: Src/wptCardDlg.cpp:631
+#: Src/wptCardDlg.cpp:611
 msgid "Please enter your name."
 msgstr "Bitte Namen eingeben."
 
-#: Src/wptCardDlg.cpp:635
+#: Src/wptCardDlg.cpp:615
 msgid "Name must be at least 5 characters long."
 msgstr "Der Name muss mindestens 5 Zeichen lang sein."
 
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:621
 msgid "Please enter your e-mail address."
 msgstr "Bitte E-Mail-Adresse eingeben."
 
-#: Src/wptCardDlg.cpp:648
+#: Src/wptCardDlg.cpp:628
 msgid "Please enter a valid e-mail address."
 msgstr "Bitte gültige E-Mail-Adresse eingeben."
 
-#: Src/wptCardDlg.cpp:654
+#: Src/wptCardDlg.cpp:634
 msgid "Please enter an off-card passphrase."
 msgstr "Bitte ein Passwort eingeben für \"off-card\"."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:649
-#: Src/wptCardDlg.cpp:661
+#: Src/wptCardDlg.cpp:641
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
 
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1366
 msgid "The date you have chosen lies in the past."
 msgstr "Das gewählte Datum liegt in der Vergangenheit."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:696
-#: Src/wptCardDlg.cpp:709
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -390,36 +395,36 @@
 "Operation wurde abgebrochen. Es scheinen noch Schlüssel\n"
 "auf der Karte zu existieren. Bitte 'Überschreiben' markieren."
 
-#: Src/wptCardDlg.cpp:718
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "Schlüssel erfolgreich erstellt."
 
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:724
 msgid "Please enter the old card PIN."
 msgstr "Bitte alte Karten-PIN eingeben."
 
-#: Src/wptCardDlg.cpp:746
+#: Src/wptCardDlg.cpp:726
 msgid "Please enter the new card PIN."
 msgstr "Bitte neue Karten-PIN eingeben."
 
-#: Src/wptCardDlg.cpp:751
+#: Src/wptCardDlg.cpp:731
 msgid "Admin PIN must be minimal 8 characters."
 msgstr "Die 'Admin PIN' muss mindestens 8 Zeichen lang sein."
 
-#: Src/wptCardDlg.cpp:756
+#: Src/wptCardDlg.cpp:736
 msgid "PIN must be minimal 6 characters."
 msgstr "Die 'Benutzer PIN' muss mindestens 6 Zeichen lang sein."
 
 # c:\oss\winpt-gpgme\src\wptCardDlg.cpp:766
-#: Src/wptCardDlg.cpp:779
+#: Src/wptCardDlg.cpp:759
 msgid "Change Card PIN"
 msgstr "Karten PIN Ändern"
 
-#: Src/wptCardDlg.cpp:819 Src/wptPassphraseDlg.cpp:184
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:184
 msgid "Passphrases do not match. Please try again."
 msgstr "Passwörter nicht identisch. Versuchen Sie es erneut."
 
-#: Src/wptCardDlg.cpp:837
+#: Src/wptCardDlg.cpp:817
 msgid "PIN successfully changed."
 msgstr "PIN erfolgreich geändert."
 
@@ -442,7 +447,8 @@
 
 #: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
 #: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
-#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:158
+#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
 msgid "user ID not found"
 msgstr "Benutzerkennung nicht gefunden"
 
@@ -491,9 +497,9 @@
 msgstr "*** WICHTIG ***"
 
 #: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
-#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:279
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
+#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
@@ -537,7 +543,7 @@
 #: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
 #: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
 #: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:436 Src/wptMainProc.cpp:517 Src/wptMainProc.cpp:521
+#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
@@ -593,7 +599,7 @@
 msgid "Add quotes"
 msgstr "'>' hinzufügen"
 
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
 #: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
@@ -616,16 +622,17 @@
 msgstr "&Suche"
 
 #: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
-#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:287
-#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
-#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
-#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
-#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:524
-#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
-#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
+#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
+#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
 #: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
 msgid "&Cancel"
 msgstr "&Abbrechen"
@@ -644,27 +651,27 @@
 msgid "Key Import Statistics"
 msgstr "Statistiken für Schlüsselimport"
 
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:236
+#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:223
 #: Src/wptClipSignEncDlg.cpp:176
 msgid "Could not get default key."
 msgstr "Konnte den Standardschlüssel nicht finden"
 
 #: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:112
-#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:167
-#: Src/wptClipSignDlg.cpp:177 Src/wptClipSignDlg.cpp:236
-#: Src/wptClipSignDlg.cpp:244 Src/wptClipSignDlg.cpp:263
-#: Src/wptClipSignDlg.cpp:274 Src/wptClipSignEncDlg.cpp:166
+#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:154
+#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
+#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
+#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
 #: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
 #: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
 #: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
 msgid "Signing"
 msgstr "Signieren"
 
-#: Src/wptClipSignDlg.cpp:177
+#: Src/wptClipSignDlg.cpp:164
 msgid "No useable signing key found"
 msgstr "Kein benutzbarer Schlüssel zum Signieren gefunden."
 
-#: Src/wptClipSignDlg.cpp:245
+#: Src/wptClipSignDlg.cpp:232
 #, c-format
 msgid ""
 "No key was chosen.\n"
@@ -703,7 +710,7 @@
 #: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
 #: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
 #: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
-#: Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:425
 msgid "Verify"
 msgstr "Überprüfen"
 
@@ -739,19 +746,19 @@
 msgid "Save Plaintext"
 msgstr "Klartext speichern"
 
-#: Src/wptCommonDlg.cpp:88
+#: Src/wptCommonDlg.cpp:86
 msgid "Please enter a valid URL."
 msgstr "Bitte eine gültige URL eingeben."
 
-#: Src/wptCommonDlg.cpp:118
+#: Src/wptCommonDlg.cpp:116
 msgid "HTTP Key Import"
 msgstr "HTTP Schlüssel Import"
 
-#: Src/wptCommonDlg.cpp:119
+#: Src/wptCommonDlg.cpp:117
 msgid "Enter URL to retrieve the public key"
 msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
 
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:771
 #: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
 #: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
 #: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
@@ -772,38 +779,41 @@
 #: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
 #: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
 #: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1770 Src/wptKeyEditDlgs.cpp:1890
-#: Src/wptKeyEditDlgs.cpp:1895 Src/wptKeyEditDlgs.cpp:1904
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1922
-#: Src/wptKeyEditDlgs.cpp:1973 Src/wptKeyEditDlgs.cpp:1983
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeyEditDlgs.cpp:2023
-#: Src/wptKeyEditDlgs.cpp:2028 Src/wptKeyManagerDlg.cpp:991
-#: Src/wptKeyManagerDlg.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:1790
 msgid "Key Edit"
 msgstr "Schlüssel bearbeiten"
 
 # c:\oss\winpt-gpgme\src\wptCommonDlg.cpp:117
-#: Src/wptCommonDlg.cpp:138
+#: Src/wptCommonDlg.cpp:136
 msgid "Enter preferred keyserver URL"
 msgstr "Bevorzugte Keyserver URL eingeben"
 
-#: Src/wptCommonDlg.cpp:224
-msgid "Yes"
-msgstr "Ja"
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+msgid "Choose Locale Directory"
+msgstr "Verzeichnis für Sprachdateien auswählen"
 
-#: Src/wptCommonDlg.cpp:225
-msgid "No"
-msgstr "Nein"
+#: Src/wptCommonDlg.cpp:220
+msgid "Could not create winpt.mo file"
+msgstr "Konnte winpt.mo Datei nicht erstellen"
 
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
-#: Src/wptKeyEditDlgs.cpp:1119
-msgid "OK"
-msgstr "OK"
+#: Src/wptCommonDlg.cpp:251
+msgid "Native Language Support"
+msgstr "Internationale Sprachunterstützung"
 
-#: Src/wptCommonDlg.cpp:229
-msgid "Cancel"
-msgstr "Abbrechen"
+#: Src/wptCommonDlg.cpp:252
+msgid "Please select a language"
+msgstr "Bitte eine Sprache auswählen"
 
+#: Src/wptCommonDlg.cpp:253
+msgid "&OK"
+msgstr "&OK"
+
 #: Src/wptErrors.cpp:47
 #, c-format
 msgid "Could not locate GPG.exe in %s."
@@ -991,7 +1001,7 @@
 #: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
 #: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
 #: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:403 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
 msgid "File Manager"
 msgstr "Dateimanager"
 
@@ -1023,13 +1033,13 @@
 "Möchten Sie die Kompression ausschalten?"
 
 #: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1042
-#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
+#: Src/wptVerifyList.cpp:108
 msgid "Status"
 msgstr "Status"
 
 #: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
-#: Src/wptVerifyList.cpp:97
+#: Src/wptVerifyList.cpp:107
 msgid "Name"
 msgstr "Name"
 
@@ -1070,17 +1080,17 @@
 
 #: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
 #: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
-#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:428
+#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
 msgid "Sign"
 msgstr "Signieren"
 
 #: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:553
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:425
+#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
 #: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:419
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
 msgid "Symmetric"
 msgstr "Symmetrisch"
 
@@ -1159,8 +1169,8 @@
 #: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
 #: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
 #: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
+#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
 msgid "Import"
 msgstr "Importieren"
 
@@ -1176,8 +1186,8 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren!"
 
-#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:312
-#: Src/wptKeyManager.cpp:348 Src/wptKeyManager.cpp:383
+#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:256
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
 msgid "No key was selected for export."
 msgstr "Kein Schlüssel zum Exportieren ausgewählt."
 
@@ -1186,8 +1196,8 @@
 msgid "Export"
 msgstr "Exportieren"
 
-#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1714
-#: Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptKeyManagerDlg.cpp:1747
 msgid "Choose Name for Key File"
 msgstr "Den Namen der Schlüsseldatei wählen"
 
@@ -1256,12 +1266,12 @@
 msgstr "Bitte wählen Sie wenigstens einen Empfänger."
 
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:465
+#: Src/wptKeyManager.cpp:417
 msgid "No valid OpenPGP data found."
 msgstr "Keine gültigen OpenPGP-Daten gefunden."
 
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:490
+#: Src/wptKeyManager.cpp:442
 msgid "Key Import"
 msgstr "Schlüsselimport"
 
@@ -1271,7 +1281,7 @@
 msgstr "%s enthält %d Schlüssel."
 
 #: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:928 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Datei"
 
@@ -1307,17 +1317,17 @@
 msgid "Signature mode"
 msgstr "Signaturmodus"
 
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
 msgid "Options"
 msgstr "Optionen"
 
 #: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1292
 #: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
-#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
+#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
+#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
+#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
 #: Src/wptKeyserverSearchDlg.cpp:155
 msgid "Please select a key."
 msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1331,16 +1341,16 @@
 msgid "%d Object(s) marked"
 msgstr "%d Objekt(e) markiert"
 
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:548
+#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Dateimanager (Drag & Drop möglich)"
 
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:929
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
 msgid "View"
 msgstr "Ansicht"
 
@@ -1360,13 +1370,13 @@
 msgid "&Decrypt"
 msgstr "&Entschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:946
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "&Sign"
 msgstr "&Signieren"
 
 #: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:556
-#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:426
+#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
 msgid "Sign && Encrypt"
 msgstr "Signieren && Verschlüsseln"
 
@@ -1386,7 +1396,7 @@
 msgid "E&xport"
 msgstr "E&xportieren"
 
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:418
+#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
 msgid "Exit"
 msgstr "Beenden"
 
@@ -1561,8 +1571,8 @@
 #: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
 #: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
 #: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:438 Src/wptPreferencesDlg.cpp:215
+#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
 #: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
 #: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
 #: Src/wptRegistry.cpp:591
@@ -1700,7 +1710,7 @@
 "Aktuelle Daten gehen verloren\n"
 "Sind Sie sicher?"
 
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1676
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1675
 #: Src/wptMainProc.cpp:598
 msgid "GnuPG Preferences"
 msgstr "GnuPG-Einstellungen"
@@ -1775,46 +1785,42 @@
 msgid "Choose GPG home directory"
 msgstr "Heimatverzeichnis von GPG auswählen"
 
-#: Src/wptGPGPrefsDlg.cpp:326
-msgid "Choose locale directory"
-msgstr "Verzeichnis der Sprachdateien auswählen"
-
 #: Src/wptGPGPrefsDlg.cpp:332
 msgid "Choose GPG binary"
 msgstr "Wählen Sie GPG.EXE Datei aus"
 
 #: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
-#: Src/wptKeyManager.cpp:234 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:320 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:354 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:384
-#: Src/wptKeyManager.cpp:393 Src/wptKeyManager.cpp:397
-#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:458
-#: Src/wptKeyManager.cpp:463 Src/wptKeyManager.cpp:466
-#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
-#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
-#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
-#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
-#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
-#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
-#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
-#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
-#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1568
-#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
-#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
-#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
-#: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeysigDlg.cpp:93
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:158 Src/wptKeyManager.cpp:163
+#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
+#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
+#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
+#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
+#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
+#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
+#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
+#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
+#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
+#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
+#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
+#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
+#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
+#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
+#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
+#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1532 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
+#: Src/wptKeyManagerDlg.cpp:1587 Src/wptKeyManagerDlg.cpp:1616
+#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
+#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
 #: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284 Src/wptKeysigDlg.cpp:358
-#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:404
-#: Src/wptMainProc.cpp:559 Src/wptMainProc.cpp:569
+#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
 msgid "Key Manager"
 msgstr "Schlüsselverwaltung"
 
@@ -1917,34 +1923,34 @@
 msgstr "Ungültige Benutzerkennung"
 
 #: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
-#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
 #: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
-#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
+#: Src/wptVerifyList.cpp:112
 msgid "User ID"
 msgstr "Benutzerkennung"
 
 #: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
 msgid "Size"
 msgstr "Größe"
 
 #: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1039
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:111
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
 #: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1040
 #: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
-#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
 #: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
 msgid "Creation"
 msgstr "Erstellung"
 
 #: Src/wptImportList.cpp:355 Src/wptKeylist.cpp:554
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
 msgid "Type"
 msgstr "Typ"
 
@@ -1983,6 +1989,10 @@
 msgid "Never"
 msgstr "Niemals"
 
+#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+msgid "OK"
+msgstr "OK"
+
 #: Src/wptKeyEditDlgs.cpp:264
 msgid "user ID"
 msgstr "Benutzerkennung"
@@ -2063,7 +2073,7 @@
 #: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
 #: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
 #: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
 #: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
 #: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
 #: Src/wptOwnertrustDlg.cpp:136
@@ -2090,7 +2100,7 @@
 #: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1486
 #: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
 #: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1890
+#: Src/wptKeyEditDlgs.cpp:1910
 msgid "Please select a user ID."
 msgstr "Bitte eine Benutzerkennung wählen."
 
@@ -2180,7 +2190,7 @@
 #: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
 #: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
 #: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1521
 msgid "There is no secret key available!"
 msgstr "Kein geheimer Schlüssel vorhanden!"
 
@@ -2197,7 +2207,7 @@
 msgid "Change Ownertrust"
 msgstr "Besitzervertrauen ändern"
 
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:212
 msgid "Key status changed."
 msgstr "Schlüsselstatus geändert."
 
@@ -2233,7 +2243,7 @@
 msgid "Passphrase successfully changed."
 msgstr "Passwort erfolgreich geändert."
 
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2250,7 +2260,7 @@
 msgstr "Kein(e) Unterschlüssel gefunden."
 
 #: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
-#: Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:862
 msgid "Validity"
 msgstr "Gültigkeit"
 
@@ -2448,46 +2458,50 @@
 msgid ""
 "user ID \"%s\".\n"
 "\n"
+"All signatures on this user ID will be also deleted.\n"
+"\n"
 "Do you really want to delete this user ID?"
 msgstr ""
-"Benutzerkennung %s.\r\n"
+"Benutzerkennung %s.\n"
 "\n"
+"Alle Signaturen der Benutzerkennung werden ebenfalls gelöscht.\n"
+"\n"
 "Diese Benutzerkennung wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1785
+#: Src/wptKeyEditDlgs.cpp:1787
 msgid "Delete user ID"
 msgstr "Benutzerkennung löschen"
 
-#: Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1791
 msgid "User ID successfully deleted"
 msgstr "Benutzerkennung erfolgreich gelöscht"
 
-#: Src/wptKeyEditDlgs.cpp:1894
+#: Src/wptKeyEditDlgs.cpp:1914
 msgid "Do you really want to make this sig exportable?"
 msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
 
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
 msgid "Key successfully signed."
 msgstr "Schlüssel erfolgreich signiert."
 
-#: Src/wptKeyEditDlgs.cpp:1973
+#: Src/wptKeyEditDlgs.cpp:1996
 msgid "Could not set subkey window procedure."
 msgstr "Konnte \"subkey window procedure\" nicht setzen."
 
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:2009
 msgid "Could not set user ID window procedure."
 msgstr "Konnte \"userID window procedure\" nicht setzen."
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:1739
-#: Src/wptKeyEditDlgs.cpp:1991
+#: Src/wptKeyEditDlgs.cpp:2018
 msgid "Command>"
 msgstr "Kommando>"
 
-#: Src/wptKeyEditDlgs.cpp:2023
+#: Src/wptKeyEditDlgs.cpp:2050
 msgid "Please select a command."
 msgstr "Bitte einen Befehl auswählen."
 
-#: Src/wptKeyEditDlgs.cpp:2027
+#: Src/wptKeyEditDlgs.cpp:2054
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "Dieser Befehl kann mit PGP2 (v3) Schlüsseln nicht verwendet werden.\n"
 
@@ -2526,8 +2540,8 @@
 msgstr "Bitte wählen Sie einen Eintrag."
 
 #: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
+#: Src/wptKeyManagerDlg.cpp:1771 Src/wptKeyPropsDlg.cpp:289
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
 #: Src/wptOwnertrustDlg.cpp:133
 msgid "Ownertrust"
@@ -2550,7 +2564,7 @@
 #: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
 #: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
 #: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
-#: Src/wptKeyManagerDlg.cpp:1637 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeyManagerDlg.cpp:1636 Src/wptPassphraseDlg.cpp:109
 msgid "Key Generation"
 msgstr "Schlüsselerzeugung"
 
@@ -2704,7 +2718,7 @@
 
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
 #: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
-#: Src/wptKeyManagerDlg.cpp:1660
+#: Src/wptKeyManagerDlg.cpp:1659
 msgid "Key Generation Wizard"
 msgstr "Schlüsselerzeugungs-Assistent"
 
@@ -2797,18 +2811,17 @@
 msgid "key pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:877
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeyManagerDlg.cpp:950
 msgid "Cipher"
 msgstr "Cipher"
 
-#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:879
-#: Src/wptVerifyList.cpp:100 Src/wptVerifyList.cpp:108
+#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptVerifyList.cpp:110
 msgid "Trust"
 msgstr "Vertrauen"
 
 #: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
-#: Src/wptVerifyList.cpp:191
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzerkennung"
 
@@ -2844,7 +2857,7 @@
 msgid "Secret Key List"
 msgstr "Liste der geheimen Schlüssel"
 
-#: Src/wptKeyManager.cpp:177
+#: Src/wptKeyManager.cpp:157
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -2852,7 +2865,7 @@
 "Dieser Schlüssel ist abgelaufen!\n"
 "Schlüsselüberprüfung fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:182
+#: Src/wptKeyManager.cpp:162
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -2860,25 +2873,25 @@
 "Dieser Schlüssel wurde vom Besitzer widerrufen!\n"
 "Schlüsselüberprüfung fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:305
 msgid "Only one secret key can be exported."
 msgstr "Nur ein geheimer Schlüssel kann exportiert werden."
 
-#: Src/wptKeyManager.cpp:364
+#: Src/wptKeyManager.cpp:316
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "Geheimer Schlüssel gespeichert in '%s'."
 
-#: Src/wptKeyManager.cpp:398
+#: Src/wptKeyManager.cpp:350
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "Schlüssel erfolgreich in '%s' gespeichert."
 
-#: Src/wptKeyManager.cpp:470
+#: Src/wptKeyManager.cpp:422
 msgid "No valid OpenPGP keys found."
 msgstr "Keine gültigen OpenPGP-Schlüssel gefunden."
 
-#: Src/wptKeyManager.cpp:475
+#: Src/wptKeyManager.cpp:427
 msgid ""
 "The key you want to import is dash escacped.\n"
 "Do you want to extract the key?"
@@ -2886,11 +2899,11 @@
 "Der Schlüssel ist \"dash escaped\".\n"
 "Möchten Sie den Schlüssel extrahieren?"
 
-#: Src/wptKeyManager.cpp:481
+#: Src/wptKeyManager.cpp:433
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "Kann keine beschädigten OpenPGP-Schlüssel importieren."
 
-#: Src/wptKeyManager.cpp:510 Src/wptKeyManager.cpp:638
+#: Src/wptKeyManager.cpp:462 Src/wptKeyManager.cpp:590
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -2898,43 +2911,43 @@
 "Schlüssel ohne Eigensignatur erkannt!\n"
 "(Dieser Schlüssel ist für Verschlüsselung, etc. NICHT verwendbar)\n"
 
-#: Src/wptKeyManager.cpp:539 Src/wptKeyManager.cpp:546
-#: Src/wptKeyManager.cpp:555
+#: Src/wptKeyManager.cpp:491 Src/wptKeyManager.cpp:498
+#: Src/wptKeyManager.cpp:507
 msgid "Key Import HTTP"
 msgstr "Schlüssel Import HTTP"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:448
-#: Src/wptKeyManager.cpp:539
+#: Src/wptKeyManager.cpp:491
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "Ungültige HTTP URL: %s"
 
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:508
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "Konnte Schlüssel von der URL: %s nicht runterladen"
 
-#: Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "Namen der Schlüsseldatei auswählen"
 
-#: Src/wptKeyManager.cpp:598
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "Dateiimport"
 
-#: Src/wptKeyManager.cpp:609
+#: Src/wptKeyManager.cpp:561
 msgid "Could not read key-data from file."
 msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
 
-#: Src/wptKeyManager.cpp:729
+#: Src/wptKeyManager.cpp:681
 msgid "Do you really want to confirm each key?"
 msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
 
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:682
 msgid "Delete Confirmation"
 msgstr "Löschen Bestätigen"
 
-#: Src/wptKeyManager.cpp:754
+#: Src/wptKeyManager.cpp:706
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -2946,7 +2959,7 @@
 "%s"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:763
+#: Src/wptKeyManager.cpp:715
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -2963,7 +2976,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:770
+#: Src/wptKeyManager.cpp:722
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -2973,249 +2986,249 @@
 "Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
 "Schlüssel werden gelöscht.\n"
 
-#: Src/wptKeyManager.cpp:834
+#: Src/wptKeyManager.cpp:786
 #, c-format
 msgid "Do you really want to send '%s' to keyserver %s?"
 msgstr "Wollen Sie '%s' wirklich zum Schlüsselserver %s senden?"
 
-#: Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:808
 msgid "Please only select one key."
 msgstr "Bitte nur einen Schlüssel auswählen."
 
-#: Src/wptKeyManager.cpp:935
+#: Src/wptKeyManager.cpp:888
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
 
-#: Src/wptKeyManager.cpp:940
+#: Src/wptKeyManager.cpp:893
 msgid "Could not connect to keyserver, abort procedure."
 msgstr ""
 "Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
 
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "Suchen"
 
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "Suche nach:"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:1026
+#: Src/wptKeyManager.cpp:979
 #, c-format
 msgid "String pattern \"%s\" not found."
 msgstr "Zeichenkette \"%s\" nicht gefunden."
 
-#: Src/wptKeyManagerDlg.cpp:445 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
 msgid "Paste Key from Clipboard"
 msgstr "Schlüssel aus Ablage einfügen"
 
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:456
 #, c-format
 msgid "Default Key: %s"
 msgstr "Standardschlüssel: %s"
 
-#: Src/wptKeyManagerDlg.cpp:474
+#: Src/wptKeyManagerDlg.cpp:458
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "Standardschlüssel: 0x%s"
 
-#: Src/wptKeyManagerDlg.cpp:495
+#: Src/wptKeyManagerDlg.cpp:479
 #, c-format
 msgid "%d secret keys"
 msgstr "%d geheime Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:496
+#: Src/wptKeyManagerDlg.cpp:480
 #, c-format
 msgid "%d keys"
 msgstr "%d Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:931
+#: Src/wptKeyManagerDlg.cpp:915
 msgid "Key"
 msgstr "Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:932 Src/wptKeyManagerDlg.cpp:1207
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
 msgid "Groups"
 msgstr "Gruppen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:919
 msgid "Send Mail..."
 msgstr "E-Mail versenden..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:921
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopieren\tCtrl+C"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:922
 msgid "&Paste\tCtrl+V"
 msgstr "&Einfügen\tCtrl+V"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:923
 msgid "Search...\tCtrl+F"
 msgstr "Suchen...\tCtrl+F"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:924
 msgid "Select All\tCtrl+A"
 msgstr "Alles markieren\tCtrl+A"
 
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:925
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:927
 msgid "&Expert"
 msgstr "&Experte"
 
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:928
 msgid "&Normal"
 msgstr "&Normal"
 
-#: Src/wptKeyManagerDlg.cpp:947 Src/wptKeyManagerDlg.cpp:948
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptKeyManagerDlg.cpp:976
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
 msgid "&Revoke Cert"
 msgstr "Widerruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
 msgid "&List Signatures"
 msgstr "Signaturen anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:1563
+#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1562
 #: Src/wptKeyTrustPathDlg.cpp:130
 msgid "List Trust Path"
 msgstr "Zeige Vertrauenspfad"
 
-#: Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:936
 msgid "&Export..."
 msgstr "&Exportieren..."
 
-#: Src/wptKeyManagerDlg.cpp:953
+#: Src/wptKeyManagerDlg.cpp:937
 msgid "&Import..."
 msgstr "&Importieren..."
 
-#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
 #: Src/wptKeysigDlg.cpp:397
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:942
 msgid "E&xport Secret Key"
 msgstr "E&xportiere geheimen Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:943
 msgid "Re&load Key Cache"
 msgstr "Erneuere Sch&lüsselcache"
 
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:944
 msgid "R&everify Signatures"
 msgstr "Signaturen erneut prüfen"
 
-#: Src/wptKeyManagerDlg.cpp:961
+#: Src/wptKeyManagerDlg.cpp:945
 msgid "Refresh &Keys (Keyserver)"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "Über"
 
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Copy User ID to Clipboard"
 msgstr "Kopiere Benutzerkennung in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:966
 msgid "Copy Key ID to Clipboard"
 msgstr "Kopiere Schlüssel ID in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:967
 msgid "Copy Fingerprint to Clipboard"
 msgstr "Kopiere Fingerprint in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:968
 msgid "Copy Key Info to Clipboard"
 msgstr "Kopiere Schlüssel Info in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Copy Key to Clipboard"
 msgstr "Kopiere Schlüssel in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "Refresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "Set Implicit &Trust"
 msgstr "Setze impliziertes Vertrauen"
 
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:979
 msgid "&Enable"
 msgstr "&Aktivieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:980
 msgid "&Disable"
 msgstr "&Deaktivieren"
 
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:981
 msgid "Re&fresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:982
 msgid "Set preferred Keyserver URL"
 msgstr "Setze bevorzugte Keyserver URL"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:983
 msgid "Send Key to Mail Recipient"
 msgstr "Sende Schlüssel an Mailempfänger"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:984
 msgid "Set as Default Key"
 msgstr "Setze als Default Key"
 
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:986
 msgid "Key..."
 msgstr "Schlüssel..."
 
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeyManagerDlg.cpp:987
 msgid "User ID..."
 msgstr "Benutzerkennung..."
 
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:988
 msgid "Photo ID..."
 msgstr "Photo ID..."
 
-#: Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:989
 msgid "Revoker..."
 msgstr "Widerrufer..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:992
 msgid "Key Attributes"
 msgstr "Schlüsselattribute"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: Src/wptKeyManagerDlg.cpp:1010
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "Send to Keyserver"
 msgstr "Sende an Keyserver"
 
-#: Src/wptKeyManagerDlg.cpp:1181
+#: Src/wptKeyManagerDlg.cpp:1173
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
@@ -3223,90 +3236,90 @@
 "Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
 "Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
 
-#: Src/wptKeyManagerDlg.cpp:1192
+#: Src/wptKeyManagerDlg.cpp:1184
 msgid "Could not set keylist window procedure."
 msgstr "Konnte \"keylist window procedure\" nicht setzen."
 
 # c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1310
+#: Src/wptKeyManagerDlg.cpp:1301
 msgid "Generate new key pair"
 msgstr "Neues Schlüsselpaar erzeugen"
 
-#: Src/wptKeyManagerDlg.cpp:1314
+#: Src/wptKeyManagerDlg.cpp:1305
 msgid "Search for a specific key"
 msgstr "Suche nach einem bestimmten Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1309
 msgid "Delete key from keyring"
 msgstr "Schlüssel aus Keyring löschen"
 
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1313
 msgid "Show key properties"
 msgstr "Schlüsseleigenschaften anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1317
 msgid "Sign key"
 msgstr "Signiere Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1321
 msgid "Copy key to clipboard"
 msgstr "Kopiere Schlüssel in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:1334
+#: Src/wptKeyManagerDlg.cpp:1325
 msgid "Paste key from clipboard"
 msgstr "Schlüssel aus Ablage einfügen"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1329
 msgid "Import key to keyring"
 msgstr "In Schlüsselbund importieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1333
 msgid "Export key to a file"
 msgstr "Schlüssel in Datei exportieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1460
 msgid "New"
 msgstr "Neu"
 
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1472
 msgid "Could not access public keyring"
 msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
 
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeyManagerDlg.cpp:1507 Src/wptKeysignDlg.cpp:259
 #: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
 #: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
 #: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
 msgid "Key Signing"
 msgstr "Schlüsselsignierung"
 
-#: Src/wptKeyManagerDlg.cpp:1532
+#: Src/wptKeyManagerDlg.cpp:1531
 msgid "Key already revoked!"
 msgstr "Schlüssel ist bereits widerrufen!"
 
-#: Src/wptKeyManagerDlg.cpp:1544 Src/wptKeyRevokeDlg.cpp:72
+#: Src/wptKeyManagerDlg.cpp:1543 Src/wptKeyRevokeDlg.cpp:72
 #: Src/wptKeyRevokeDlg.cpp:100 Src/wptKeyRevokeDlg.cpp:138
 #: Src/wptKeyRevokeDlg.cpp:143 Src/wptKeyRevokeDlg.cpp:151
 #: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:173
 msgid "Key Revocation Cert"
 msgstr "Schlüsselwiderruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1553
 msgid "It does not make any sense with a key pair!"
 msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
 
-#: Src/wptKeyManagerDlg.cpp:1581
+#: Src/wptKeyManagerDlg.cpp:1580
 msgid "Key Signature List"
 msgstr "Schlüssel-Signatur-Liste"
 
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1602 Src/wptKeyPropsDlg.cpp:285
 msgid "Key Properties"
 msgstr "Schlüsseleigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:1614
+#: Src/wptKeyManagerDlg.cpp:1613
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
@@ -3315,27 +3328,27 @@
 "Signierung etc.)\n"
 "Möchten Sie den Zwischenspeicher reinitialisieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1645
+#: Src/wptKeyManagerDlg.cpp:1644
 msgid "Smart Card support is not available."
 msgstr "SmartCard-Unterstützung ist nicht verfügbar."
 
-#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
 msgid "Keyserver Access"
 msgstr "Schlüsselserver-Zugriff"
 
-#: Src/wptKeyManagerDlg.cpp:1685
+#: Src/wptKeyManagerDlg.cpp:1684
 msgid "GnuPG Options"
 msgstr "GnuPG Optionen"
 
-#: Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1726
 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:1732
+#: Src/wptKeyManagerDlg.cpp:1731
 msgid "You can only export one secret key."
 msgstr "Sie können nur einen geheimen Schlüssel exportieren."
 
-#: Src/wptKeyManagerDlg.cpp:1737
+#: Src/wptKeyManagerDlg.cpp:1736
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -3353,11 +3366,11 @@
 "\n"
 "Wirklich den Schlüssel exportieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1742
+#: Src/wptKeyManagerDlg.cpp:1741
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1820
 msgid "No key was selected, select all by default."
 msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
 
@@ -3365,7 +3378,7 @@
 msgid "I trust ultimately (implicit)"
 msgstr "(Implizites) Absolutes Vertrauen"
 
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:169
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
 #: Src/wptVerifyList.cpp:245
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -3444,7 +3457,7 @@
 msgid "Ownertrust successfully changed."
 msgstr "Besitzervertrauen erfolgreich geändert."
 
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
 msgid "Key Revokers"
 msgstr "Schlüsselwiderrufer"
 
@@ -3508,41 +3521,41 @@
 msgid "Algorithm"
 msgstr "Algorithmus"
 
-#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:159
+#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
 msgid "Designated Key Revokers"
 msgstr "Designierte Schlüsselwiderrufer"
 
-#: Src/wptKeyRevokersDlg.cpp:145
+#: Src/wptKeyRevokersDlg.cpp:147
 msgid "Designated Revoker Keys"
 msgstr "Liste der Schlüsselwiderrufer"
 
-#: Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyRevokersDlg.cpp:162
 #, c-format
 msgid "Do you want to retrieve 0x%s via the default keyserver?"
 msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
 
-#: Src/wptKeyserver.cpp:353
+#: Src/wptKeyserver.cpp:344
 msgid "The network subsystem has failed"
 msgstr "Das Netzwerk gab einen Fehler zurück"
 
-#: Src/wptKeyserver.cpp:355
+#: Src/wptKeyserver.cpp:346
 msgid "Authoritative Answer Host not found"
 msgstr "Authorisierter Rechner wurde nicht gefunden"
 
-#: Src/wptKeyserver.cpp:357
+#: Src/wptKeyserver.cpp:348
 msgid "The connection has been dropped because of a network failure"
 msgstr "Die Verbindung wurde aufgrund einen Netzwerkfehlers beendet"
 
-#: Src/wptKeyserver.cpp:359
+#: Src/wptKeyserver.cpp:350
 #, c-format
 msgid "Unknown Winsock error ec=%d"
 msgstr "Unbekannter Winsock-Fehler ec=%d"
 
-#: Src/wptKeyserver.cpp:547
+#: Src/wptKeyserver.cpp:538
 msgid "Could not save keyserver.conf file"
 msgstr "Konnte keyserver.conf Datei nicht speichern"
 
-#: Src/wptKeyserver.cpp:593
+#: Src/wptKeyserver.cpp:583
 msgid ""
 "Invalid proxy configuration.You need to set a user and a passwordto use "
 "proxy authentication!"
@@ -3550,11 +3563,11 @@
 "Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
 "Passwort setzen, um Proxy-Authentifizierung nutzen zu können!"
 
-#: Src/wptKeyserver.cpp:596
+#: Src/wptKeyserver.cpp:586
 msgid "Proxy Error"
 msgstr "Proxyfehler"
 
-#: Src/wptKeyserver.cpp:622
+#: Src/wptKeyserver.cpp:612
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3562,16 +3575,16 @@
 "Alle Eintraäge in dieser Datei müssen über einen gültigen Präfix verfügen.\n"
 "Aktuell werden HKP/HTTP, LDAP and FINGER unterstützt.\n"
 
-#: Src/wptKeyserver.cpp:624
+#: Src/wptKeyserver.cpp:614
 msgid "Keyserver Error"
 msgstr "Schlüsselserver-Fehler"
 
 # c:\oss\winpt-gpgme\src\wptKeyserver.cpp:548
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:638
 msgid "The keyserver limit is exceeded"
 msgstr "Das Limit der Keyserver wurde erreicht"
 
-#: Src/wptKeyserver.cpp:649
+#: Src/wptKeyserver.cpp:639
 msgid "Keyserver Warning"
 msgstr "Keyserver Warnung"
 
@@ -3824,7 +3837,7 @@
 msgid "Really receive all missing keys?"
 msgstr "Alle fehlenden Schlüssel empfangen?"
 
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:118
+#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
 msgid "Signature &Properties"
 msgstr "Signatur-&Eigenschaften"
 
@@ -3984,42 +3997,42 @@
 msgid "Unknown OpenPGP type."
 msgstr "Unbekannter OpenPGP-Typ."
 
-#: Src/wptMainProc.cpp:348
+#: Src/wptMainProc.cpp:360
 msgid "Could not set current window mode hooks."
 msgstr "Konnte \"Current Window\" Hooks nicht setzen."
 
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:417
 msgid "Edit Clipboard"
 msgstr "Zwischenablage bearbeiten"
 
-#: Src/wptMainProc.cpp:417
+#: Src/wptMainProc.cpp:418
 msgid "About..."
 msgstr "Über..."
 
-#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:428
 msgid "Decrypt/Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
 # c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:437
+#: Src/wptMainProc.cpp:438
 msgid "Current Window"
 msgstr "Aktuelles Fenster"
 
-#: Src/wptMainProc.cpp:493
+#: Src/wptMainProc.cpp:494
 msgid "Remove all passphrases from cache?"
 msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
 
-#: Src/wptMainProc.cpp:494 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:495 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
 msgid "WinPT"
 msgstr "WinPT"
 
-#: Src/wptMainProc.cpp:504
+#: Src/wptMainProc.cpp:505
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 "Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden. WinPT "
 "beenden?"
 
-#: Src/wptMainProc.cpp:536
+#: Src/wptMainProc.cpp:538
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -4034,19 +4047,14 @@
 
 # c:\oss\winpt-gpgme\src\wptMAPI.cpp:87
 # c:\oss\winpt-gpgme\src\wptMAPI.cpp:120
-#: Src/wptMAPI.cpp:96 Src/wptMAPI.cpp:259
+#: Src/wptMAPI.cpp:96
 msgid "MAPI Login failed."
 msgstr "MAPI Login fehlgeschlagen."
 
-#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226 Src/wptMAPI.cpp:266
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
 msgid "Could not sent mail."
 msgstr "Konnte E-Mail nicht versenden."
 
-#: Src/wptMAPI.cpp:252
-#, c-format
-msgid "GPG Public Key of %s"
-msgstr "GPG öff. Schlüssel von %s"
-
 #: Src/wptMDSumDlg.cpp:72
 msgid "Digest"
 msgstr "Prüfsumme"
@@ -4410,12 +4418,12 @@
 msgid "Expiration"
 msgstr "Ablauf"
 
-#: Src/wptSigTreeDlg.cpp:172
+#: Src/wptSigTreeDlg.cpp:164
 #, c-format
-msgid "Signature Tree for \"%s\""
-msgstr "Signaturliste für \"%s\""
+msgid "Signature Tree for \"%s\" (0x%s)"
+msgstr "Signaturliste für \"%s\" (0x%s)"
 
-#: Src/wptSigTreeDlg.cpp:174
+#: Src/wptSigTreeDlg.cpp:167
 msgid "Edit..."
 msgstr "Edit..."
 
@@ -4435,10 +4443,22 @@
 msgid "Text Input from File"
 msgstr "Texteingabe aus Datei"
 
-#: Src/wptVerifyList.cpp:99 Src/wptVerifyList.cpp:107
+#: Src/wptVerifyList.cpp:109
 msgid "Signed"
 msgstr "Signiert"
 
+#~ msgid "GPG Public Key of %s"
+#~ msgstr "GPG öff. Schlüssel von %s"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
 #~ msgid "Proxy: none"
 #~ msgstr "Proxy: keiner"
 

Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/Po/fr.po	2006-04-01 12:36:58 UTC (rev 194)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 0.11.8\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-26 19:46+0200\n"
+"POT-Creation-Date: 2006-03-31 18:47+0200\n"
 "PO-Revision-Date: 2006-03-04 21:32+0100\n"
 "Last-Translator: Pascal Brochart <pbrochart at tuxfamily.org>\n"
 "Language-Team: FR <winpt-dev at wald.intevation.org>\n"
@@ -15,41 +15,41 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Src/WinPT.cpp:194
+#: Src/WinPT.cpp:183
 msgid "Could not create GPG home directory"
 msgstr "Ne peut créer le répertoire personnel GPG"
 
-#: Src/WinPT.cpp:195 Src/WinPT.cpp:227 Src/WinPT.cpp:277 Src/WinPT.cpp:281
-#: Src/WinPT.cpp:486 Src/WinPT.cpp:493 Src/WinPT.cpp:533 Src/WinPT.cpp:561
-#: Src/WinPT.cpp:570 Src/WinPT.cpp:574 Src/WinPT.cpp:591 Src/WinPT.cpp:659
-#: Src/WinPT.cpp:672 Src/WinPT.cpp:719 Src/WinPT.cpp:745 Src/WinPT.cpp:763
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
-#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:349
-#: Src/wptMainProc.cpp:535
+#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
+#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
+#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
 msgid "WinPT Error"
 msgstr "Erreur WinPT"
 
-#: Src/WinPT.cpp:226
+#: Src/WinPT.cpp:215
 msgid "No useable secret key found."
 msgstr "Aucune clé secrète utilisable n'a été trouvée"
 
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:265
 msgid "Could not read GnuPG version."
 msgstr "Ne peut lire la version de GNuPG"
 
-#: Src/WinPT.cpp:282
+#: Src/WinPT.cpp:271
 #, c-format
 msgid ""
 "Sorry, you need a newer GPG version.\n"
 "GPG version %d.%d.%d required GPG version "
 msgstr ""
 
-#: Src/WinPT.cpp:310
+#: Src/WinPT.cpp:299
 msgid "Failed to create WinPT directory"
 msgstr "Impossible de créer le répertoire de WinPT"
 
-#: Src/WinPT.cpp:311 Src/WinPT.cpp:329 Src/WinPT.cpp:340
-#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
+#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
 #: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
 #: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
 #: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
@@ -62,19 +62,19 @@
 msgid "Keyserver"
 msgstr "Serveur de clé"
 
-#: Src/WinPT.cpp:328
+#: Src/WinPT.cpp:316
 msgid "Failed to copy the keyserver.conf"
 msgstr "Impossible de copier keyserver.conf"
 
-#: Src/WinPT.cpp:485
+#: Src/WinPT.cpp:463
 msgid "Cryptographic selftest failed."
 msgstr ""
 
-#: Src/WinPT.cpp:492
+#: Src/WinPT.cpp:470
 msgid "A newer GPGME version is needed; at least "
 msgstr ""
 
-#: Src/WinPT.cpp:534
+#: Src/WinPT.cpp:512
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -82,21 +82,21 @@
 "%s."
 msgstr ""
 
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:516
 msgid "Select GPG Public Keyring"
 msgstr ""
 
-#: Src/WinPT.cpp:560
+#: Src/WinPT.cpp:538
 msgid "GPG home directory could not be determited."
 msgstr "Le répertoire personnel de GPG ne peut-être déterminé."
 
-#: Src/WinPT.cpp:568
+#: Src/WinPT.cpp:546
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
 msgstr ""
 
-#: Src/WinPT.cpp:583
+#: Src/WinPT.cpp:561
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -104,32 +104,32 @@
 "Continue if you want that WinPT offers you more choices.\n"
 msgstr ""
 
-#: Src/WinPT.cpp:616 Src/wptFileManagerDlg.cpp:494
+#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
 #: Src/wptFileManagerDlg.cpp:809
 msgid "Wipe Free Space"
 msgstr ""
 
-#: Src/WinPT.cpp:658
+#: Src/WinPT.cpp:636
 msgid "Could not register window class"
 msgstr ""
 
-#: Src/WinPT.cpp:672
+#: Src/WinPT.cpp:650
 msgid "Could not create window"
 msgstr "Ne peut créer une fenêtre"
 
-#: Src/WinPT.cpp:743
+#: Src/WinPT.cpp:725
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
 msgstr ""
 
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:728
 msgid ""
 "It seems that GPG is not set properly.\n"
 "Do you want to start the GPG preferences dialog?"
 msgstr ""
 
-#: Src/WinPT.cpp:764
+#: Src/WinPT.cpp:746
 #, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found.\n"
@@ -138,7 +138,7 @@
 "%s: public key not found."
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:140
 msgid "About the GNU Privacy Guard"
 msgstr "A Propos de GNU Privacy Guard"
 
@@ -146,28 +146,32 @@
 msgid "About GnuPG"
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
+#: Src/wptAboutDlgs.cpp:61
+msgid "The AUTHORS files contains a list of all contributors and co-authors."
+msgstr ""
+
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1755
 #: Src/wptMainProc.cpp:586
 msgid "About WinPT"
 msgstr "A propos de WinPT"
 
-#: Src/wptAboutDlgs.cpp:95
+#: Src/wptAboutDlgs.cpp:97
 msgid "Warranty"
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:97
+#: Src/wptAboutDlgs.cpp:99
 msgid "A free open source privacy tray for Windows based on GnuPG."
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:99
+#: Src/wptAboutDlgs.cpp:101
 msgid "For more information you can visit the homepage: http://www.winpt.org"
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:101
+#: Src/wptAboutDlgs.cpp:103
 msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:103
+#: Src/wptAboutDlgs.cpp:105
 msgid ""
 "WinPT is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -175,84 +179,84 @@
 "version."
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:108
+#: Src/wptAboutDlgs.cpp:110
 msgid ""
 "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
 "A PARTICULAR PURPOSE. See the General Public License for more details. "
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:112
+#: Src/wptAboutDlgs.cpp:114
 msgid "&About GPG..."
 msgstr ""
 
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyManagerDlg.cpp:963
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyManagerDlg.cpp:947
 msgid "&Help"
 msgstr "&Aide"
 
-#: Src/wptCardDlg.cpp:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:405
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:414
 msgid "Card Manager"
 msgstr "Gestionnaire de carte"
 
-#: Src/wptCardDlg.cpp:197
+#: Src/wptCardDlg.cpp:177
 msgid "No Fingerprint"
 msgstr "Pas d'empreinte"
 
-#: Src/wptCardDlg.cpp:227
+#: Src/wptCardDlg.cpp:207
 msgid "No OpenPGP smart card detected."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:346
+#: Src/wptCardDlg.cpp:326
 msgid "No PINs found."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:346 Src/wptCardDlg.cpp:360 Src/wptCardDlg.cpp:365
-#: Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:383 Src/wptCardDlg.cpp:397
-#: Src/wptCardDlg.cpp:526 Src/wptCardDlg.cpp:631 Src/wptCardDlg.cpp:636
-#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:649 Src/wptCardDlg.cpp:654
-#: Src/wptCardDlg.cpp:662 Src/wptCardDlg.cpp:684 Src/wptCardDlg.cpp:711
-#: Src/wptCardDlg.cpp:716 Src/wptCardDlg.cpp:719 Src/wptCardDlg.cpp:744
-#: Src/wptCardDlg.cpp:746 Src/wptCardDlg.cpp:751 Src/wptCardDlg.cpp:756
-#: Src/wptCardDlg.cpp:820 Src/wptCardDlg.cpp:835 Src/wptCardDlg.cpp:838
-#: Src/wptMainProc.cpp:299
+#: Src/wptCardDlg.cpp:326 Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:345
+#: Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:363 Src/wptCardDlg.cpp:377
+#: Src/wptCardDlg.cpp:506 Src/wptCardDlg.cpp:611 Src/wptCardDlg.cpp:616
+#: Src/wptCardDlg.cpp:622 Src/wptCardDlg.cpp:629 Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:664 Src/wptCardDlg.cpp:691
+#: 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:301
 msgid "Card Edit"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:359
+#: Src/wptCardDlg.cpp:339
 msgid "Only plain ASCII is currently allowed."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:364
+#: Src/wptCardDlg.cpp:344
 msgid "Only alphabetic characters are allowed."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:371
+#: Src/wptCardDlg.cpp:351
 msgid "Invalid URL."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:384
+#: Src/wptCardDlg.cpp:364
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:397
+#: Src/wptCardDlg.cpp:377
 msgid "Card attribute changed."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:437
+#: Src/wptCardDlg.cpp:417
 msgid "Please enter the 'Admin PIN'"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:439
+#: Src/wptCardDlg.cpp:419
 msgid "Please enter the 'User PIN'"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:441 Src/wptPINDlg.cpp:53
+#: Src/wptCardDlg.cpp:421 Src/wptPINDlg.cpp:53
 msgid "Please enter the PIN"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:445
+#: Src/wptCardDlg.cpp:425
 #, c-format
 msgid ""
 "%s\n"
@@ -260,111 +264,111 @@
 "Serial-No: %s\n"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:525
+#: Src/wptCardDlg.cpp:505
 msgid ""
 "This operation will override the keys on the card.\n"
 "Still proceed?"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
 msgid "&Name"
 msgstr "&Nom"
 
-#: Src/wptCardDlg.cpp:601 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
 msgid "&Comment (optional)"
 msgstr "&Commentaire (optionnel)"
 
-#: Src/wptCardDlg.cpp:602 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
 msgid "&Expire date"
 msgstr "&Date d'expiration"
 
-#: Src/wptCardDlg.cpp:603
+#: Src/wptCardDlg.cpp:583
 msgid "Off-card passphrase"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
 msgid "&Never"
 msgstr "&Jamais"
 
-#: Src/wptCardDlg.cpp:605 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
 msgid "Email &address"
 msgstr "Adresse &email"
 
-#: Src/wptCardDlg.cpp:606
+#: Src/wptCardDlg.cpp:586
 msgid "Overwrite old keys on the card"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:607
+#: Src/wptCardDlg.cpp:587
 msgid "Make off-card backup of encryption key"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:608 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1649
 msgid "Card Key Generation"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:631
+#: Src/wptCardDlg.cpp:611
 msgid "Please enter your name."
 msgstr "Veuillez entrer votre nom"
 
-#: Src/wptCardDlg.cpp:635
+#: Src/wptCardDlg.cpp:615
 msgid "Name must be at least 5 characters long."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:621
 msgid "Please enter your e-mail address."
 msgstr "Veuillez entrer votre adresse e-mail "
 
-#: Src/wptCardDlg.cpp:648
+#: Src/wptCardDlg.cpp:628
 msgid "Please enter a valid e-mail address."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:654
+#: Src/wptCardDlg.cpp:634
 msgid "Please enter an off-card passphrase."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:661
+#: Src/wptCardDlg.cpp:641
 msgid "Please use plain ASCII charset for the fields."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1366
 msgid "The date you have chosen lies in the past."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:709
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:718
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "Clés crées avec succès."
 
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:724
 msgid "Please enter the old card PIN."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:746
+#: Src/wptCardDlg.cpp:726
 msgid "Please enter the new card PIN."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:751
+#: Src/wptCardDlg.cpp:731
 msgid "Admin PIN must be minimal 8 characters."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:756
+#: Src/wptCardDlg.cpp:736
 msgid "PIN must be minimal 6 characters."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:779
+#: Src/wptCardDlg.cpp:759
 msgid "Change Card PIN"
 msgstr ""
 
-#: Src/wptCardDlg.cpp:819 Src/wptPassphraseDlg.cpp:184
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:184
 msgid "Passphrases do not match. Please try again."
 msgstr ""
 
-#: Src/wptCardDlg.cpp:837
+#: Src/wptCardDlg.cpp:817
 msgid "PIN successfully changed."
 msgstr ""
 
@@ -384,7 +388,8 @@
 
 #: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
 #: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
-#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:158
+#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
 msgid "user ID not found"
 msgstr ""
 
@@ -427,9 +432,9 @@
 msgstr ""
 
 #: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
-#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:279
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
+#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
 msgid "GnuPG Status: Finished"
 msgstr "Etat de GnuPG: Terminé"
 
@@ -467,7 +472,7 @@
 #: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
 #: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
 #: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:436 Src/wptMainProc.cpp:517 Src/wptMainProc.cpp:521
+#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
 msgid "Clipboard"
 msgstr "Presse papiers"
 
@@ -519,7 +524,7 @@
 msgid "Add quotes"
 msgstr ""
 
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
 #: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
@@ -541,16 +546,17 @@
 msgstr "&Chercher"
 
 #: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
-#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:287
-#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
-#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
-#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
-#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:524
-#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
-#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
+#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
+#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
 #: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
 msgid "&Cancel"
 msgstr "&Annuler"
@@ -568,28 +574,28 @@
 msgid "Key Import Statistics"
 msgstr ""
 
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:236
+#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:223
 #: Src/wptClipSignEncDlg.cpp:176
 msgid "Could not get default key."
 msgstr ""
 
 #: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:112
-#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:167
-#: Src/wptClipSignDlg.cpp:177 Src/wptClipSignDlg.cpp:236
-#: Src/wptClipSignDlg.cpp:244 Src/wptClipSignDlg.cpp:263
-#: Src/wptClipSignDlg.cpp:274 Src/wptClipSignEncDlg.cpp:166
+#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:154
+#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
+#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
+#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
 #: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
 #: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
 #: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
 msgid "Signing"
 msgstr "Signer"
 
-#: Src/wptClipSignDlg.cpp:177
+#: Src/wptClipSignDlg.cpp:164
 #, fuzzy
 msgid "No useable signing key found"
 msgstr "Aucune clé secrète utilisable n'a été trouvée"
 
-#: Src/wptClipSignDlg.cpp:245
+#: Src/wptClipSignDlg.cpp:232
 #, c-format
 msgid ""
 "No key was chosen.\n"
@@ -627,7 +633,7 @@
 #: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
 #: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
 #: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
-#: Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:425
 msgid "Verify"
 msgstr "Vérifier"
 
@@ -659,19 +665,19 @@
 msgid "Save Plaintext"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:88
+#: Src/wptCommonDlg.cpp:86
 msgid "Please enter a valid URL."
 msgstr "Entrez une URL valide."
 
-#: Src/wptCommonDlg.cpp:118
+#: Src/wptCommonDlg.cpp:116
 msgid "HTTP Key Import"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:119
+#: Src/wptCommonDlg.cpp:117
 msgid "Enter URL to retrieve the public key"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:771
 #: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
 #: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
 #: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
@@ -692,37 +698,42 @@
 #: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
 #: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
 #: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1770 Src/wptKeyEditDlgs.cpp:1890
-#: Src/wptKeyEditDlgs.cpp:1895 Src/wptKeyEditDlgs.cpp:1904
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1922
-#: Src/wptKeyEditDlgs.cpp:1973 Src/wptKeyEditDlgs.cpp:1983
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeyEditDlgs.cpp:2023
-#: Src/wptKeyEditDlgs.cpp:2028 Src/wptKeyManagerDlg.cpp:991
-#: Src/wptKeyManagerDlg.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:1790
 msgid "Key Edit"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:138
+#: Src/wptCommonDlg.cpp:136
 msgid "Enter preferred keyserver URL"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:224
-msgid "Yes"
-msgstr "Oui"
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+msgid "Choose Locale Directory"
+msgstr ""
 
-#: Src/wptCommonDlg.cpp:225
-msgid "No"
-msgstr "Non"
+#: Src/wptCommonDlg.cpp:220
+#, fuzzy
+msgid "Could not create winpt.mo file"
+msgstr "Ne peut créer une fenêtre"
 
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
-#: Src/wptKeyEditDlgs.cpp:1119
-msgid "OK"
+#: Src/wptCommonDlg.cpp:251
+msgid "Native Language Support"
 msgstr ""
 
-#: Src/wptCommonDlg.cpp:229
-msgid "Cancel"
-msgstr "Annuler"
+#: Src/wptCommonDlg.cpp:252
+#, fuzzy
+msgid "Please select a language"
+msgstr "Sélectionner un fichier."
 
+#: Src/wptCommonDlg.cpp:253
+msgid "&OK"
+msgstr ""
+
 #: Src/wptErrors.cpp:47
 #, c-format
 msgid "Could not locate GPG.exe in %s."
@@ -907,7 +918,7 @@
 #: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
 #: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
 #: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:403 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
 msgid "File Manager"
 msgstr "Gestionnaire de fichier"
 
@@ -931,13 +942,13 @@
 msgstr ""
 
 #: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1042
-#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
+#: Src/wptVerifyList.cpp:108
 msgid "Status"
 msgstr "Status"
 
 #: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
-#: Src/wptVerifyList.cpp:97
+#: Src/wptVerifyList.cpp:107
 msgid "Name"
 msgstr "Nom"
 
@@ -976,17 +987,17 @@
 
 #: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
 #: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
-#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:428
+#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
 msgid "Sign"
 msgstr "Signer"
 
 #: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:553
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:425
+#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
 msgid "Encrypt"
 msgstr "Chiffrer"
 
 #: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:419
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
 msgid "Symmetric"
 msgstr "Symétrique"
 
@@ -1060,8 +1071,8 @@
 #: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
 #: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
 #: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
+#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
 msgid "Import"
 msgstr "Importer"
 
@@ -1073,8 +1084,8 @@
 "Cannot import these key(s)!"
 msgstr ""
 
-#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:312
-#: Src/wptKeyManager.cpp:348 Src/wptKeyManager.cpp:383
+#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:256
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
 msgid "No key was selected for export."
 msgstr ""
 
@@ -1083,8 +1094,8 @@
 msgid "Export"
 msgstr "Exporter"
 
-#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1714
-#: Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptKeyManagerDlg.cpp:1747
 msgid "Choose Name for Key File"
 msgstr "Choisissez un nom de fichier pour la clé"
 
@@ -1153,12 +1164,12 @@
 msgstr ""
 
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:465
+#: Src/wptKeyManager.cpp:417
 msgid "No valid OpenPGP data found."
 msgstr ""
 
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:490
+#: Src/wptKeyManager.cpp:442
 msgid "Key Import"
 msgstr ""
 
@@ -1168,7 +1179,7 @@
 msgstr ""
 
 #: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:928 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Fichier"
 
@@ -1200,17 +1211,17 @@
 msgid "Signature mode"
 msgstr "Mode de signature"
 
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
 msgid "Options"
 msgstr ""
 
 #: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1292
 #: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
-#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
+#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
+#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
+#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
 #: Src/wptKeyserverSearchDlg.cpp:155
 msgid "Please select a key."
 msgstr "Sélectionner une clé."
@@ -1224,16 +1235,16 @@
 msgid "%d Object(s) marked"
 msgstr ""
 
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:548
+#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Gestionnaire de fichier (utilisez le drag & drop)"
 
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:929
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
 msgid "Edit"
 msgstr "Editer"
 
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
 msgid "View"
 msgstr "Voir"
 
@@ -1253,13 +1264,13 @@
 msgid "&Decrypt"
 msgstr "&Déchiffrer"
 
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:946
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "&Sign"
 msgstr "&Signer"
 
 #: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:556
-#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:426
+#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
 msgid "Sign && Encrypt"
 msgstr "Signer && Chiffrer"
 
@@ -1279,7 +1290,7 @@
 msgid "E&xport"
 msgstr "Exporter"
 
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:418
+#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
 msgid "Exit"
 msgstr "Quitter"
 
@@ -1434,8 +1445,8 @@
 #: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
 #: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
 #: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:438 Src/wptPreferencesDlg.cpp:215
+#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
 #: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
 #: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
 #: Src/wptRegistry.cpp:591
@@ -1567,7 +1578,7 @@
 "Are you sure?"
 msgstr ""
 
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1676
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1675
 #: Src/wptMainProc.cpp:598
 msgid "GnuPG Preferences"
 msgstr ""
@@ -1642,46 +1653,42 @@
 msgid "Choose GPG home directory"
 msgstr ""
 
-#: Src/wptGPGPrefsDlg.cpp:326
-msgid "Choose locale directory"
-msgstr ""
-
 #: Src/wptGPGPrefsDlg.cpp:332
 msgid "Choose GPG binary"
 msgstr ""
 
 #: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
-#: Src/wptKeyManager.cpp:234 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:320 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:354 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:384
-#: Src/wptKeyManager.cpp:393 Src/wptKeyManager.cpp:397
-#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:458
-#: Src/wptKeyManager.cpp:463 Src/wptKeyManager.cpp:466
-#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
-#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
-#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
-#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
-#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
-#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
-#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
-#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
-#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1568
-#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
-#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
-#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
-#: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeysigDlg.cpp:93
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:158 Src/wptKeyManager.cpp:163
+#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
+#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
+#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
+#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
+#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
+#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
+#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
+#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
+#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
+#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
+#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
+#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
+#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
+#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
+#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
+#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1532 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
+#: Src/wptKeyManagerDlg.cpp:1587 Src/wptKeyManagerDlg.cpp:1616
+#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
+#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
 #: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284 Src/wptKeysigDlg.cpp:358
-#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:404
-#: Src/wptMainProc.cpp:559 Src/wptMainProc.cpp:569
+#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
 msgid "Key Manager"
 msgstr "Gestionnaire de clés"
 
@@ -1778,34 +1785,34 @@
 msgstr ""
 
 #: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
-#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
 #: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
-#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
+#: Src/wptVerifyList.cpp:112
 msgid "User ID"
 msgstr ""
 
 #: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
 msgid "Size"
 msgstr "Taille"
 
 #: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1039
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:111
 msgid "Key ID"
 msgstr ""
 
 #: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1040
 #: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
-#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
 #: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
 msgid "Creation"
 msgstr "Création"
 
 #: Src/wptImportList.cpp:355 Src/wptKeylist.cpp:554
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
 msgid "Type"
 msgstr ""
 
@@ -1840,6 +1847,10 @@
 msgid "Never"
 msgstr ""
 
+#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+msgid "OK"
+msgstr ""
+
 #: Src/wptKeyEditDlgs.cpp:264
 msgid "user ID"
 msgstr ""
@@ -1909,7 +1920,7 @@
 #: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
 #: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
 #: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
 #: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
 #: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
 #: Src/wptOwnertrustDlg.cpp:136
@@ -1933,7 +1944,7 @@
 #: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1486
 #: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
 #: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1890
+#: Src/wptKeyEditDlgs.cpp:1910
 msgid "Please select a user ID."
 msgstr ""
 
@@ -2022,7 +2033,7 @@
 #: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
 #: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
 #: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1521
 msgid "There is no secret key available!"
 msgstr ""
 
@@ -2039,7 +2050,7 @@
 msgid "Change Ownertrust"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:212
 msgid "Key status changed."
 msgstr ""
 
@@ -2071,7 +2082,7 @@
 msgid "Passphrase successfully changed."
 msgstr "Passphrase modifiée avec succès."
 
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
 msgid "Description"
 msgstr "Déscription"
 
@@ -2088,7 +2099,7 @@
 msgstr ""
 
 #: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
-#: Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:862
 msgid "Validity"
 msgstr "Validité"
 
@@ -2254,42 +2265,44 @@
 msgid ""
 "user ID \"%s\".\n"
 "\n"
+"All signatures on this user ID will be also deleted.\n"
+"\n"
 "Do you really want to delete this user ID?"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1785
+#: Src/wptKeyEditDlgs.cpp:1787
 msgid "Delete user ID"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1791
 msgid "User ID successfully deleted"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1894
+#: Src/wptKeyEditDlgs.cpp:1914
 msgid "Do you really want to make this sig exportable?"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
 msgid "Key successfully signed."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1973
+#: Src/wptKeyEditDlgs.cpp:1996
 msgid "Could not set subkey window procedure."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:2009
 msgid "Could not set user ID window procedure."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1991
+#: Src/wptKeyEditDlgs.cpp:2018
 msgid "Command>"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:2023
+#: Src/wptKeyEditDlgs.cpp:2050
 msgid "Please select a command."
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:2027
+#: Src/wptKeyEditDlgs.cpp:2054
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr ""
 
@@ -2325,8 +2338,8 @@
 msgstr ""
 
 #: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
+#: Src/wptKeyManagerDlg.cpp:1771 Src/wptKeyPropsDlg.cpp:289
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
 #: Src/wptOwnertrustDlg.cpp:133
 msgid "Ownertrust"
@@ -2349,7 +2362,7 @@
 #: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
 #: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
 #: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
-#: Src/wptKeyManagerDlg.cpp:1637 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeyManagerDlg.cpp:1636 Src/wptPassphraseDlg.cpp:109
 msgid "Key Generation"
 msgstr ""
 
@@ -2490,7 +2503,7 @@
 
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
 #: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
-#: Src/wptKeyManagerDlg.cpp:1660
+#: Src/wptKeyManagerDlg.cpp:1659
 msgid "Key Generation Wizard"
 msgstr ""
 
@@ -2582,18 +2595,17 @@
 msgid "key pair"
 msgstr ""
 
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:877
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeyManagerDlg.cpp:950
 msgid "Cipher"
 msgstr ""
 
-#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:879
-#: Src/wptVerifyList.cpp:100 Src/wptVerifyList.cpp:108
+#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptVerifyList.cpp:110
 msgid "Trust"
 msgstr "Confiance"
 
 #: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
-#: Src/wptVerifyList.cpp:191
 msgid "Invalid User ID"
 msgstr ""
 
@@ -2622,88 +2634,88 @@
 msgid "Secret Key List"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:177
+#: Src/wptKeyManager.cpp:157
 msgid ""
 "This key has expired!\n"
 "Key check failed."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:182
+#: Src/wptKeyManager.cpp:162
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:305
 msgid "Only one secret key can be exported."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:364
+#: Src/wptKeyManager.cpp:316
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:398
+#: Src/wptKeyManager.cpp:350
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:470
+#: Src/wptKeyManager.cpp:422
 msgid "No valid OpenPGP keys found."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:475
+#: Src/wptKeyManager.cpp:427
 msgid ""
 "The key you want to import is dash escacped.\n"
 "Do you want to extract the key?"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:481
+#: Src/wptKeyManager.cpp:433
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:510 Src/wptKeyManager.cpp:638
+#: Src/wptKeyManager.cpp:462 Src/wptKeyManager.cpp:590
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:539 Src/wptKeyManager.cpp:546
-#: Src/wptKeyManager.cpp:555
+#: Src/wptKeyManager.cpp:491 Src/wptKeyManager.cpp:498
+#: Src/wptKeyManager.cpp:507
 msgid "Key Import HTTP"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:539
+#: Src/wptKeyManager.cpp:491
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:508
 #, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "Choisissez un nom de fichier pour la clé"
 
-#: Src/wptKeyManager.cpp:598
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:609
+#: Src/wptKeyManager.cpp:561
 msgid "Could not read key-data from file."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:729
+#: Src/wptKeyManager.cpp:681
 msgid "Do you really want to confirm each key?"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:682
 msgid "Delete Confirmation"
 msgstr "Confirmation de l'effacement"
 
-#: Src/wptKeyManager.cpp:754
+#: Src/wptKeyManager.cpp:706
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -2711,7 +2723,7 @@
 "%s"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:763
+#: Src/wptKeyManager.cpp:715
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -2722,349 +2734,349 @@
 "%s"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:770
+#: Src/wptKeyManager.cpp:722
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
 "placeholder will be deleted.\n"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:834
+#: Src/wptKeyManager.cpp:786
 #, c-format
 msgid "Do you really want to send '%s' to keyserver %s?"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:808
 msgid "Please only select one key."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:935
+#: Src/wptKeyManager.cpp:888
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:940
+#: Src/wptKeyManager.cpp:893
 msgid "Could not connect to keyserver, abort procedure."
 msgstr ""
 
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "Chercher"
 
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr ""
 
-#: Src/wptKeyManager.cpp:1026
+#: Src/wptKeyManager.cpp:979
 #, c-format
 msgid "String pattern \"%s\" not found."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:445 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
 msgid "Paste Key from Clipboard"
 msgstr "Coller la clé du presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:456
 #, c-format
 msgid "Default Key: %s"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:474
+#: Src/wptKeyManagerDlg.cpp:458
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:495
+#: Src/wptKeyManagerDlg.cpp:479
 #, c-format
 msgid "%d secret keys"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:496
+#: Src/wptKeyManagerDlg.cpp:480
 #, c-format
 msgid "%d keys"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:931
+#: Src/wptKeyManagerDlg.cpp:915
 msgid "Key"
 msgstr "Clé"
 
-#: Src/wptKeyManagerDlg.cpp:932 Src/wptKeyManagerDlg.cpp:1207
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
 msgid "Groups"
 msgstr "Groupes"
 
-#: Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:919
 msgid "Send Mail..."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:921
 msgid "&Copy\tCtrl+C"
 msgstr "&Copier\tCtrl+C"
 
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:922
 msgid "&Paste\tCtrl+V"
 msgstr "&Coller\tCtrl+V"
 
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:923
 msgid "Search...\tCtrl+F"
 msgstr "Chercher...\tCtrl+F"
 
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:924
 msgid "Select All\tCtrl+A"
 msgstr "Sélectionner tout\tCtrl+A"
 
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:925
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:927
 msgid "&Expert"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:928
 msgid "&Normal"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:947 Src/wptKeyManagerDlg.cpp:948
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptKeyManagerDlg.cpp:976
 msgid "&Delete"
 msgstr "&Effacer"
 
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
 msgid "&Revoke Cert"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
 msgid "&List Signatures"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:1563
+#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1562
 #: Src/wptKeyTrustPathDlg.cpp:130
 msgid "List Trust Path"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:936
 msgid "&Export..."
 msgstr "&Exporter..."
 
-#: Src/wptKeyManagerDlg.cpp:953
+#: Src/wptKeyManagerDlg.cpp:937
 msgid "&Import..."
 msgstr "&Importer..."
 
-#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
 #: Src/wptKeysigDlg.cpp:397
 msgid "&Properties"
 msgstr "&Propriétés"
 
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:942
 msgid "E&xport Secret Key"
 msgstr "E&xporter la clé privée"
 
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:943
 msgid "Re&load Key Cache"
 msgstr "Re&charger le cache"
 
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:944
 msgid "R&everify Signatures"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:961
+#: Src/wptKeyManagerDlg.cpp:945
 msgid "Refresh &Keys (Keyserver)"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Copy User ID to Clipboard"
 msgstr "Copier l'ID de l'utilisateur dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:966
 msgid "Copy Key ID to Clipboard"
 msgstr "Copier l'ID de la clé dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:967
 msgid "Copy Fingerprint to Clipboard"
 msgstr "Copier l'empreinte dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:968
 msgid "Copy Key Info to Clipboard"
 msgstr "Copier l'info de la clé dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Copy Key to Clipboard"
 msgstr "Copier la clé dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "Refresh from Keyserver"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "Set Implicit &Trust"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:979
 msgid "&Enable"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:980
 msgid "&Disable"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:981
 msgid "Re&fresh from Keyserver"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:982
 msgid "Set preferred Keyserver URL"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:983
 msgid "Send Key to Mail Recipient"
 msgstr "Envoyer la clé au destinataire de courrier"
 
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:984
 msgid "Set as Default Key"
 msgstr "Clé par défaut"
 
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:986
 msgid "Key..."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeyManagerDlg.cpp:987
 msgid "User ID..."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:988
 msgid "Photo ID..."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:989
 msgid "Revoker..."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:992
 msgid "Key Attributes"
 msgstr "Attributs de clé"
 
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "Add"
 msgstr "Ajouter"
 
-#: Src/wptKeyManagerDlg.cpp:1010
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "Send to Keyserver"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1181
+#: Src/wptKeyManagerDlg.cpp:1173
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1192
+#: Src/wptKeyManagerDlg.cpp:1184
 msgid "Could not set keylist window procedure."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1310
+#: Src/wptKeyManagerDlg.cpp:1301
 msgid "Generate new key pair"
 msgstr "Générer une nouvelle paire de clés"
 
-#: Src/wptKeyManagerDlg.cpp:1314
+#: Src/wptKeyManagerDlg.cpp:1305
 msgid "Search for a specific key"
 msgstr "Chercher pour une clé spécifique"
 
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1309
 msgid "Delete key from keyring"
 msgstr "Effacer une clé du porte-clés"
 
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1313
 msgid "Show key properties"
 msgstr "Voir les propriétés de la clé"
 
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1317
 msgid "Sign key"
 msgstr "Signer la clé"
 
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1321
 msgid "Copy key to clipboard"
 msgstr "Copier la clé dans le presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:1334
+#: Src/wptKeyManagerDlg.cpp:1325
 msgid "Paste key from clipboard"
 msgstr "Coller la clé du presse papiers"
 
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1329
 msgid "Import key to keyring"
 msgstr "Importer la clé dans le porte-clés"
 
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1333
 msgid "Export key to a file"
 msgstr "Exporter la clé dans un fichier"
 
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1460
 msgid "New"
 msgstr "Nouveau"
 
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1472
 msgid "Could not access public keyring"
 msgstr "Ne peut accéder au porte-clés publique"
 
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeyManagerDlg.cpp:1507 Src/wptKeysignDlg.cpp:259
 #: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
 #: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
 #: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
 msgid "Key Signing"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1532
+#: Src/wptKeyManagerDlg.cpp:1531
 msgid "Key already revoked!"
 msgstr "Clé déjà révoquée!"
 
-#: Src/wptKeyManagerDlg.cpp:1544 Src/wptKeyRevokeDlg.cpp:72
+#: Src/wptKeyManagerDlg.cpp:1543 Src/wptKeyRevokeDlg.cpp:72
 #: Src/wptKeyRevokeDlg.cpp:100 Src/wptKeyRevokeDlg.cpp:138
 #: Src/wptKeyRevokeDlg.cpp:143 Src/wptKeyRevokeDlg.cpp:151
 #: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:173
 msgid "Key Revocation Cert"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1553
 msgid "It does not make any sense with a key pair!"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1581
+#: Src/wptKeyManagerDlg.cpp:1580
 msgid "Key Signature List"
 msgstr "Liste de signature de clé"
 
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1602 Src/wptKeyPropsDlg.cpp:285
 msgid "Key Properties"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1614
+#: Src/wptKeyManagerDlg.cpp:1613
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1645
+#: Src/wptKeyManagerDlg.cpp:1644
 msgid "Smart Card support is not available."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
 msgid "Keyserver Access"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1685
+#: Src/wptKeyManagerDlg.cpp:1684
 msgid "GnuPG Options"
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1726
 msgid "There is no corresponding secret key for this key."
 msgstr ""
 
-#: Src/wptKeyManagerDlg.cpp:1732
+#: Src/wptKeyManagerDlg.cpp:1731
 msgid "You can only export one secret key."
 msgstr "Vous pouvez exporter seulement une clé secrète."
 
-#: Src/wptKeyManagerDlg.cpp:1737
+#: Src/wptKeyManagerDlg.cpp:1736
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -3082,11 +3094,11 @@
 "\n"
 "Voulez-vous vraiment exporter cette clé?"
 
-#: Src/wptKeyManagerDlg.cpp:1742
+#: Src/wptKeyManagerDlg.cpp:1741
 msgid "WARNING"
 msgstr "ATTENTION"
 
-#: Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1820
 msgid "No key was selected, select all by default."
 msgstr ""
 
@@ -3094,7 +3106,7 @@
 msgid "I trust ultimately (implicit)"
 msgstr ""
 
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:169
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
 #: Src/wptVerifyList.cpp:245
 msgid "Unknown"
 msgstr ""
@@ -3156,7 +3168,7 @@
 msgid "Ownertrust successfully changed."
 msgstr ""
 
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
 msgid "Key Revokers"
 msgstr ""
 
@@ -3216,65 +3228,65 @@
 msgid "Algorithm"
 msgstr ""
 
-#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:159
+#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
 msgid "Designated Key Revokers"
 msgstr ""
 
-#: Src/wptKeyRevokersDlg.cpp:145
+#: Src/wptKeyRevokersDlg.cpp:147
 msgid "Designated Revoker Keys"
 msgstr ""
 
-#: Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyRevokersDlg.cpp:162
 #, c-format
 msgid "Do you want to retrieve 0x%s via the default keyserver?"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:353
+#: Src/wptKeyserver.cpp:344
 msgid "The network subsystem has failed"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:355
+#: Src/wptKeyserver.cpp:346
 msgid "Authoritative Answer Host not found"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:357
+#: Src/wptKeyserver.cpp:348
 msgid "The connection has been dropped because of a network failure"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:359
+#: Src/wptKeyserver.cpp:350
 #, c-format
 msgid "Unknown Winsock error ec=%d"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:547
+#: Src/wptKeyserver.cpp:538
 msgid "Could not save keyserver.conf file"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:593
+#: Src/wptKeyserver.cpp:583
 msgid ""
 "Invalid proxy configuration.You need to set a user and a passwordto use "
 "proxy authentication!"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:596
+#: Src/wptKeyserver.cpp:586
 msgid "Proxy Error"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:622
+#: Src/wptKeyserver.cpp:612
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:624
+#: Src/wptKeyserver.cpp:614
 msgid "Keyserver Error"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:638
 msgid "The keyserver limit is exceeded"
 msgstr ""
 
-#: Src/wptKeyserver.cpp:649
+#: Src/wptKeyserver.cpp:639
 msgid "Keyserver Warning"
 msgstr ""
 
@@ -3516,7 +3528,7 @@
 msgid "Really receive all missing keys?"
 msgstr ""
 
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:118
+#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
 msgid "Signature &Properties"
 msgstr ""
 
@@ -3654,39 +3666,39 @@
 msgid "Unknown OpenPGP type."
 msgstr ""
 
-#: Src/wptMainProc.cpp:348
+#: Src/wptMainProc.cpp:360
 msgid "Could not set current window mode hooks."
 msgstr ""
 
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:417
 msgid "Edit Clipboard"
 msgstr "Editer le presse papiers"
 
-#: Src/wptMainProc.cpp:417
+#: Src/wptMainProc.cpp:418
 msgid "About..."
 msgstr "A propos..."
 
-#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:428
 msgid "Decrypt/Verify"
 msgstr "Déchiffrer/Vérifier"
 
-#: Src/wptMainProc.cpp:437
+#: Src/wptMainProc.cpp:438
 msgid "Current Window"
 msgstr "Fenêtre courante"
 
-#: Src/wptMainProc.cpp:493
+#: Src/wptMainProc.cpp:494
 msgid "Remove all passphrases from cache?"
 msgstr ""
 
-#: Src/wptMainProc.cpp:494 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:495 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
 msgid "WinPT"
 msgstr ""
 
-#: Src/wptMainProc.cpp:504
+#: Src/wptMainProc.cpp:505
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 
-#: Src/wptMainProc.cpp:536
+#: Src/wptMainProc.cpp:538
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -3697,19 +3709,14 @@
 msgid "WinPT Preferences"
 msgstr "Préférences de WinPT"
 
-#: Src/wptMAPI.cpp:96 Src/wptMAPI.cpp:259
+#: Src/wptMAPI.cpp:96
 msgid "MAPI Login failed."
 msgstr ""
 
-#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226 Src/wptMAPI.cpp:266
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
 msgid "Could not sent mail."
 msgstr ""
 
-#: Src/wptMAPI.cpp:252
-#, c-format
-msgid "GPG Public Key of %s"
-msgstr ""
-
 #: Src/wptMDSumDlg.cpp:72
 msgid "Digest"
 msgstr ""
@@ -4049,12 +4056,12 @@
 msgid "Expiration"
 msgstr ""
 
-#: Src/wptSigTreeDlg.cpp:172
+#: Src/wptSigTreeDlg.cpp:164
 #, c-format
-msgid "Signature Tree for \"%s\""
+msgid "Signature Tree for \"%s\" (0x%s)"
 msgstr ""
 
-#: Src/wptSigTreeDlg.cpp:174
+#: Src/wptSigTreeDlg.cpp:167
 msgid "Edit..."
 msgstr ""
 
@@ -4074,9 +4081,18 @@
 msgid "Text Input from File"
 msgstr ""
 
-#: Src/wptVerifyList.cpp:99 Src/wptVerifyList.cpp:107
+#: Src/wptVerifyList.cpp:109
 msgid "Signed"
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "Oui"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
 #~ msgid "Please enter a name for the image file."
 #~ msgstr "Entrez un nom de fichier pour l'image."

Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/Po/jp.po	2006-04-01 12:36:58 UTC (rev 194)
@@ -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-03-26 19:46+0200\n"
+"POT-Creation-Date: 2006-03-31 18:47+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"
@@ -14,7 +14,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:194
+#: Src/WinPT.cpp:183
 msgid "Could not create GPG home directory"
 msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -29,28 +29,28 @@
 # c:\oss\winpt\src\wptGPG.cpp:886 c:\oss\winpt\src\wptGPG.cpp:896
 # c:\oss\winpt\src\wptGPGME.cpp:175 c:\oss\winpt\src\wptMainProc.cpp:337
 # c:\oss\winpt\src\wptMainProc.cpp:509
-#: Src/WinPT.cpp:195 Src/WinPT.cpp:227 Src/WinPT.cpp:277 Src/WinPT.cpp:281
-#: Src/WinPT.cpp:486 Src/WinPT.cpp:493 Src/WinPT.cpp:533 Src/WinPT.cpp:561
-#: Src/WinPT.cpp:570 Src/WinPT.cpp:574 Src/WinPT.cpp:591 Src/WinPT.cpp:659
-#: Src/WinPT.cpp:672 Src/WinPT.cpp:719 Src/WinPT.cpp:745 Src/WinPT.cpp:763
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
-#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:349
-#: Src/wptMainProc.cpp:535
+#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
+#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
+#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
+#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
 msgid "WinPT Error"
 msgstr "WinPT ƒGƒ‰["
 
 # c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/WinPT.cpp:226
+#: Src/WinPT.cpp:215
 msgid "No useable secret key found."
 msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:155
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:265
 msgid "Could not read GnuPG version."
 msgstr "GnuPGƒo[ƒWƒ‡ƒ“î•ñ‚ð“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:161
-#: Src/WinPT.cpp:282
+#: Src/WinPT.cpp:271
 #, c-format
 msgid ""
 "Sorry, you need a newer GPG version.\n"
@@ -60,7 +60,7 @@
 "•K—v‚Æ‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ª %d.%d.%d ‚Å‚·B"
 
 # c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:310
+#: Src/WinPT.cpp:299
 msgid "Failed to create WinPT directory"
 msgstr "WinPTƒfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -79,8 +79,8 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/WinPT.cpp:311 Src/WinPT.cpp:329 Src/WinPT.cpp:340
-#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
+#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
 #: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
 #: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
 #: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
@@ -95,21 +95,21 @@
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:370
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/WinPT.cpp:328
+#: Src/WinPT.cpp:316
 msgid "Failed to copy the keyserver.conf"
 msgstr "keyserver.conf‚̃tƒ@ƒCƒ‹ƒRƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:223
-#: Src/WinPT.cpp:485
+#: Src/WinPT.cpp:463
 msgid "Cryptographic selftest failed."
 msgstr "ˆÃ†–@ƒZƒ‹ƒtƒeƒXƒg‚ªŽ¸”s‚µ‚Ü‚µ‚½B"
 
-#: Src/WinPT.cpp:492
+#: Src/WinPT.cpp:470
 msgid "A newer GPGME version is needed; at least "
 msgstr "­‚È‚­‚Ä‚àGPME‚̐V‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B"
 
 # c:\oss\winpt\src\WinPT.cpp:242
-#: Src/WinPT.cpp:534
+#: Src/WinPT.cpp:512
 #, c-format
 msgid ""
 "GPG home directory is not set correctly.\n"
@@ -121,17 +121,17 @@
 "%s."
 
 # c:\oss\winpt\src\WinPT.cpp:246
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:516
 msgid "Select GPG Public Keyring"
 msgstr "GPGŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\WinPT.cpp:268
-#: Src/WinPT.cpp:560
+#: Src/WinPT.cpp:538
 msgid "GPG home directory could not be determited."
 msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:276
-#: Src/WinPT.cpp:568
+#: Src/WinPT.cpp:546
 msgid ""
 "Could not find the GPG binary (gpg.exe).\n"
 "Do you want to start the GPG preferences to correct  this problem?"
@@ -139,7 +139,7 @@
 "GPGƒoƒCƒiƒŠ(gpg.exe)‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
 "GPG ƒJƒXƒ^ƒ€Ý’è‚ð‹N“®‚µ‚Ä‚±‚Ì–â‘è‚ð‰ðŒˆ‚µ‚Ü‚·‚©H"
 
-#: Src/WinPT.cpp:583
+#: Src/WinPT.cpp:561
 msgid ""
 "Could not access and/or find the public and secret keyring.\n"
 "If this is an accident, quit the program and fix it.\n"
@@ -152,23 +152,23 @@
 "‚±‚Ì‚Ü‚Ü‘±‚¯‚éê‡‚́AWinPT‚ª‚¢‚ë‚¢‚ë‚È‘I‘ð‚ð’ño‚µ‚Ü‚·B\n"
 
 # c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
-#: Src/WinPT.cpp:616 Src/wptFileManagerDlg.cpp:494
+#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
 #: Src/wptFileManagerDlg.cpp:809
 msgid "Wipe Free Space"
 msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
 
 # c:\oss\winpt\src\WinPT.cpp:382
-#: Src/WinPT.cpp:658
+#: Src/WinPT.cpp:636
 msgid "Could not register window class"
 msgstr "ƒEƒBƒ“ƒh‚̃Nƒ‰ƒX‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:395
-#: Src/WinPT.cpp:672
+#: Src/WinPT.cpp:650
 msgid "Could not create window"
 msgstr "ƒEƒBƒ“ƒh‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:461
-#: Src/WinPT.cpp:743
+#: Src/WinPT.cpp:725
 msgid ""
 "The keycache was not initialized or is empty.\n"
 "Please check your GPG config (keyrings, pathes...)"
@@ -177,7 +177,7 @@
 "GPG‚±‚¤‚¹‚¢ (ƒL[ƒŠƒ“ƒO, ƒpƒX‚È‚Ç...) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\WinPT.cpp:464
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:728
 msgid ""
 "It seems that GPG is not set properly.\n"
 "Do you want to start the GPG preferences dialog?"
@@ -186,7 +186,7 @@
 "GPGƒJƒXƒ^ƒ€Ý’è‚ðŽÀs‚µ‚Ü‚·H"
 
 # c:\oss\winpt\src\WinPT.cpp:480
-#: Src/WinPT.cpp:764
+#: Src/WinPT.cpp:746
 #, fuzzy, c-format
 msgid ""
 "Default key (from the GPG config file) could not be found.\n"
@@ -200,7 +200,7 @@
 "%s: ŒöŠJŒ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:41
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:140
 msgid "About the GNU Privacy Guard"
 msgstr "GNUƒvƒ‰ƒCƒoƒV[ƒK[ƒh‚ɂ‚¢‚Ä"
 
@@ -209,37 +209,41 @@
 msgid "About GnuPG"
 msgstr "GnuPG‚ɂ‚¢‚Ä"
 
+#: Src/wptAboutDlgs.cpp:61
+msgid "The AUTHORS files contains a list of all contributors and co-authors."
+msgstr ""
+
 # c:\oss\winpt\src\wptAboutDlgs.cpp:78
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
 # c:\oss\winpt\src\wptMainProc.cpp:560
-#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1755
 #: Src/wptMainProc.cpp:586
 msgid "About WinPT"
 msgstr "WinPT‚ɂ‚¢‚Ä"
 
-#: Src/wptAboutDlgs.cpp:95
+#: Src/wptAboutDlgs.cpp:97
 msgid "Warranty"
 msgstr "•ÛØ"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:80
-#: Src/wptAboutDlgs.cpp:97
+#: Src/wptAboutDlgs.cpp:99
 msgid "A free open source privacy tray for Windows based on GnuPG."
 msgstr "GnuPG‚ÉŠî‚¢‚Ä‚¢‚éW32—p–³—¿µ°ÍßÝ¿°½ÌßײÊÞ¼°ÄÚ²"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:82
-#: Src/wptAboutDlgs.cpp:99
+#: Src/wptAboutDlgs.cpp:101
 msgid "For more information you can visit the homepage: http://www.winpt.org"
 msgstr "Ú×‚ɂ‚¢‚Ähttp://www.winpt.orgã‚É‚ ‚éƒz[ƒ€ƒy[ƒW‚ð‚²——‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:84
-#: Src/wptAboutDlgs.cpp:101
+#: Src/wptAboutDlgs.cpp:103
 msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
 msgstr ""
 "WinPT‚É‚æ‚éƒoƒbƒO‚âƒRƒƒ“ƒg‚ðŽŸ‚ÌƒAƒhƒŒƒX‚Ü‚Å<winpt at freakmail.de>‚¨Šè‚¢‚µ‚Ü"
 "‚·B"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:86
-#: Src/wptAboutDlgs.cpp:103
+#: Src/wptAboutDlgs.cpp:105
 msgid ""
 "WinPT is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -250,7 +254,7 @@
 "‚·‚邱‚ƂŁAƒo[ƒWƒ‡ƒ“2(‚Ü‚½‚Í‚»‚êˆÈ~)‚ðÄ”z•z‚Ü‚½‚͕ύX‚·‚邱‚Æ‚ªo—ˆ‚Ü‚·B"
 
 # c:\oss\winpt\src\wptAboutDlgs.cpp:91
-#: Src/wptAboutDlgs.cpp:108
+#: Src/wptAboutDlgs.cpp:110
 msgid ""
 "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
@@ -261,33 +265,33 @@
 "‚Ĉê”ÊŒö—LŽg—p‹–‘ø‚ð‚²——‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptAboutDlgs.cpp:112
+#: Src/wptAboutDlgs.cpp:114
 msgid "&About GPG..."
 msgstr "GPG‚ɂ‚¢‚Ä..."
 
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyManagerDlg.cpp:963
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyManagerDlg.cpp:947
 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:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:405
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:414
 msgid "Card Manager"
 msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
 
 # c:\oss\winpt\src\wptCardDlg.cpp:149
-#: Src/wptCardDlg.cpp:197
+#: Src/wptCardDlg.cpp:177
 msgid "No Fingerprint"
 msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:175
-#: Src/wptCardDlg.cpp:227
+#: Src/wptCardDlg.cpp:207
 msgid "No OpenPGP smart card detected."
 msgstr "OpenPGPƒXƒ}[ƒgƒJ[ƒh‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptCardDlg.cpp:346
+#: Src/wptCardDlg.cpp:326
 msgid "No PINs found."
 msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -301,61 +305,61 @@
 # c:\oss\winpt\src\wptCardDlg.cpp:634 c:\oss\winpt\src\wptCardDlg.cpp:639
 # c:\oss\winpt\src\wptCardDlg.cpp:644 c:\oss\winpt\src\wptCardDlg.cpp:695
 # c:\oss\winpt\src\wptCardDlg.cpp:697 c:\oss\winpt\src\wptMainProc.cpp:546
-#: Src/wptCardDlg.cpp:346 Src/wptCardDlg.cpp:360 Src/wptCardDlg.cpp:365
-#: Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:383 Src/wptCardDlg.cpp:397
-#: Src/wptCardDlg.cpp:526 Src/wptCardDlg.cpp:631 Src/wptCardDlg.cpp:636
-#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:649 Src/wptCardDlg.cpp:654
-#: Src/wptCardDlg.cpp:662 Src/wptCardDlg.cpp:684 Src/wptCardDlg.cpp:711
-#: Src/wptCardDlg.cpp:716 Src/wptCardDlg.cpp:719 Src/wptCardDlg.cpp:744
-#: Src/wptCardDlg.cpp:746 Src/wptCardDlg.cpp:751 Src/wptCardDlg.cpp:756
-#: Src/wptCardDlg.cpp:820 Src/wptCardDlg.cpp:835 Src/wptCardDlg.cpp:838
-#: Src/wptMainProc.cpp:299
+#: Src/wptCardDlg.cpp:326 Src/wptCardDlg.cpp:340 Src/wptCardDlg.cpp:345
+#: Src/wptCardDlg.cpp:351 Src/wptCardDlg.cpp:363 Src/wptCardDlg.cpp:377
+#: Src/wptCardDlg.cpp:506 Src/wptCardDlg.cpp:611 Src/wptCardDlg.cpp:616
+#: Src/wptCardDlg.cpp:622 Src/wptCardDlg.cpp:629 Src/wptCardDlg.cpp:634
+#: Src/wptCardDlg.cpp:642 Src/wptCardDlg.cpp:664 Src/wptCardDlg.cpp:691
+#: 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:301
 msgid "Card Edit"
 msgstr "ƒJ[ƒh•ÒW"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:299
-#: Src/wptCardDlg.cpp:359
+#: Src/wptCardDlg.cpp:339
 msgid "Only plain ASCII is currently allowed."
 msgstr "Œ»Ý‚̓vƒŒ[ƒ“ASCII‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:304
-#: Src/wptCardDlg.cpp:364
+#: Src/wptCardDlg.cpp:344
 msgid "Only alphabetic characters are allowed."
 msgstr "ƒAƒ‹ƒtƒ@ƒxƒbƒg‚Ì•¶Žš‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptCardDlg.cpp:371
+#: Src/wptCardDlg.cpp:351
 msgid "Invalid URL."
 msgstr "–³Œø‚ÈURLB"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:317
-#: Src/wptCardDlg.cpp:384
+#: Src/wptCardDlg.cpp:364
 #, c-format
 msgid "Could not modify card attribute: %s"
 msgstr "ƒJ[ƒh‚Ì‘®«u%sv‚ð•ÏX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:327
-#: Src/wptCardDlg.cpp:397
+#: Src/wptCardDlg.cpp:377
 msgid "Card attribute changed."
 msgstr "ƒJ[ƒh‚Ì‘®«‚ª•ÏX‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:362
-#: Src/wptCardDlg.cpp:437
+#: Src/wptCardDlg.cpp:417
 msgid "Please enter the 'Admin PIN'"
 msgstr "'Admin PIN'‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:364
-#: Src/wptCardDlg.cpp:439
+#: Src/wptCardDlg.cpp:419
 msgid "Please enter the 'User PIN'"
 msgstr "'User PIN'‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:366 c:\oss\winpt\src\wptPINDlg.cpp:47
-#: Src/wptCardDlg.cpp:441 Src/wptPINDlg.cpp:53
+#: Src/wptCardDlg.cpp:421 Src/wptPINDlg.cpp:53
 msgid "Please enter the PIN"
 msgstr "ˆÃØ”ԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:370
-#: Src/wptCardDlg.cpp:445
+#: Src/wptCardDlg.cpp:425
 #, c-format
 msgid ""
 "%s\n"
@@ -367,7 +371,7 @@
 "ƒVƒŠƒAƒ‹”ԍ†F %s\n"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:451
-#: Src/wptCardDlg.cpp:525
+#: Src/wptCardDlg.cpp:505
 msgid ""
 "This operation will override the keys on the card.\n"
 "Still proceed?"
@@ -376,12 +380,12 @@
 "‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
 msgid "&Name"
 msgstr "–¼‘O(&N)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:601 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
 msgid "&Comment (optional)"
 msgstr "ƒIƒvƒVƒ‡ƒiƒ‹ƒRƒƒ“ƒg(&C)"
 
@@ -390,77 +394,77 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
 # c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptCardDlg.cpp:602 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
 msgid "&Expire date"
 msgstr "—LŒøŠúŒÀ(&E)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:152
-#: Src/wptCardDlg.cpp:603
+#: Src/wptCardDlg.cpp:583
 msgid "Off-card passphrase"
 msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
 msgid "&Never"
 msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:605 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
 msgid "Email &address"
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX(&A)"
 
 # c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptCardDlg.cpp:606
+#: Src/wptCardDlg.cpp:586
 msgid "Overwrite old keys on the card"
 msgstr "ƒJ[ƒhã‚É‚ ‚éŒÃ‚¢ƒL[‚ðã‘‚«‚µ‚Ü‚·‚©H"
 
-#: Src/wptCardDlg.cpp:607
+#: Src/wptCardDlg.cpp:587
 msgid "Make off-card backup of encryption key"
 msgstr "ˆÃ†‰»ƒL[‚̃J[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:608 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1649
 msgid "Card Key Generation"
 msgstr "ƒJ[ƒhƒL[ì¬"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:537
-#: Src/wptCardDlg.cpp:631
+#: Src/wptCardDlg.cpp:611
 msgid "Please enter your name."
 msgstr "‚ ‚È‚½‚Ì–¼‘O‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:541
-#: Src/wptCardDlg.cpp:635
+#: Src/wptCardDlg.cpp:615
 msgid "Name must be at least 5 characters long."
 msgstr "–¼‘O‚Ì’·‚³‚͍Œá5•¶Žš‚É‚È‚é‚ׂ«‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:547
-#: Src/wptCardDlg.cpp:641
+#: Src/wptCardDlg.cpp:621
 msgid "Please enter your e-mail address."
 msgstr "‚ ‚È‚½‚Ì“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:554
-#: Src/wptCardDlg.cpp:648
+#: Src/wptCardDlg.cpp:628
 msgid "Please enter a valid e-mail address."
 msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptCardDlg.cpp:654
+#: Src/wptCardDlg.cpp:634
 msgid "Please enter an off-card passphrase."
 msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-#: Src/wptCardDlg.cpp:661
+#: Src/wptCardDlg.cpp:641
 msgid "Please use plain ASCII charset for the fields."
 msgstr "ƒtƒB[ƒ‹ƒh‚ɃvƒŒ[ƒ“ASCII•¶Žš‚ðŽg‚Á‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:580
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
 # c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1366
 msgid "The date you have chosen lies in the past."
 msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:602
-#: Src/wptCardDlg.cpp:709
+#: Src/wptCardDlg.cpp:689
 msgid ""
 "Operation was canceled. It seems that there are existing\n"
 "keys on the cards. You need to mark the 'Overwrite' flag."
@@ -469,42 +473,42 @@
 "ã‘‚«(Overwrite)ƒtƒ‰ƒO‚ðƒ}[ƒN‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:610
-#: Src/wptCardDlg.cpp:718
+#: Src/wptCardDlg.cpp:698
 msgid "Keys successfully created."
 msgstr "ƒL[‚̍쐬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:632
-#: Src/wptCardDlg.cpp:744
+#: Src/wptCardDlg.cpp:724
 msgid "Please enter the old card PIN."
 msgstr "ŒÃ‚¢ƒJ[ƒh‚̈Ïؔԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:634
-#: Src/wptCardDlg.cpp:746
+#: Src/wptCardDlg.cpp:726
 msgid "Please enter the new card PIN."
 msgstr "V‚µ‚¢ƒJ[ƒh‚̈Ïؔԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:639
-#: Src/wptCardDlg.cpp:751
+#: Src/wptCardDlg.cpp:731
 msgid "Admin PIN must be minimal 8 characters."
 msgstr "ŠÇ—ŽÒ—pˆÃØ”ԍ†‚Ì’·‚³‚͍Œá‚W•¶Žš‚Å‚·B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:644
-#: Src/wptCardDlg.cpp:756
+#: Src/wptCardDlg.cpp:736
 msgid "PIN must be minimal 6 characters."
 msgstr "ˆÃØ”ԍ†‚Ì’·‚³‚͍Œá‚U•¶Žš‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptCardDlg.cpp:779
+#: Src/wptCardDlg.cpp:759
 msgid "Change Card PIN"
 msgstr "ƒJ[ƒh‚̈Ïؔԍ†‚ð•ÏX‚·‚é"
 
 # c:\oss\winpt\src\wptPassphraseDlg.cpp:146
-#: Src/wptCardDlg.cpp:819 Src/wptPassphraseDlg.cpp:184
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:184
 msgid "Passphrases do not match. Please try again."
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ªƒ}ƒbƒ`‚µ‚Ü‚¹‚ñB‚à‚¤ˆê“xƒgƒ‰ƒC‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptCardDlg.cpp:697
-#: Src/wptCardDlg.cpp:837
+#: Src/wptCardDlg.cpp:817
 msgid "PIN successfully changed."
 msgstr "ˆÃØ”ԍ†‚ª³‚µ‚­•ÏX‚µ‚Ü‚µ‚½B"
 
@@ -543,7 +547,8 @@
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
 #: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
 #: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
-#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:158
+#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
 msgid "user ID not found"
 msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -609,9 +614,9 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:610
 # c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
 #: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
-#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:279
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
+#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
 msgid "GnuPG Status: Finished"
 msgstr "GunPG‚̏ó‘ԁFI—¹‚µ‚Ü‚µ‚½"
 
@@ -669,7 +674,7 @@
 #: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
 #: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
 #: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:436 Src/wptMainProc.cpp:517 Src/wptMainProc.cpp:521
+#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
 msgid "Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
 
@@ -742,7 +747,7 @@
 msgid "Add quotes"
 msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
 
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
 #: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
@@ -773,16 +778,17 @@
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
 #: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
-#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:287
-#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
-#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
-#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
-#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:524
-#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
-#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
+#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
+#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
 #: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
 msgid "&Cancel"
 msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)"
@@ -807,7 +813,7 @@
 # c:\oss\winpt\src\wptClipSignDlg.cpp:53
 # c:\oss\winpt\src\wptClipSignDlg.cpp:138
 # c:\oss\winpt\src\wptClipSignEncDlg.cpp:129
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:236
+#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:223
 #: Src/wptClipSignEncDlg.cpp:176
 msgid "Could not get default key."
 msgstr "‹K’èƒL[‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -827,10 +833,10 @@
 # c:\oss\winpt\src\wptFileManager.cpp:1053
 # c:\oss\winpt\src\wptMainProc.cpp:165 c:\oss\winpt\src\wptMainProc.cpp:229
 #: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:112
-#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:167
-#: Src/wptClipSignDlg.cpp:177 Src/wptClipSignDlg.cpp:236
-#: Src/wptClipSignDlg.cpp:244 Src/wptClipSignDlg.cpp:263
-#: Src/wptClipSignDlg.cpp:274 Src/wptClipSignEncDlg.cpp:166
+#: Src/wptClipSignDlg.cpp:120 Src/wptClipSignDlg.cpp:154
+#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
+#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
+#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
 #: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
 #: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
 #: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
@@ -838,13 +844,13 @@
 msgstr "–¼"
 
 # c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/wptClipSignDlg.cpp:177
+#: Src/wptClipSignDlg.cpp:164
 #, fuzzy
 msgid "No useable signing key found"
 msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipSignDlg.cpp:147
-#: Src/wptClipSignDlg.cpp:245
+#: Src/wptClipSignDlg.cpp:232
 #, c-format
 msgid ""
 "No key was chosen.\n"
@@ -907,7 +913,7 @@
 #: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
 #: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
 #: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
-#: Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:425
 msgid "Verify"
 msgstr "Šm”F‚·‚é"
 
@@ -956,17 +962,17 @@
 msgstr "ƒvƒŒ[ƒ“ƒeƒLƒXƒg‚ð•Û‘¶‚·‚é"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptCommonDlg.cpp:88
+#: Src/wptCommonDlg.cpp:86
 msgid "Please enter a valid URL."
 msgstr "—LŒø‚ÈURL‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:180
 # c:\oss\winpt\src\wptKeyManager.cpp:427
-#: Src/wptCommonDlg.cpp:118
+#: Src/wptCommonDlg.cpp:116
 msgid "HTTP Key Import"
 msgstr "HTTPƒL[‚̃Cƒ“ƒ|[ƒg"
 
-#: Src/wptCommonDlg.cpp:119
+#: Src/wptCommonDlg.cpp:117
 msgid "Enter URL to retrieve the public key"
 msgstr "ŒöŠJŒ®‚ðŽæ“¾‚·‚é‚Ì‚ÉURL‚ð“ü—Í‚·‚é"
 
@@ -1010,7 +1016,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1568
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1173
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:771
 #: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
 #: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
 #: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
@@ -1031,41 +1037,50 @@
 #: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
 #: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
 #: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1770 Src/wptKeyEditDlgs.cpp:1890
-#: Src/wptKeyEditDlgs.cpp:1895 Src/wptKeyEditDlgs.cpp:1904
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1922
-#: Src/wptKeyEditDlgs.cpp:1973 Src/wptKeyEditDlgs.cpp:1983
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeyEditDlgs.cpp:2023
-#: Src/wptKeyEditDlgs.cpp:2028 Src/wptKeyManagerDlg.cpp:991
-#: Src/wptKeyManagerDlg.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
+#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:1790
 msgid "Key Edit"
 msgstr "ƒL[‚̕ҏW"
 
-#: Src/wptCommonDlg.cpp:138
+#: Src/wptCommonDlg.cpp:136
 msgid "Enter preferred keyserver URL"
 msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ð“ü—Í‚·‚é"
 
-#: Src/wptCommonDlg.cpp:224
-msgid "Yes"
-msgstr "‚Í‚¢"
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+#, fuzzy
+msgid "Choose Locale Directory"
+msgstr "'locale'ÃÞ¨Ú¸ÄØ‚Ì‘I‘ð"
 
-#: Src/wptCommonDlg.cpp:225
-msgid "No"
-msgstr "‚¢‚¢‚¦"
+# c:\oss\winpt\src\wptErrors.cpp:67
+#: Src/wptCommonDlg.cpp:220
+#, fuzzy
+msgid "Could not create winpt.mo file"
+msgstr "ƒtƒ@ƒCƒ‹‚ðì¬‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
+#: Src/wptCommonDlg.cpp:251
+msgid "Native Language Support"
+msgstr ""
+
+# c:\oss\winpt\src\wptOwnertrustDlg.cpp:60
+#: Src/wptCommonDlg.cpp:252
+#, fuzzy
+msgid "Please select a language"
+msgstr "ƒtƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
+
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
-#: Src/wptKeyEditDlgs.cpp:1119
-msgid "OK"
+#: Src/wptCommonDlg.cpp:253
+#, fuzzy
+msgid "&OK"
 msgstr "OK"
 
-# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptCommonDlg.cpp:229
-msgid "Cancel"
-msgstr "ƒLƒƒƒ“ƒZƒ‹"
-
 # c:\oss\winpt\src\wptErrors.cpp:43
 #: Src/wptErrors.cpp:47
 #, c-format
@@ -1306,7 +1321,7 @@
 #: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
 #: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
 #: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:403 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
 msgid "File Manager"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
 
@@ -1343,7 +1358,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
 # c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
 #: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1042
-#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
+#: Src/wptVerifyList.cpp:108
 msgid "Status"
 msgstr "ó‹µ"
 
@@ -1353,7 +1368,7 @@
 # c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
 #: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
 #: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
-#: Src/wptVerifyList.cpp:97
+#: Src/wptVerifyList.cpp:107
 msgid "Name"
 msgstr "–¼‘O"
 
@@ -1407,7 +1422,7 @@
 # c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
 #: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
 #: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
-#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:428
+#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
 msgid "Sign"
 msgstr "–¼"
 
@@ -1415,7 +1430,7 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:401
 # c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
 #: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:553
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:425
+#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
 msgid "Encrypt"
 msgstr "ŒöŠJˆÃ†‰»"
 
@@ -1424,7 +1439,7 @@
 # c:\oss\winpt\src\wptFileManager.cpp:919
 # c:\oss\winpt\src\wptMainProc.cpp:401
 #: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:419
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
 msgid "Symmetric"
 msgstr "‹¤’ʈ͆‰»"
 
@@ -1530,8 +1545,8 @@
 #: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
 #: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
 #: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
+#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
 msgid "Import"
 msgstr "ƒCƒ“ƒ|[ƒg"
 
@@ -1553,8 +1568,8 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:262
 # c:\oss\winpt\src\wptKeyManager.cpp:294
 # c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:312
-#: Src/wptKeyManager.cpp:348 Src/wptKeyManager.cpp:383
+#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:256
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
 msgid "No key was selected for export."
 msgstr "ƒGƒLƒXƒ|[ƒg‚·‚邽‚߂̃L[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
 
@@ -1569,8 +1584,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:1702 Src/wptKeyManagerDlg.cpp:1714
-#: Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptKeyManagerDlg.cpp:1747
 msgid "Choose Name for Key File"
 msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
 
@@ -1661,14 +1676,14 @@
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:190
 # c:\oss\winpt\src\wptKeyManager.cpp:408
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:465
+#: Src/wptKeyManager.cpp:417
 msgid "No valid OpenPGP data found."
 msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipImportDlg.cpp:180
 # c:\oss\winpt\src\wptKeyManager.cpp:427
 #: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:490
+#: Src/wptKeyManager.cpp:442
 msgid "Key Import"
 msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
 
@@ -1679,7 +1694,7 @@
 
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
 #: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:928 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "ƒtƒ@ƒCƒ‹"
 
@@ -1725,7 +1740,7 @@
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:79 c:\oss\winpt\src\wptGPGOptDlg.cpp:83
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:90 c:\oss\winpt\src\wptGPGOptDlg.cpp:96
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:580
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
 msgid "Options"
 msgstr "ƒIƒvƒVƒ‡ƒ“"
 
@@ -1747,11 +1762,11 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
 #: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1292
 #: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
-#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
+#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
+#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
+#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
 #: Src/wptKeyserverSearchDlg.cpp:155
 msgid "Please select a key."
 msgstr "ƒL[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
@@ -1766,17 +1781,17 @@
 msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:548
+#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
 msgid "File Manager (use drag & drop to add files)"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:929
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
 msgid "Edit"
 msgstr "•ÒW"
 
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
 msgid "View"
 msgstr "ƒrƒ…["
 
@@ -1807,8 +1822,8 @@
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:357
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:946
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:978
 msgid "&Sign"
 msgstr "–¼(&S)"
 
@@ -1816,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:481 Src/wptFileManagerDlg.cpp:556
-#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:426
+#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
 msgid "Sign && Encrypt"
 msgstr "–¼‹y‚ш͆‰»"
 
@@ -1843,7 +1858,7 @@
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:364
 # c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:418
+#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
 msgid "Exit"
 msgstr "I—¹"
 
@@ -2075,8 +2090,8 @@
 #: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
 #: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
 #: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:438 Src/wptPreferencesDlg.cpp:215
+#: Src/wptKeyEditDlgs.cpp:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
 #: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
 #: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
 #: Src/wptRegistry.cpp:591
@@ -2241,7 +2256,7 @@
 # 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:1676
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1675
 #: Src/wptMainProc.cpp:598
 msgid "GnuPG Preferences"
 msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2332,11 +2347,6 @@
 msgid "Choose GPG home directory"
 msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
 
-# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:326
-msgid "Choose locale directory"
-msgstr "'locale'ÃÞ¨Ú¸ÄØ‚Ì‘I‘ð"
-
 # c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
 #: Src/wptGPGPrefsDlg.cpp:332
 msgid "Choose GPG binary"
@@ -2410,37 +2420,37 @@
 # c:\oss\winpt\src\wptKeysigDlg.cpp:397 c:\oss\winpt\src\wptMainProc.cpp:388
 # c:\oss\winpt\src\wptMainProc.cpp:536
 #: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:178 Src/wptKeyManager.cpp:183
-#: Src/wptKeyManager.cpp:234 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:320 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:354 Src/wptKeyManager.cpp:361
-#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:384
-#: Src/wptKeyManager.cpp:393 Src/wptKeyManager.cpp:397
-#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:458
-#: Src/wptKeyManager.cpp:463 Src/wptKeyManager.cpp:466
-#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
-#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
-#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
-#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
-#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
-#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
-#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
-#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
-#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
-#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyManagerDlg.cpp:1549
-#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1568
-#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
-#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
-#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
-#: Src/wptKeyManagerDlg.cpp:2003 Src/wptKeysigDlg.cpp:93
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:158 Src/wptKeyManager.cpp:163
+#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
+#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
+#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
+#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
+#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
+#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
+#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
+#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
+#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
+#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
+#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
+#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
+#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
+#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
+#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
+#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
+#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1532 Src/wptKeyManagerDlg.cpp:1548
+#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
+#: Src/wptKeyManagerDlg.cpp:1587 Src/wptKeyManagerDlg.cpp:1616
+#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
+#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
 #: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284 Src/wptKeysigDlg.cpp:358
-#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:404
-#: Src/wptMainProc.cpp:559 Src/wptMainProc.cpp:569
+#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
 msgid "Key Manager"
 msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
 
@@ -2582,9 +2592,9 @@
 # c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
 # c:\oss\winpt\src\wptVerifyList.cpp:88
 #: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
-#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
 #: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
-#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
+#: Src/wptVerifyList.cpp:112
 msgid "User ID"
 msgstr "ƒ†[ƒU[ID"
 
@@ -2593,7 +2603,7 @@
 # c:\oss\winpt\src\wptKeylist.cpp:51
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
 #: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
 msgid "Size"
 msgstr "ƒTƒCƒY"
 
@@ -2604,10 +2614,10 @@
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
 # c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
 #: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1039
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
-#: Src/wptVerifyList.cpp:109
+#: Src/wptVerifyList.cpp:111
 msgid "Key ID"
 msgstr "ƒL[‚ÌID"
 
@@ -2618,14 +2628,14 @@
 # c:\oss\winpt\src\wptSigList.cpp:44
 #: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1040
 #: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
-#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
 #: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
 msgid "Creation"
 msgstr "ì¬"
 
 # c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
 #: Src/wptImportList.cpp:355 Src/wptKeylist.cpp:554
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
 msgid "Type"
 msgstr "Ží—Þ"
 
@@ -2672,6 +2682,13 @@
 msgid "Never"
 msgstr "‚Í‚¸‚Í‚È‚¢"
 
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
+#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+msgid "OK"
+msgstr "OK"
+
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
 #: Src/wptKeyEditDlgs.cpp:264
 msgid "user ID"
@@ -2785,7 +2802,7 @@
 #: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
 #: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
 #: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
 #: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
 #: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
 #: Src/wptOwnertrustDlg.cpp:136
@@ -2820,7 +2837,7 @@
 #: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1486
 #: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
 #: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1890
+#: Src/wptKeyEditDlgs.cpp:1910
 msgid "Please select a user ID."
 msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
@@ -2953,7 +2970,7 @@
 #: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
 #: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
 #: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManagerDlg.cpp:1522
+#: Src/wptKeyManagerDlg.cpp:1521
 msgid "There is no secret key available!"
 msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
 
@@ -2977,7 +2994,7 @@
 msgstr "Š—LŽÒ‚̐M—Š(ownertrust)‚̕ύX"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:156
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:212
 msgid "Key status changed."
 msgstr "ƒL[‚̏ó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
 
@@ -3022,7 +3039,7 @@
 msgstr "ƒpƒXƒtƒŒ[ƒY‚̕ύX‚͐³‚µ‚­‚Å‚«‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
 msgid "Description"
 msgstr "Ú×"
 
@@ -3045,7 +3062,7 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
 # c:\oss\winpt\src\wptKeylist.cpp:53
 #: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
-#: Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:862
 msgid "Validity"
 msgstr "—LŒø«"
 
@@ -3270,10 +3287,12 @@
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
 #: Src/wptKeyEditDlgs.cpp:1767
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "user ID \"%s\".\n"
 "\n"
+"All signatures on this user ID will be also deleted.\n"
+"\n"
 "Do you really want to delete this user ID?"
 msgstr ""
 "ƒ†[ƒU[ID \"%s\".\n"
@@ -3281,17 +3300,17 @@
 "‚±‚̃†[ƒU[ID‚ð–{“–‚ɍ폜‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1785
+#: Src/wptKeyEditDlgs.cpp:1787
 msgid "Delete user ID"
 msgstr "ƒ†[ƒU[ID‚ðíœ‚·‚éB"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1791
 msgid "User ID successfully deleted"
 msgstr "ƒ†[ƒU[ID‚𐳂µ‚­íœ‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1894
+#: Src/wptKeyEditDlgs.cpp:1914
 #, fuzzy
 msgid "Do you really want to make this sig exportable?"
 msgstr ""
@@ -3300,32 +3319,32 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
 msgid "Key successfully signed."
 msgstr "ƒL[‚ð–¼‚·‚邱‚Ƃɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:1973
+#: Src/wptKeyEditDlgs.cpp:1996
 msgid "Could not set subkey window procedure."
 msgstr "ƒTƒuƒL[ƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:2009
 msgid "Could not set user ID window procedure."
 msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:1991
+#: Src/wptKeyEditDlgs.cpp:2018
 msgid "Command>"
 msgstr "ƒRƒ}ƒ“ƒh"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2023
+#: Src/wptKeyEditDlgs.cpp:2050
 msgid "Please select a command."
 msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2027
+#: Src/wptKeyEditDlgs.cpp:2054
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
 
@@ -3385,8 +3404,8 @@
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:81
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:86
 #: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
+#: Src/wptKeyManagerDlg.cpp:1771 Src/wptKeyPropsDlg.cpp:289
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
 #: Src/wptOwnertrustDlg.cpp:133
 msgid "Ownertrust"
@@ -3424,7 +3443,7 @@
 #: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
 #: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
 #: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
-#: Src/wptKeyManagerDlg.cpp:1637 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeyManagerDlg.cpp:1636 Src/wptPassphraseDlg.cpp:109
 msgid "Key Generation"
 msgstr "ƒL[‚̍쐬"
 
@@ -3603,7 +3622,7 @@
 # c:\oss\winpt\src\wptKeygenDlg.cpp:389 c:\oss\winpt\src\wptKeygenDlg.cpp:413
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
 #: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
-#: Src/wptKeyManagerDlg.cpp:1660
+#: Src/wptKeyManagerDlg.cpp:1659
 msgid "Key Generation Wizard"
 msgstr "ƒL[ì¬‚̃EƒBƒU[ƒh"
 
@@ -3716,15 +3735,15 @@
 msgstr "ƒL[ƒyƒA"
 
 # c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:877
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeyManagerDlg.cpp:950
 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:558 Src/wptKeyManagerDlg.cpp:879
-#: Src/wptVerifyList.cpp:100 Src/wptVerifyList.cpp:108
+#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptVerifyList.cpp:110
 msgid "Trust"
 msgstr "M—p"
 
@@ -3733,7 +3752,6 @@
 # c:\oss\winpt\src\wptKeylist.cpp:569 c:\oss\winpt\src\wptPassphraseCB.cpp:75
 # c:\oss\winpt\src\wptVerifyList.cpp:160
 #: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
-#: Src/wptVerifyList.cpp:191
 msgid "Invalid User ID"
 msgstr "–³Œø‚ȃ†[ƒU[ID"
 
@@ -3774,7 +3792,7 @@
 msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:97
-#: Src/wptKeyManager.cpp:177
+#: Src/wptKeyManager.cpp:157
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -3783,7 +3801,7 @@
 "ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:100
-#: Src/wptKeyManager.cpp:182
+#: Src/wptKeyManager.cpp:162
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -3792,29 +3810,29 @@
 "ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:298
-#: Src/wptKeyManager.cpp:353
+#: Src/wptKeyManager.cpp:305
 msgid "Only one secret key can be exported."
 msgstr "ˆêŒÂ‚̔閧Œ®‚Ì‚Ý‚ªƒGƒLƒXƒ|[ƒg‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:364
+#: Src/wptKeyManager.cpp:316
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "”é–§Œ®‚ð'%s'‚É•Û‘¶‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptKeyManager.cpp:398
+#: Src/wptKeyManager.cpp:350
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "ƒL[‚𐳂µ‚­'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:412
-#: Src/wptKeyManager.cpp:470
+#: Src/wptKeyManager.cpp:422
 msgid "No valid OpenPGP keys found."
 msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:416
-#: Src/wptKeyManager.cpp:475
+#: Src/wptKeyManager.cpp:427
 msgid ""
 "The key you want to import is dash escacped.\n"
 "Do you want to extract the key?"
@@ -3823,13 +3841,13 @@
 "ƒL[‚ðˆø‚­o‚µ‚½‚¢‚Å‚µ‚傤‚©H"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:422
-#: Src/wptKeyManager.cpp:481
+#: Src/wptKeyManager.cpp:433
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "ƒ_ƒbƒVƒ…ƒGƒXƒP[ƒvƒhOpenPGPƒL[‚ðƒCƒ“ƒ|[ƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptFileManager.cpp:1285
 # c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptKeyManager.cpp:510 Src/wptKeyManager.cpp:638
+#: Src/wptKeyManager.cpp:462 Src/wptKeyManager.cpp:590
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -3840,51 +3858,51 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:444
 # c:\oss\winpt\src\wptKeyManager.cpp:455
 # c:\oss\winpt\src\wptKeyManager.cpp:468
-#: Src/wptKeyManager.cpp:539 Src/wptKeyManager.cpp:546
-#: Src/wptKeyManager.cpp:555
+#: Src/wptKeyManager.cpp:491 Src/wptKeyManager.cpp:498
+#: Src/wptKeyManager.cpp:507
 msgid "Key Import HTTP"
 msgstr "ƒL[ƒCƒ“ƒ|[ƒg‚ÌHTTP"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:539
+#: Src/wptKeyManager.cpp:491
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "–³Œø‚ÈHTTP URL: %s"
 
 # c:\oss\winpt\src\wptMAPI.cpp:348
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:508
 #, fuzzy, c-format
 msgid "Could not fetch key from URL: %s"
 msgstr "'%s' ‚ɑ΂µ‚ăL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1082
-#: Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:537
 msgid "Choose Name of the Key File"
 msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚é"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:182
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:190
 # c:\oss\winpt\src\wptKeyManager.cpp:490
-#: Src/wptKeyManager.cpp:598
+#: Src/wptKeyManager.cpp:550
 msgid "File Import"
 msgstr "ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒ|[ƒg"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:500
-#: Src/wptKeyManager.cpp:609
+#: Src/wptKeyManager.cpp:561
 msgid "Could not read key-data from file."
 msgstr "ƒL[‚̃f[ƒ^‚ðƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:729
+#: Src/wptKeyManager.cpp:681
 msgid "Do you really want to confirm each key?"
 msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
 
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:682
 msgid "Delete Confirmation"
 msgstr "Šm”F‚ðíœ‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:754
+#: Src/wptKeyManager.cpp:706
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -3896,7 +3914,7 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:763
+#: Src/wptKeyManager.cpp:715
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -3914,7 +3932,7 @@
 "%s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:770
+#: Src/wptKeyManager.cpp:722
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -3925,66 +3943,66 @@
 "íœ‚³‚ê‚Ü‚·B\n"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:834
+#: Src/wptKeyManager.cpp:786
 #, c-format
 msgid "Do you really want to send '%s' to keyserver %s?"
 msgstr "'%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s? ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:808
 msgid "Please only select one key."
 msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:935
+#: Src/wptKeyManager.cpp:888
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "ƒL[ƒŠƒ“ƒO‚É‚ ‚é‚·‚ׂẴL[‚ð–{“–‚ɃŠƒtƒŒƒbƒVƒ…‚µ‚½‚¢‚Å‚·‚ªH"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:940
+#: Src/wptKeyManager.cpp:893
 msgid "Could not connect to keyserver, abort procedure."
 msgstr "ƒL[ƒT[ƒo[‚ɐڑ±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search"
 msgstr "ŒŸõ"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1015
+#: Src/wptKeyManager.cpp:968
 msgid "Search for:"
 msgstr "ŒŸõ‚·‚邱‚ƁF"
 
-#: Src/wptKeyManager.cpp:1026
+#: Src/wptKeyManager.cpp:979
 #, c-format
 msgid "String pattern \"%s\" not found."
 msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:445 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
 msgid "Paste Key from Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:456
 #, c-format
 msgid "Default Key: %s"
 msgstr "‹K’èƒL[‚Í: %s"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:474
+#: Src/wptKeyManagerDlg.cpp:458
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "‹K’èƒL[‚Í: 0x%s"
 
 # c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:495
+#: Src/wptKeyManagerDlg.cpp:479
 #, c-format
 msgid "%d secret keys"
 msgstr "%d ӎФΨ"
 
-#: Src/wptKeyManagerDlg.cpp:496
+#: Src/wptKeyManagerDlg.cpp:480
 #, c-format
 msgid "%d keys"
 msgstr "%d ƒL["
@@ -3995,71 +4013,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:931
+#: Src/wptKeyManagerDlg.cpp:915
 msgid "Key"
 msgstr "ƒL["
 
 # c:\oss\winpt\src\wptGroupsDlg.cpp:49
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:932 Src/wptKeyManagerDlg.cpp:1207
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
 msgid "Groups"
 msgstr "ƒOƒ‹[ƒv"
 
-#: Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:919
 msgid "Send Mail..."
 msgstr "ƒ[ƒ‹‚𑗐M‚·‚é..."
 
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:921
 msgid "&Copy\tCtrl+C"
 msgstr "ƒRƒs[(&C)\tCtrl+C"
 
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:922
 msgid "&Paste\tCtrl+V"
 msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
 
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:923
 msgid "Search...\tCtrl+F"
 msgstr "ŒŸõ...\tCtrl+F"
 
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:924
 msgid "Select All\tCtrl+A"
 msgstr "‚·‚ׂČŸõ\tCtrl+A"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:925
 msgid "&Quit"
 msgstr "I—¹(&Q)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:927
 msgid "&Expert"
 msgstr "ƒGƒNƒXƒp[ƒg(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:928
 msgid "&Normal"
 msgstr "•’Ê(&N)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:947 Src/wptKeyManagerDlg.cpp:948
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptKeyManagerDlg.cpp:976
 msgid "&Delete"
 msgstr "íœ(&D)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
 msgid "&Revoke Cert"
 msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
 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:951 Src/wptKeyManagerDlg.cpp:1563
+#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1562
 #: Src/wptKeyTrustPathDlg.cpp:130
 msgid "List Trust Path"
 msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4067,112 +4085,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:952
+#: Src/wptKeyManagerDlg.cpp:936
 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:953
+#: Src/wptKeyManagerDlg.cpp:937
 msgid "&Import..."
 msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
 # c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
 #: Src/wptKeysigDlg.cpp:397
 msgid "&Properties"
 msgstr "‘®«(&P)"
 
 # c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:942
 msgid "E&xport Secret Key"
 msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:943
 msgid "Re&load Key Cache"
 msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:944
 msgid "R&everify Signatures"
 msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:961
+#: Src/wptKeyManagerDlg.cpp:945
 msgid "Refresh &Keys (Keyserver)"
 msgstr "ƒL[‚ðƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&K)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:586
 # c:\oss\winpt\src\wptTextInputDlg.cpp:47
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Copy User ID to Clipboard"
 msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:966
 msgid "Copy Key ID to Clipboard"
 msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:967
 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:984
+#: Src/wptKeyManagerDlg.cpp:968
 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:985
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Copy Key to Clipboard"
 msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "Refresh from Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "Set Implicit &Trust"
 msgstr "ˆÃ–ِM—p‚ðÝ’è‚·‚é(&T)"
 
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:979
 msgid "&Enable"
 msgstr "—LŒø‚·‚é(&E)"
 
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:980
 msgid "&Disable"
 msgstr "–³Œø‚·‚é(&D)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:981
 msgid "Re&fresh from Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:982
 msgid "Set preferred Keyserver URL"
 msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:983
 msgid "Send Key to Mail Recipient"
 msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:984
 msgid "Set as Default Key"
 msgstr "‹K’èƒL[‚Æ‚µ‚Đݒ肷‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:986
 msgid "Key..."
 msgstr "ƒL[..."
 
@@ -4182,24 +4200,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:1003
+#: Src/wptKeyManagerDlg.cpp:987
 msgid "User ID..."
 msgstr "ƒ†[ƒU[ID"
 
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:988
 msgid "Photo ID..."
 msgstr "ƒtƒHƒgID..."
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:989
 msgid "Revoker..."
 msgstr "–³Œø‰»‚«‚Ì‚¤"
 
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:992
 msgid "Key Attributes"
 msgstr "ƒL[‚Ì‘®«"
 
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:993
 msgid "Add"
 msgstr "’ljÁ"
 
@@ -4218,11 +4236,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:1010
+#: Src/wptKeyManagerDlg.cpp:994
 msgid "Send to Keyserver"
 msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1181
+#: Src/wptKeyManagerDlg.cpp:1173
 msgid ""
 "No ultimately trusted key found.\n"
 "Please set at least one secret key to ultimate trust."
@@ -4230,61 +4248,61 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
 # c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1192
+#: Src/wptKeyManagerDlg.cpp:1184
 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\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1310
+#: Src/wptKeyManagerDlg.cpp:1301
 msgid "Generate new key pair"
 msgstr "V‚µ‚¢ƒL[ƒyƒA‚ðì¬‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1314
+#: Src/wptKeyManagerDlg.cpp:1305
 msgid "Search for a specific key"
 msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1309
 msgid "Delete key from keyring"
 msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ðíœ‚·‚éB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1313
 msgid "Show key properties"
 msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1317
 msgid "Sign key"
 msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1321
 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:1334
+#: Src/wptKeyManagerDlg.cpp:1325
 msgid "Paste key from clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1329
 msgid "Import key to keyring"
 msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1333
 msgid "Export key to a file"
 msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
 
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1460
 msgid "New"
 msgstr "V‹Kì¬"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1472
 msgid "Could not access public keyring"
 msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
@@ -4296,7 +4314,7 @@
 # c:\oss\winpt\src\wptKeysignDlg.cpp:318
 # c:\oss\winpt\src\wptKeysignDlg.cpp:320
 # c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeyManagerDlg.cpp:1507 Src/wptKeysignDlg.cpp:259
 #: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
 #: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
 #: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
@@ -4304,7 +4322,7 @@
 msgstr "ƒL[‚ð–¼‚·‚é"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1532
+#: Src/wptKeyManagerDlg.cpp:1531
 msgid "Key already revoked!"
 msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
 
@@ -4315,7 +4333,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:1544 Src/wptKeyRevokeDlg.cpp:72
+#: Src/wptKeyManagerDlg.cpp:1543 Src/wptKeyRevokeDlg.cpp:72
 #: Src/wptKeyRevokeDlg.cpp:100 Src/wptKeyRevokeDlg.cpp:138
 #: Src/wptKeyRevokeDlg.cpp:143 Src/wptKeyRevokeDlg.cpp:151
 #: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:173
@@ -4323,23 +4341,23 @@
 msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
-#: Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1553
 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:1581
+#: Src/wptKeyManagerDlg.cpp:1580
 msgid "Key Signature List"
 msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1602 Src/wptKeyPropsDlg.cpp:285
 msgid "Key Properties"
 msgstr "ƒL[‚Ì‘®«"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1614
+#: Src/wptKeyManagerDlg.cpp:1613
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
@@ -4348,34 +4366,34 @@
 "–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1645
+#: Src/wptKeyManagerDlg.cpp:1644
 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:1668 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
 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:1685
+#: Src/wptKeyManagerDlg.cpp:1684
 msgid "GnuPG Options"
 msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1726
 msgid "There is no corresponding secret key for this key."
 msgstr "‚±‚̃L[‚ɑ΂µ‚Ă̔閧Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1732
+#: Src/wptKeyManagerDlg.cpp:1731
 msgid "You can only export one secret key."
 msgstr "ˆêŒÂ‚̔閧Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1737
+#: Src/wptKeyManagerDlg.cpp:1736
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -4394,12 +4412,12 @@
 "‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1742
+#: Src/wptKeyManagerDlg.cpp:1741
 msgid "WARNING"
 msgstr "Œx"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1821
+#: Src/wptKeyManagerDlg.cpp:1820
 msgid "No key was selected, select all by default."
 msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
 
@@ -4410,7 +4428,7 @@
 msgstr "‚‚¢‚ɐM—p‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:84 c:\oss\winpt\src\wptKeylist.cpp:701
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:169
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
 #: Src/wptVerifyList.cpp:245
 msgid "Unknown"
 msgstr "–³–¼"
@@ -4495,7 +4513,7 @@
 msgstr "Š—LŽÒ‚̐M—Š(ownertrust)‚͐³‚µ‚­•ÏX‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
 msgid "Key Revokers"
 msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤"
 
@@ -4570,49 +4588,49 @@
 msgstr "ƒAƒ‹ƒSƒŠƒYƒ€"
 
 # c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:159
+#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
 msgid "Designated Key Revokers"
 msgstr "Žw’è‚̃L[‚𖳌ø‰»‚«‚Ì‚¤"
 
 # c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:145
+#: Src/wptKeyRevokersDlg.cpp:147
 msgid "Designated Revoker Keys"
 msgstr "Žw’è‚Ì–³Œø‰»‚·‚éƒL["
 
 # c:\oss\winpt\src\wptKeyRevokersDlg.cpp:123
-#: Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyRevokersDlg.cpp:162
 #, c-format
 msgid "Do you want to retrieve 0x%s via the default keyserver?"
 msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å 0x%s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:271
-#: Src/wptKeyserver.cpp:353
+#: Src/wptKeyserver.cpp:344
 msgid "The network subsystem has failed"
 msgstr "ƒlƒbƒgƒ[ƒNƒTƒuƒVƒXƒeƒ€‚ªáŠQ‚µ‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:272
-#: Src/wptKeyserver.cpp:355
+#: Src/wptKeyserver.cpp:346
 msgid "Authoritative Answer Host not found"
 msgstr "M—Š‚Å‚«‚éƒAƒ“ƒT[ƒzƒXƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:273
-#: Src/wptKeyserver.cpp:357
+#: Src/wptKeyserver.cpp:348
 msgid "The connection has been dropped because of a network failure"
 msgstr "ƒlƒbƒgƒ[ƒNáŠQ‚Ì‚½‚ߐڑ±‚ªØ’f‚³‚ê‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:274
-#: Src/wptKeyserver.cpp:359
+#: Src/wptKeyserver.cpp:350
 #, c-format
 msgid "Unknown Winsock error ec=%d"
 msgstr "–¢’m‚ÌWinsockƒGƒ‰[ ec=%d"
 
 # c:\oss\winpt\src\wptPreferencesDlg.cpp:221
-#: Src/wptKeyserver.cpp:547
+#: Src/wptKeyserver.cpp:538
 msgid "Could not save keyserver.conf file"
 msgstr "keyserver.confƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:436
-#: Src/wptKeyserver.cpp:593
+#: Src/wptKeyserver.cpp:583
 msgid ""
 "Invalid proxy configuration.You need to set a user and a passwordto use "
 "proxy authentication!"
@@ -4621,12 +4639,12 @@
 "ƒvƒƒNƒV[‚Ì”FØI"
 
 # c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserver.cpp:596
+#: Src/wptKeyserver.cpp:586
 msgid "Proxy Error"
 msgstr "ƒvƒƒNƒV[ƒGƒ‰["
 
 # c:\oss\winpt\src\wptKeyserver.cpp:462
-#: Src/wptKeyserver.cpp:622
+#: Src/wptKeyserver.cpp:612
 msgid ""
 "All entries of this file must have a valid prefix.\n"
 "Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -4649,17 +4667,17 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserver.cpp:624
+#: Src/wptKeyserver.cpp:614
 msgid "Keyserver Error"
 msgstr "ƒL[ƒT[ƒo[ƒGƒ‰["
 
 # c:\oss\winpt\src\wptKeyserver.cpp:473
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:638
 msgid "The keyserver limit is exceeded"
 msgstr "ƒL[ƒT[ƒo[‚̐§ŒÀ‚ª’´‚¦‚Ä‚¢‚Ü‚·B"
 
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserver.cpp:649
+#: Src/wptKeyserver.cpp:639
 msgid "Keyserver Warning"
 msgstr "ƒL[ƒT[ƒo[Œx"
 
@@ -5021,7 +5039,7 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
 # c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:118
+#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
 msgid "Signature &Properties"
 msgstr "–¼‚Ì‘®«(&P)"
 
@@ -5200,50 +5218,50 @@
 msgstr "–¢’m‚ÌOpenPGPƒ^ƒCƒv"
 
 # c:\oss\winpt\src\wptMainProc.cpp:336
-#: Src/wptMainProc.cpp:348
+#: Src/wptMainProc.cpp:360
 msgid "Could not set current window mode hooks."
 msgstr ""
 "Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptMainProc.cpp:398
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:417
 msgid "Edit Clipboard"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚̕ҏW"
 
 # c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:417
+#: Src/wptMainProc.cpp:418
 msgid "About..."
 msgstr "WinPT‚ɂ‚¢‚Ä..."
 
 # c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:428
 msgid "Decrypt/Verify"
 msgstr "•œ†/Šm”F"
 
-#: Src/wptMainProc.cpp:437
+#: Src/wptMainProc.cpp:438
 msgid "Current Window"
 msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
 
 # c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:493
+#: Src/wptMainProc.cpp:494
 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:494 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:495 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
 msgid "WinPT"
 msgstr "WinPT"
 
 # c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:504
+#: Src/wptMainProc.cpp:505
 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:536
+#: Src/wptMainProc.cpp:538
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -5259,21 +5277,15 @@
 msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
 
 # c:\oss\winpt\src\wptMAPI.cpp:96
-#: Src/wptMAPI.cpp:96 Src/wptMAPI.cpp:259
+#: Src/wptMAPI.cpp:96
 msgid "MAPI Login failed."
 msgstr "MAPI‚̃ƒOƒCƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptMAPI.cpp:103 c:\oss\winpt\src\wptMAPI.cpp:325
-#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226 Src/wptMAPI.cpp:266
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
 msgid "Could not sent mail."
 msgstr "ƒ[ƒ‹‚𑗐M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-# c:\oss\winpt\src\wptMAPI.cpp:89
-#: Src/wptMAPI.cpp:252
-#, c-format
-msgid "GPG Public Key of %s"
-msgstr "GPGŒöŠJŒ®‚Ì %s"
-
 # c:\oss\winpt\src\wptMDSumDlg.cpp:52
 #: Src/wptMDSumDlg.cpp:72
 msgid "Digest"
@@ -5710,13 +5722,13 @@
 msgstr "ŠúŒÀ"
 
 # c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptSigTreeDlg.cpp:172
+#: Src/wptSigTreeDlg.cpp:164
 #, fuzzy, c-format
-msgid "Signature Tree for \"%s\""
+msgid "Signature Tree for \"%s\" (0x%s)"
 msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptSigTreeDlg.cpp:174
+#: Src/wptSigTreeDlg.cpp:167
 #, fuzzy
 msgid "Edit..."
 msgstr "•ÒW"
@@ -5742,10 +5754,24 @@
 msgstr "ƒtƒ@ƒCƒ‹‚©‚ç‚̃eƒLƒXƒg“ü—Í"
 
 # c:\oss\winpt\src\wptVerifyList.cpp:77 c:\oss\winpt\src\wptVerifyList.cpp:85
-#: Src/wptVerifyList.cpp:99 Src/wptVerifyList.cpp:107
+#: Src/wptVerifyList.cpp:109
 msgid "Signed"
 msgstr "–¼‚µ‚Ü‚µ‚½"
 
+# c:\oss\winpt\src\wptMAPI.cpp:89
+#~ msgid "GPG Public Key of %s"
+#~ msgstr "GPGŒöŠJŒ®‚Ì %s"
+
+#~ msgid "Yes"
+#~ msgstr "‚Í‚¢"
+
+#~ msgid "No"
+#~ msgstr "‚¢‚¢‚¦"
+
+# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
+#~ msgid "Cancel"
+#~ msgstr "ƒLƒƒƒ“ƒZƒ‹"
+
 # c:\oss\winpt\src\wptKeyserver.cpp:438
 #, fuzzy
 #~ msgid "Proxy: none"
@@ -6055,10 +6081,6 @@
 #~ msgid "Please repeat the passphrase."
 #~ msgstr "ƒpƒXƒtƒŒ[ƒY‚ðÄ“x“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-# c:\oss\winpt\src\wptOwnertrustDlg.cpp:60
-#~ msgid "Please select a filename"
-#~ msgstr "ƒtƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
-
 # c:\oss\winpt\src\WinPT.cpp:217
 #~ msgid ""
 #~ "Please update your PTD.dll to the newest version, the version (%s) you "

Modified: trunk/README-0.11.txt
===================================================================
--- trunk/README-0.11.txt	2006-04-01 12:36:35 UTC (rev 193)
+++ trunk/README-0.11.txt	2006-04-01 12:36:58 UTC (rev 194)
@@ -41,6 +41,22 @@
 disk. That's all. Now you can start WinPT.
 
 
+Native language support
+~~~~~~~~~~~~~~~~~~~~~~~
+
+During the first start, WinPT asks for the preferred default language.
+But only if .mo files exist in the current directory.
+
+Steps to select a preferred language manually:
+(Example: German)
+- Copy de.mo to winpt.mo
+- Go to the GPG preferences dialog and select the locale folder.
+  This is the file the winpt.mo is stored in.
+- Confirm with OK.
+
+Now WinPT should output all texts in this language.
+
+
 Bugs
 ~~~~
 



More information about the Winpt-commits mailing list