[Winpt-commits] r208 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon May 1 14:22:26 CEST 2006
Author: twoaday
Date: 2006-05-01 14:22:18 +0200 (Mon, 01 May 2006)
New Revision: 208
Modified:
trunk/Include/wptCommonCtl.h
trunk/Include/wptContext.h
trunk/Include/wptGPG.h
trunk/Include/wptKeyCache.h
trunk/Include/wptKeylist.h
trunk/Include/wptVersion.h
trunk/NEWS
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/WinPT.cpp
trunk/Src/resource.h
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptClipVerifyDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptGPGME.cpp
trunk/Src/wptGPGUtil.cpp
trunk/Src/wptImportList.cpp
trunk/Src/wptKeyCache.cpp
trunk/Src/wptKeyCacheDlg.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyPropsDlg.cpp
trunk/Src/wptKeyRevokeDlg.cpp
trunk/Src/wptKeyRevokersDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/Src/wptKeyserverSearchDlg.cpp
trunk/Src/wptKeysigDlg.cpp
trunk/Src/wptListView.cpp
trunk/Src/wptMDSumDlg.cpp
trunk/Src/wptSigList.cpp
trunk/Src/wptSigTreeDlg.cpp
trunk/Src/wptVerifyList.cpp
trunk/Src/wptW32API.cpp
trunk/THANKS
trunk/TODO
trunk/configure.ac
Log:
See ChangeLog.
Modified: trunk/Include/wptCommonCtl.h
===================================================================
--- trunk/Include/wptCommonCtl.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptCommonCtl.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -65,7 +65,7 @@
};
typedef struct listview_ctrl_s * listview_ctrl_t;
-int listview_new (listview_ctrl_t *ctx);
+void listview_new (listview_ctrl_t *ctx, HWND ctrl);
void listview_release (listview_ctrl_t ctx);
int listview_add_column (listview_ctrl_t ctx, listview_column_t col);
int listview_add_item_pos (listview_ctrl_t ctx, int pos);
Modified: trunk/Include/wptContext.h
===================================================================
--- trunk/Include/wptContext.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptContext.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -47,6 +47,7 @@
int new_val; /* new value */
} callback;
char tmp_keyid[8+1];
+ int internal;
};
typedef struct winpt_key_s * winpt_key_t;
Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptGPG.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -236,10 +236,8 @@
gpgme_error_t gpg_get_photoid_data (const char *keyid, char **r_status_data,
unsigned char **r_data,
unsigned long *ndata);
-char* generate_revoke_input (int code, const char *cmt, const char *pass);
-gpgme_error_t gpg_revoke_cert (const char *inp_data,
- const char *keyid,
- char **r_revcert);
+gpgme_error_t gpg_revoke_cert (int desig_revoke, const char *inp_data,
+ const char *keyid, char **r_revcert);
gpgme_error_t gpg_decode_c_string (const char *src, char **destp, size_t len);
gpgme_error_t gpg_import_key_list (const char *fname, char **r_out);
gpgme_error_t gpg_extract_keys (const char *keyfile, const char **keys, DWORD nkeys,
Modified: trunk/Include/wptKeyCache.h
===================================================================
--- trunk/Include/wptKeyCache.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptKeyCache.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -22,6 +22,9 @@
#include <gpgme.h>
+struct gpg_desig_rev_s;
+typedef struct gpg_desig_rev_s *gpg_desig_rev_t;
+
/* key cache specific update flags. */
enum keycache_flag_t {
KC_FLAG_ADD = 1,
@@ -43,6 +46,8 @@
unsigned int revoked : 1;
gpgme_validity_t validity;
+ gpgme_key_sig_t signatures;
+
char *uid;
char *name;
char *comment;
@@ -71,6 +76,7 @@
char *pref_keyserver; /* if != NULL preferred keyserver. */
char *card_type; /* if != NULL key stored on smart card. */
struct native_uid_s *uids;
+ gpg_desig_rev_t rev; /* if != NULL list of desig revokers. */
};
struct gpg_keycache_s {
Modified: trunk/Include/wptKeylist.h
===================================================================
--- trunk/Include/wptKeylist.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptKeylist.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -88,8 +88,8 @@
};
/*-- keylist.c --*/
-const char* get_key_pubalgo2 (gpgme_pubkey_algo_t alg);
-const char* get_key_pubalgo (gpgme_pubkey_algo_t alg);
+const char* get_key_pubalgo2 (gpgme_pubkey_algo_t alg);
+const char* get_key_pubalgo (gpgme_pubkey_algo_t alg);
const char* get_key_algo( gpgme_key_t key, int keyidx );
const char* get_key_created( long timestamp );
const char* get_key_expire_date( long timestamp );
@@ -107,7 +107,7 @@
int count_userids (gpgme_key_t key);
gpgme_subkey_t get_nth_key (gpgme_key_t key, int idx);
int count_subkeys (gpgme_key_t key);
-gpgme_key_sig_t get_selfsig (gpgme_user_id_t uid, const char *keyid, int first);
+gpgme_key_sig_t get_selfsig (gpgme_key_sig_t sigs, const char *keyid, int first);
listview_ctrl_t keylist_load( HWND ctrl, gpg_keycache_t pubkc, gpg_keycache_t seckc,
int mode, int sortby );
Modified: trunk/Include/wptVersion.h
===================================================================
--- trunk/Include/wptVersion.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Include/wptVersion.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -36,7 +36,7 @@
/*-- WinPT.cpp --*/
extern HINSTANCE glob_hinst; /* Global HINSTANCE for tray window */
extern HWND glob_hwnd; /* Global HWND for tray window */
-extern HWND activ_hwnd; /* Active window HWND (dialog) */
+extern int admin_user;
extern int debug; /* Global debug mode */
extern int mobile_mode_active; /* Mobile mode activated? */
extern int scard_support; /* Smartcard support available? */
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/NEWS 2006-05-01 12:22:18 UTC (rev 208)
@@ -798,4 +798,13 @@
in the key edit dialog.
* Fix UTF8 problem in the designated revoker code.
-(0.11.13)
+
+Noteworthy changes in version 0.12.x (2006-xx-xx)
+=================================================
+(0.12.0)
+* Store sorting order in the Key Manager.
+* Correct the view of the user ID preferences.
+* Allow a designated revoker to issue a revocation certificate
+ for a key.
+* Rewrote parts of the cache to key list control association system.
+* Unified utf8 decoding system to avoid further problems.
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Po/de.po 2006-05-01 12:22:18 UTC (rev 208)
@@ -12,9 +12,9 @@
# BUG: GetOpenFileName needs \0\0. gettext does not support it.
msgid ""
msgstr ""
-"Project-Id-Version: WinPT 0.11.12\n"
+"Project-Id-Version: WinPT 0.11.13\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-22 20:08+0200\n"
+"POT-Creation-Date: 2006-04-29 19:32+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"
@@ -58,16 +58,16 @@
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyserver.cpp:541
#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
-#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
-#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
-#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
-#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
-#: Src/wptKeyserverDlg.cpp:717
+#: Src/wptKeyserverDlg.cpp:476 Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:541 Src/wptKeyserverDlg.cpp:652
+#: Src/wptKeyserverDlg.cpp:660 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:704 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:716
msgid "Keyserver"
msgstr "Schlüsselserver"
@@ -130,7 +130,7 @@
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:810
+#: Src/wptFileManagerDlg.cpp:814
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
@@ -185,7 +185,7 @@
msgstr ""
"Die Datei AUTHORS enthält eine Liste aller Co-Autoren und aller Beitragenden"
-#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1741
#: Src/wptMainProc.cpp:586
msgid "About WinPT"
msgstr "Über WinPT"
@@ -235,8 +235,8 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
-#: Src/wptKeyManagerDlg.cpp:947
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2156
+#: Src/wptKeyManagerDlg.cpp:962
msgid "&Help"
msgstr "&Hilfe"
@@ -321,15 +321,15 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:515
msgid "&Name"
msgstr "&Name"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "&Kommentar (optional)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "&Ablaufdatum"
@@ -337,11 +337,11 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Niemals"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "E-Mail-&Adresse"
@@ -353,7 +353,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1620
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1637
msgid "Card Key Generation"
msgstr "Karten-Schlüsselerzeugung"
@@ -382,7 +382,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1397
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -446,20 +446,20 @@
"OK zum Fortfahren oder Abbrechen"
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
-#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
-#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
+#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
+#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
+#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
msgid "user ID not found"
msgstr "Benutzerkennung nicht gefunden"
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
-#: Src/wptFileManager.cpp:1357
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1304
+#: Src/wptFileManager.cpp:1351
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -498,34 +498,34 @@
#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:274
-#: Src/wptKeyManager.cpp:752 Src/wptKeyManager.cpp:951 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:286
+#: Src/wptKeyManager.cpp:766 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
-#: Src/wptClipDecryptDlg.cpp:181
+#: Src/wptClipDecryptDlg.cpp:177
msgid "Signature Status: Created with a fully trusted key"
msgstr "Signatur Status: Erstellt mit einem vertraunswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:179
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:186
+#: Src/wptClipDecryptDlg.cpp:182
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr "Signatur Status: Erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:189
+#: Src/wptClipDecryptDlg.cpp:185
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem Schlüssel ohne definiertes Vertrauen"
-#: Src/wptClipDecryptDlg.cpp:196
+#: Src/wptClipDecryptDlg.cpp:192
msgid "WinPT Verify"
msgstr "WinPT Verifikation"
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:193
#, c-format
msgid ""
"%s\n"
@@ -547,7 +547,7 @@
msgid "Clipboard"
msgstr "Zwischenablage"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
msgid "File Open"
msgstr "Datei öffnen"
@@ -599,8 +599,8 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
-#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
+#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
@@ -626,12 +626,12 @@
#: 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:367 Src/wptKeyEditDlgs.cpp:455
-#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
-#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
-#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:539 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:284 Src/wptPassphraseCB.cpp:93
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -661,8 +661,8 @@
#: 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:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1082
+#: Src/wptFileManager.cpp:1098 Src/wptFileManager.cpp:1408
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signieren"
@@ -695,7 +695,7 @@
msgid "Signing key:"
msgstr "Signierer Schlüssel:"
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1203
msgid "No key was selected."
msgstr "Kein Schlüssel ausgewählt."
@@ -709,9 +709,9 @@
msgstr "PKA: Überprüfte Adresse des Unterzeichners ist '%s'"
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
-#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
-#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
-#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:209
+#: Src/wptClipVerifyDlg.cpp:241 Src/wptClipVerifyDlg.cpp:252
+#: Src/wptFileManager.cpp:1586 Src/wptFileManager.cpp:1639
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -719,7 +719,7 @@
msgid "Verify"
msgstr "Überprüfen"
-#: Src/wptClipVerifyDlg.cpp:206
+#: Src/wptClipVerifyDlg.cpp:203
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -732,19 +732,19 @@
"\n"
"Möchten Sie versuchen, den Schlüssel vom Schlüsselserver zu importieren?"
-#: Src/wptClipVerifyDlg.cpp:244
+#: Src/wptClipVerifyDlg.cpp:241
msgid "Invalid signature state."
msgstr "Ungültige Signatur."
-#: Src/wptClipVerifyDlg.cpp:254
+#: Src/wptClipVerifyDlg.cpp:251
msgid "Could not extract key or signature information."
msgstr "Konnte Schlüssel- oder Signaturinfos nicht extrahieren."
-#: Src/wptClipVerifyDlg.cpp:258
+#: Src/wptClipVerifyDlg.cpp:255
msgid "The signature is expired!"
msgstr "Die Signatur ist abgelaufen!"
-#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:289 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -763,36 +763,37 @@
msgid "Enter URL to retrieve the public key"
msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
-#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
-#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
-#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
-#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
-#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
-#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
-#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
-#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
-#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
-#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
-#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
-#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
-#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
-#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
-#: Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:893 Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:921 Src/wptKeyEditDlgs.cpp:951
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1034 Src/wptKeyEditDlgs.cpp:1052
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1105
+#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1326 Src/wptKeyEditDlgs.cpp:1333
+#: Src/wptKeyEditDlgs.cpp:1369 Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1383 Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1402 Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1449 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1462 Src/wptKeyEditDlgs.cpp:1467
+#: Src/wptKeyEditDlgs.cpp:1512 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1524 Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1534 Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1582 Src/wptKeyEditDlgs.cpp:1599
+#: Src/wptKeyEditDlgs.cpp:1619 Src/wptKeyEditDlgs.cpp:1627
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyEditDlgs.cpp:1769
+#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1818 Src/wptKeyEditDlgs.cpp:1940
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1958
+#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1993
+#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2007
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2025
+#: Src/wptKeyEditDlgs.cpp:2092 Src/wptKeyEditDlgs.cpp:2133
+#: Src/wptKeyEditDlgs.cpp:2146 Src/wptKeyEditDlgs.cpp:2160
+#: Src/wptKeyEditDlgs.cpp:2189 Src/wptKeyEditDlgs.cpp:2194
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1765
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -1003,12 +1004,12 @@
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
-#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
-#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
-#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:664
+#: Src/wptFileManager.cpp:809 Src/wptFileManager.cpp:924
+#: Src/wptFileManager.cpp:1493 Src/wptFileManager.cpp:1520
+#: Src/wptFileManager.cpp:1539 Src/wptFileManager.cpp:1790
+#: Src/wptFileManager.cpp:1852 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "Dateimanager"
@@ -1039,13 +1040,13 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1085
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
-#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1184
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Name"
@@ -1054,11 +1055,11 @@
msgid "Operation"
msgstr "Prozess"
-#: Src/wptFileManager.cpp:666
+#: Src/wptFileManager.cpp:663
msgid "Please select a file."
msgstr "Bitte eine Datei auswählen."
-#: Src/wptFileManager.cpp:813
+#: Src/wptFileManager.cpp:810
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1067,53 +1068,53 @@
"\"%s\" scheint keine Text-Datei zu sein.\n"
"Möchsten Sie wirklich diese Datei signieren?"
-#: Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:925
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" existiert nicht"
-#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1008 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Dateistatus"
-#: Src/wptFileManager.cpp:1055
+#: Src/wptFileManager.cpp:1052
msgid "Enter filename for encrypted file"
msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
-#: Src/wptFileManager.cpp:1084
+#: Src/wptFileManager.cpp:1081
msgid "Could not get default secret key."
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
+#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signieren"
-#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1125 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
-#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
+#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symmetrisch"
-#: Src/wptFileManager.cpp:1193
+#: Src/wptFileManager.cpp:1190
msgid "Encryption failed."
msgstr "Verschlüsselung fehlgeschlagen."
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "Korrekte Signatur"
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "Falsche Signatur"
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1231
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1124,24 +1125,24 @@
"%s von \"%s\"\n"
"%s"
-#: Src/wptFileManager.cpp:1241
+#: Src/wptFileManager.cpp:1236
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptFileManager.cpp:1319
+#: Src/wptFileManager.cpp:1313
msgid "Choose Filename for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1328
+#: Src/wptFileManager.cpp:1322
msgid "Please enter filename for plaintext file"
msgstr "Wählen Sie einen Namen für die Klartext-Datei"
-#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
+#: Src/wptFileManager.cpp:1360 Src/wptFileManager.cpp:1372
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: Src/wptFileManager.cpp:1372
+#: Src/wptFileManager.cpp:1366
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1150,7 +1151,7 @@
"Entshlüsselung fehlgeschlagen.\n"
"%s: existiert nicht."
-#: Src/wptFileManager.cpp:1379
+#: Src/wptFileManager.cpp:1373
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1161,41 +1162,41 @@
"\n"
"Wollen Sie diesen anstatt von '%s' benutzen?"
-#: Src/wptFileManager.cpp:1427
+#: Src/wptFileManager.cpp:1421
msgid "Enter filename for signed file"
msgstr "Wählen Sie einen Namen für die signierte Datei"
-#: Src/wptFileManager.cpp:1531
+#: Src/wptFileManager.cpp:1519
msgid "Could not find detached signature in the clipboard."
msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1551
+#: Src/wptFileManager.cpp:1539
msgid "No files to check."
msgstr "Keine Datei(en) zu pruefen."
-#: Src/wptFileManager.cpp:1568
+#: Src/wptFileManager.cpp:1556
msgid "Select Data File"
msgstr "Bitte Datendatei auswählen"
-#: Src/wptFileManager.cpp:1570
+#: Src/wptFileManager.cpp:1558
msgid "Selected Output File"
msgstr "Bitte Ausgabedatei auswählen"
-#: Src/wptFileManager.cpp:1598
+#: Src/wptFileManager.cpp:1586
msgid "Invalid file name. Exit"
msgstr "Ungültiger Dateiname. Abbruch"
-#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
-#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
-#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
-#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:459
-#: Src/wptKeyManager.cpp:587 Src/wptKeyserverDlg.cpp:223
+#: Src/wptFileManager.cpp:1684 Src/wptFileManager.cpp:1695
+#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
+#: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
+#: Src/wptKeyManager.cpp:460 Src/wptKeyManager.cpp:471
+#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:223
msgid "Import"
msgstr "Importieren"
-#: Src/wptFileManager.cpp:1704
+#: Src/wptFileManager.cpp:1692
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1207,58 +1208,58 @@
"\n"
"Kann diese(n) Schlüssel nicht importieren!"
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
+#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
+#: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
msgid "No key was selected for export."
msgstr "Kein Schlüssel zum Exportieren ausgewählt."
-#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1718 Src/wptFileManager.cpp:1741
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
-#: Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG Status"
-#: Src/wptFileManager.cpp:1757
+#: Src/wptFileManager.cpp:1745
#, c-format
msgid "Finished (Output: %s)"
msgstr "Fertig (Ausgabe: %s)"
-#: Src/wptFileManager.cpp:1803
+#: Src/wptFileManager.cpp:1791
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManager.cpp:1863
+#: Src/wptFileManager.cpp:1851
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "Verschlüsseln in eine ZIP-Datei macht nur mit mehreren Dateien Sinn"
-#: Src/wptFileManager.cpp:1868
+#: Src/wptFileManager.cpp:1856
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1938
+#: Src/wptFileManager.cpp:1926
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1941
+#: Src/wptFileManager.cpp:1929
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1929 Src/wptFileManager.cpp:1936
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1936
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
@@ -1287,12 +1288,12 @@
msgstr "Bitte wählen Sie wenigstens einen Empfänger."
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:412
+#: Src/wptKeyManager.cpp:424
msgid "No valid OpenPGP data found."
msgstr "Keine gültigen OpenPGP-Daten gefunden."
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:437
+#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr "Schlüsselimport"
@@ -1302,7 +1303,7 @@
msgstr "%s enthält %d Schlüssel."
#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
@@ -1338,18 +1339,18 @@
msgid "Signature mode"
msgstr "Signaturmodus"
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
-#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:787
+#: Src/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1511
+#: Src/wptKeyManagerDlg.cpp:1527 Src/wptKeyManagerDlg.cpp:1555
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1366,12 +1367,12 @@
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
-#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
msgid "View"
msgstr "Ansicht"
@@ -1391,8 +1392,8 @@
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:993
msgid "&Sign"
msgstr "&Signieren"
@@ -1472,27 +1473,27 @@
msgstr "Digest &berechnen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:762
+#: Src/wptFileManagerDlg.cpp:766
msgid "Are you sure you want to secure delete these files?"
msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Ja"
-#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Nein"
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:811
msgid "Operation Status: Error"
msgstr "Prozess-Status: Fehler"
-#: Src/wptFileManagerDlg.cpp:808
+#: Src/wptFileManagerDlg.cpp:812
msgid "Operation Status: Done."
msgstr "Prozess-Status: Fertig."
-#: Src/wptFileManagerDlg.cpp:851
+#: Src/wptFileManagerDlg.cpp:855
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1592,7 +1593,7 @@
#: 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:1762 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyManagerDlg.cpp:955
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1661,35 +1662,35 @@
msgid "No GPG error description available."
msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
-#: Src/wptGPGME.cpp:313
+#: Src/wptGPGME.cpp:318
msgid "Error during verification process."
msgstr "Fehler während Verifikation."
-#: Src/wptGPGME.cpp:314
+#: Src/wptGPGME.cpp:319
msgid "The signature is good."
msgstr "Die Signatur is gut."
-#: Src/wptGPGME.cpp:315
+#: Src/wptGPGME.cpp:320
msgid "The signature is BAD!"
msgstr "Die Signatur ist nicht gültig!"
-#: Src/wptGPGME.cpp:316
+#: Src/wptGPGME.cpp:321
msgid "The signature could not be checked due to a missing key."
msgstr "Die Signature könnte durch einen fehlenden Key nicht geprüft werden."
-#: Src/wptGPGME.cpp:317
+#: Src/wptGPGME.cpp:322
msgid "No valid OpenPGP signature."
msgstr "Keine gültige OpenPGP Signatur."
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:323
msgid "Signature Error"
msgstr "Fehler in Signatur"
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:324
msgid "Good Signature (Expired Key)"
msgstr "Gültige Signature (Abgelaufener Schlüssel)"
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:325
msgid "Good Signature (Revoked Key)"
msgstr "Gültige Signatur (Widerrufener Schlüssel)"
@@ -1731,7 +1732,7 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1646
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1663
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
@@ -1811,36 +1812,36 @@
msgstr "Wählen Sie GPG.EXE Datei aus"
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:154 Src/wptKeyManager.cpp:159
-#: Src/wptKeyManager.cpp:210 Src/wptKeyManager.cpp:253
-#: Src/wptKeyManager.cpp:265 Src/wptKeyManager.cpp:296
-#: Src/wptKeyManager.cpp:301 Src/wptKeyManager.cpp:308
-#: Src/wptKeyManager.cpp:310 Src/wptKeyManager.cpp:331
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:344
-#: Src/wptKeyManager.cpp:364 Src/wptKeyManager.cpp:405
-#: Src/wptKeyManager.cpp:410 Src/wptKeyManager.cpp:413
-#: Src/wptKeyManager.cpp:418 Src/wptKeyManager.cpp:424
-#: Src/wptKeyManager.cpp:429 Src/wptKeyManager.cpp:557
-#: Src/wptKeyManager.cpp:565 Src/wptKeyManager.cpp:671
-#: Src/wptKeyManager.cpp:700 Src/wptKeyManager.cpp:709
-#: Src/wptKeyManager.cpp:720 Src/wptKeyManager.cpp:746
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:780
-#: Src/wptKeyManager.cpp:804 Src/wptKeyManager.cpp:809
-#: Src/wptKeyManager.cpp:829 Src/wptKeyManager.cpp:884
-#: Src/wptKeyManager.cpp:889 Src/wptKeyManager.cpp:949
-#: Src/wptKeyManager.cpp:979 Src/wptKeyManager.cpp:1068
-#: Src/wptKeyManagerDlg.cpp:1162 Src/wptKeyManagerDlg.cpp:1175
-#: Src/wptKeyManagerDlg.cpp:1185 Src/wptKeyManagerDlg.cpp:1473
-#: Src/wptKeyManagerDlg.cpp:1495 Src/wptKeyManagerDlg.cpp:1510
-#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeyManagerDlg.cpp:1528
-#: Src/wptKeyManagerDlg.cpp:1538 Src/wptKeyManagerDlg.cpp:1544
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyManagerDlg.cpp:1616
-#: Src/wptKeyManagerDlg.cpp:1675 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
-#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
-#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:168 Src/wptKeyManager.cpp:173
+#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:265
+#: Src/wptKeyManager.cpp:277 Src/wptKeyManager.cpp:308
+#: Src/wptKeyManager.cpp:313 Src/wptKeyManager.cpp:320
+#: Src/wptKeyManager.cpp:322 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:352 Src/wptKeyManager.cpp:356
+#: Src/wptKeyManager.cpp:376 Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:422 Src/wptKeyManager.cpp:425
+#: Src/wptKeyManager.cpp:430 Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:441 Src/wptKeyManager.cpp:569
+#: Src/wptKeyManager.cpp:577 Src/wptKeyManager.cpp:683
+#: Src/wptKeyManager.cpp:714 Src/wptKeyManager.cpp:723
+#: Src/wptKeyManager.cpp:734 Src/wptKeyManager.cpp:760
+#: Src/wptKeyManager.cpp:787 Src/wptKeyManager.cpp:792
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManager.cpp:821
+#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:891
+#: Src/wptKeyManager.cpp:896 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:982 Src/wptKeyManager.cpp:1069
+#: Src/wptKeyManagerDlg.cpp:1178 Src/wptKeyManagerDlg.cpp:1191
+#: Src/wptKeyManagerDlg.cpp:1201 Src/wptKeyManagerDlg.cpp:1490
+#: Src/wptKeyManagerDlg.cpp:1512 Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyManagerDlg.cpp:1537 Src/wptKeyManagerDlg.cpp:1545
+#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1561
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyManagerDlg.cpp:1633
+#: Src/wptKeyManagerDlg.cpp:1692 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1715 Src/wptKeyManagerDlg.cpp:1720
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1925
+#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:289
+#: Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:372 Src/wptKeysigDlg.cpp:420
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1915,68 +1916,69 @@
msgid "Unknown Hotkey"
msgstr "Unbekanntes Tastenkürzel"
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
-#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
-#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
-#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
+#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:255
+#: Src/wptKeyEditDlgs.cpp:1156 Src/wptKeyEditDlgs.cpp:1214
+#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1522 Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeylist.cpp:420 Src/wptKeylist.cpp:454
+#: Src/wptKeyPropsDlg.cpp:163 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:213
msgid "Revoked"
msgstr "Widerrufen"
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
-#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
-#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
+#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
+#: Src/wptKeyEditDlgs.cpp:1154 Src/wptKeyEditDlgs.cpp:1380
+#: Src/wptKeylist.cpp:422 Src/wptKeylist.cpp:452 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:214
msgid "Expired"
msgstr "Abgelaufen"
-#: Src/wptImportList.cpp:268
+#: Src/wptImportList.cpp:272
msgid "secret key"
msgstr "geheimer Schlüssel"
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
-#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
+#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:575 Src/wptKeylist.cpp:583
+#: Src/wptKeyManagerDlg.cpp:872 Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:52
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr "Benutzerkennung"
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
-#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
+#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
-#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1082
+#: Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584 Src/wptKeyManagerDlg.cpp:873
+#: Src/wptKeyManagerDlg.cpp:964 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:56
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
-#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
-#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1083
+#: Src/wptKeyEditDlgs.cpp:1186 Src/wptKeylist.cpp:590
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
msgid "Creation"
msgstr "Erstellung"
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
+#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
msgid "Type"
msgstr "Typ"
# c:\oss\winpt-gpgme\src\wptImportList.cpp:424
-#: Src/wptImportList.cpp:426
+#: Src/wptImportList.cpp:418
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
"and thus a CRC error occurs."
@@ -1985,40 +1987,40 @@
"und deshalb ein CRC Fehler auftrat."
# c:\oss\winpt-gpgme\src\wptKeyCache.cpp:479
-#: Src/wptKeyCache.cpp:655
+#: Src/wptKeyCache.cpp:747
msgid "Load GPG Keyrings..."
msgstr "Lade GPG Schlüsselbunde..."
-#: Src/wptKeyCacheDlg.cpp:53
+#: Src/wptKeyCacheDlg.cpp:52
msgid "WinPT Key Caching"
msgstr "WinPT Schlüssel Caching"
-#: Src/wptKeyCacheDlg.cpp:56
+#: Src/wptKeyCacheDlg.cpp:55
msgid "Caching keyrings, please wait..."
msgstr "Lade Schlüssebund, bitte warten..."
-#: Src/wptKeyCacheDlg.cpp:69
+#: Src/wptKeyCacheDlg.cpp:70
msgid "Key Cache"
msgstr "Schlüsselcache"
-#: Src/wptKeyEditDlgs.cpp:234
+#: Src/wptKeyEditDlgs.cpp:228
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
+#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1158
msgid "OK"
msgstr "OK"
-#: Src/wptKeyEditDlgs.cpp:288
+#: Src/wptKeyEditDlgs.cpp:281
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:289
+#: Src/wptKeyEditDlgs.cpp:282
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2028,7 +2030,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:364
+#: Src/wptKeyEditDlgs.cpp:354
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
@@ -2039,7 +2041,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:355
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2047,35 +2049,35 @@
"Bitte ein Bild auswählen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
-#: Src/wptKeysignDlg.cpp:286
+#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:368
+#: Src/wptKeyEditDlgs.cpp:358
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:383
+#: Src/wptKeyEditDlgs.cpp:373
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
-#: Src/wptKeyEditDlgs.cpp:926
+#: Src/wptKeyEditDlgs.cpp:377 Src/wptKeyEditDlgs.cpp:387
+#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:915
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:378
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyRevokeDlg.cpp:173
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:401
+#: Src/wptKeyEditDlgs.cpp:391
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2083,146 +2085,146 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:420
+#: Src/wptKeyEditDlgs.cpp:410
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
-#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
-#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:564 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1642 Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "GnuPG-Status"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:350
-#: Src/wptKeyEditDlgs.cpp:452
+#: Src/wptKeyEditDlgs.cpp:442
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-"Hinzufügen eines \"Widerrufers\" kann nicht mehr\n"
+"Hinzufügen eines Widerrufers kann nicht mehr\n"
"rückgängig gemacht werden."
-#: Src/wptKeyEditDlgs.cpp:453
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
-#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
msgid "Add Revoker"
-msgstr "\"Wiederrufer\" hinzufügen"
+msgstr "Wiederrufer hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
-#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1574 Src/wptKeyEditDlgs.cpp:1619
+#: Src/wptKeyEditDlgs.cpp:1769 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1993
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:490
+#: Src/wptKeyEditDlgs.cpp:480
msgid "Revoker successfully addded."
msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:524
+#: Src/wptKeyEditDlgs.cpp:514
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:526
+#: Src/wptKeyEditDlgs.cpp:516
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:527
+#: Src/wptKeyEditDlgs.cpp:517
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:533
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
-#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
-#: Src/wptKeyEditDlgs.cpp:573
+#: Src/wptKeyEditDlgs.cpp:534 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:562
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:539
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
"Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
-#: Src/wptKeyEditDlgs.cpp:552
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:575
+#: Src/wptKeyEditDlgs.cpp:564
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:853
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:661
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr "Schlüssel-Typ"
-#: Src/wptKeyEditDlgs.cpp:662
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:663
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:709
+#: Src/wptKeyEditDlgs.cpp:698
msgid "Please select one entry."
msgstr "Bitte wählen Sie einen Eintrag aus."
-#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
-#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:715
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
-#: Src/wptKeyEditDlgs.cpp:750
+#: Src/wptKeyEditDlgs.cpp:739
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
-#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
-#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
-#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
-#: Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:767 Src/wptKeyEditDlgs.cpp:835
+#: Src/wptKeyEditDlgs.cpp:914 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:1026 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1506
+#: Src/wptKeyManagerDlg.cpp:1544
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:786
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:904
+#: Src/wptKeyEditDlgs.cpp:893
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
msgid "Key status changed."
msgstr "Schlüsselstatus geändert."
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1032
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2230,15 +2232,15 @@
"Kann das Passwort das Schlüssels nicht ändern, da der \n"
"Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
-#: Src/wptKeyEditDlgs.cpp:1050
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1050 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2246,44 +2248,44 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1062
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1064
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1095
+#: Src/wptKeyEditDlgs.cpp:1084
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
msgid "Could not find key."
msgstr "Konnte Schlüssel nicht finden."
-#: Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1105
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
-#: Src/wptKeyManagerDlg.cpp:862
+#: Src/wptKeyEditDlgs.cpp:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
+#: Src/wptKeyManagerDlg.cpp:877
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1200
+#: Src/wptKeyEditDlgs.cpp:1185
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1198
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1280
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2305,13 +2307,14 @@
"SIGN\t \t\tsign a user-id (exportable)\r\n"
"LSIGN\t \t\tsign a user-id (non-exportable)\r\n"
"CLEAN \t\tremove unusable signatures from key\r\n"
+"MINIMIZE \t\tremove all signatures from key\r\n"
msgstr ""
"ADDUID\t\t\tBenutzerkennung hinzufügen\r\n"
"ADDPHOTO \t\tFoto ID hinzufügen\r\n"
"DELUID \t\tBenutzerkennung löschen\r\n"
"ADDKEY \t\tSekundären Schlüssel hinzufügen\r\n"
"DELKEY \t\tSekundären Schlüssel löschen\r\n"
-"ADDREVOKER\t\tWiderrufszertifikat hinzufügen\r\n"
+"ADDREVOKER\t\tWiderrufer hinzufügen\r\n"
"EXPIRE\t\t\tAblaufdatum ändern\r\n"
"UPDPREF \t\tEigenschaften geändert\r\n"
"PASSWD \t\tPasswort ändern\r\n"
@@ -2324,20 +2327,21 @@
"SIGN\t \t\tBenutzerkennung signieren (exportierbar)\r\n"
"LSIGN\t \t\tBenutzerkennung signieren (nicht-exportierbar)\r\n"
"CLEAN \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
+"MINIMIZE \t\tEntferne alle Signaturen vom Schlüssel\r\n"
-#: Src/wptKeyEditDlgs.cpp:1328
+#: Src/wptKeyEditDlgs.cpp:1302
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1326
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1334
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2354,15 +2358,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1346
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1376
+#: Src/wptKeyEditDlgs.cpp:1350
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1407
+#: Src/wptKeyEditDlgs.cpp:1381
msgid ""
"Key already expired.\n"
"\n"
@@ -2372,19 +2376,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
+#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1393
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1416
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1422
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1453
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2396,31 +2400,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1462
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1511
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1533
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1512
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1523
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1529
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2430,47 +2434,47 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1579
+#: Src/wptKeyEditDlgs.cpp:1553
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1557
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1599
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1665
+#: Src/wptKeyEditDlgs.cpp:1639
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1668
+#: Src/wptKeyEditDlgs.cpp:1642
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1736
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1740
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1763
+#: Src/wptKeyEditDlgs.cpp:1742
msgid "user ID:"
msgstr "Benutzerkennung:"
-#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1815
+#: Src/wptKeyEditDlgs.cpp:1802
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1826
+#: Src/wptKeyEditDlgs.cpp:1813
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2485,44 +2489,66 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1846
+#: Src/wptKeyEditDlgs.cpp:1833
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeyEditDlgs.cpp:1837
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1955
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
msgid "Finished to compact key."
msgstr "Schlüssel erfolgreich bearbeitet."
-#: Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:1997
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:2074
+#: Src/wptKeyEditDlgs.cpp:2084
+#, c-format
+msgid ""
+"Your keys is listed as a designated revoker for the key\n"
+"\n"
+"%s\n"
+"\n"
+"Are you sure you want to create a revocation certificate\n"
+"which allow to revoke the key listed above?"
+msgstr ""
+"Ihr Schlüssel ist gelistet als vorgesehener Widerrufer\n"
+"\n"
+"%s\n"
+"\n"
+"Sind Sie wirklich sicher das sie ein Widerrufzertifikat\n"
+"erstellen wollen welches es erlaubt den gelisteten Schlüssel\n"
+"zu widerrufen?"
+
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2087
+#: Src/wptKeyEditDlgs.cpp:2145
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:2096
+#: Src/wptKeyEditDlgs.cpp:2154
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2157
+msgid "&Revoke..."
+msgstr "Widerrufen..."
+
+#: Src/wptKeyEditDlgs.cpp:2189
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2193
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"
@@ -2561,8 +2587,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
-#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2581,11 +2607,11 @@
msgstr "Schlüsselerzeugung - Fortschrittsdialog"
#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
-#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
-#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
-#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:408 Src/wptKeygenDlg.cpp:413
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:423 Src/wptKeygenDlg.cpp:430
+#: Src/wptKeygenDlg.cpp:438 Src/wptKeygenDlg.cpp:452 Src/wptKeygenDlg.cpp:461
+#: Src/wptKeygenDlg.cpp:486 Src/wptKeygenDlg.cpp:582
+#: Src/wptKeyManagerDlg.cpp:1624 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
@@ -2648,7 +2674,7 @@
msgid "RSA and RSA (PGP)"
msgstr "RSA und RSA (PGP)"
-#: Src/wptKeygenDlg.cpp:370
+#: Src/wptKeygenDlg.cpp:371
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
@@ -2656,70 +2682,70 @@
"Die Schlüsselerstellung kann eine Weile dauern! Bitte warten Sie, bis eine "
"Meldung über die Beendigung der Schlüsselerzeugung erscheint."
-#: Src/wptKeygenDlg.cpp:372
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr "&Schlüsselgröße in Bits"
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "&Ihr Name"
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr "Schlüssel &Typ"
-#: Src/wptKeygenDlg.cpp:406
+#: Src/wptKeygenDlg.cpp:407
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Ungültige Eingabe. Erlaubte Werte sind 1024-4096 Bit."
-#: Src/wptKeygenDlg.cpp:411
+#: Src/wptKeygenDlg.cpp:412
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:559
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
msgid "Please do not enter the email address in the name field."
msgstr "Bitte geben Sie nicht die E-Mail-Adresse im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
+#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:571
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
-#: Src/wptKeygenDlg.cpp:434
+#: Src/wptKeygenDlg.cpp:437
msgid "Please do NOT enter the email address in the comment field."
msgstr "Bitte geben Sie die E-Mail-Adresse NICHT im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:460 Src/wptKeyRevokeDlg.cpp:181
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:532
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:533
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:534
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:535
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:536
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -2730,7 +2756,7 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:537
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -2741,17 +2767,17 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
-#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeygenDlg.cpp:538 Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:572 Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeyManagerDlg.cpp:1647
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:540
msgid "E&xpert"
msgstr "E&xperte"
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:577
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2803,54 +2829,54 @@
msgid "No keys updated."
msgstr "Kein(e) Schlüssel aktualisiert."
-#: Src/wptKeylist.cpp:252
+#: Src/wptKeylist.cpp:260
msgid "Key Pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:254
+#: Src/wptKeylist.cpp:262
msgid "Key Pair (Card)"
msgstr "Schlüsselpaar (Karte)"
-#: Src/wptKeylist.cpp:255
+#: Src/wptKeylist.cpp:263
msgid "Public Key"
msgstr "Öffentlicher Schlüssel"
-#: Src/wptKeylist.cpp:353
+#: Src/wptKeylist.cpp:380
msgid "None"
msgstr "Keine"
-#: Src/wptKeylist.cpp:357
+#: Src/wptKeylist.cpp:384
msgid "Marginal"
msgstr "Marginal"
# c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:360
+#: Src/wptKeylist.cpp:387
msgid "Full"
msgstr "Voll"
-#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr "Inaktiv"
-#: Src/wptKeylist.cpp:433
+#: Src/wptKeylist.cpp:460
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
-#: Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
+#: Src/wptKeyManagerDlg.cpp:965
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Vertrauen"
-#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:762 Src/wptPassphraseCB.cpp:124
msgid "Invalid User ID"
msgstr "Ungültige Benutzerkennung"
-#: Src/wptKeylist.cpp:1007
+#: Src/wptKeylist.cpp:1030
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2865,11 +2891,11 @@
"\n"
"\"%s\" trotzdem benutzen?"
-#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1038 Src/wptKeylist.cpp:1100
msgid "Recipients"
msgstr "Empfänger"
-#: Src/wptKeylist.cpp:1080
+#: Src/wptKeylist.cpp:1101
#, c-format
msgid ""
"KeyID %s.\n"
@@ -2878,11 +2904,11 @@
"Schlüssel ID %s.\n"
"Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
-#: Src/wptKeylist.cpp:1182
+#: Src/wptKeylist.cpp:1203
msgid "Secret Key List"
msgstr "Liste der geheimen Schlüssel"
-#: Src/wptKeyManager.cpp:153
+#: Src/wptKeyManager.cpp:167
msgid ""
"This key has expired!\n"
"Key check failed."
@@ -2890,7 +2916,7 @@
"Dieser Schlüssel ist abgelaufen!\n"
"Schlüsselüberprüfung fehlgeschlagen."
-#: Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:172
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
@@ -2898,25 +2924,25 @@
"Dieser Schlüssel wurde vom Besitzer widerrufen!\n"
"Schlüsselüberprüfung fehlgeschlagen."
-#: Src/wptKeyManager.cpp:300
+#: Src/wptKeyManager.cpp:312
msgid "Only one secret key can be exported."
msgstr "Nur ein geheimer Schlüssel kann exportiert werden."
-#: Src/wptKeyManager.cpp:311
+#: Src/wptKeyManager.cpp:323
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr "Geheimer Schlüssel gespeichert in '%s'."
-#: Src/wptKeyManager.cpp:345
+#: Src/wptKeyManager.cpp:357
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr "Schlüssel erfolgreich in '%s' gespeichert."
-#: Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:429
msgid "No valid OpenPGP keys found."
msgstr "Keine gültigen OpenPGP-Schlüssel gefunden."
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:434
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
@@ -2924,11 +2950,11 @@
"Der Schlüssel ist \"dash escaped\".\n"
"Möchten Sie den Schlüssel extrahieren?"
-#: Src/wptKeyManager.cpp:428
+#: Src/wptKeyManager.cpp:440
msgid "Cannot import dash escaped OpenPGP keys."
msgstr "Kann keine beschädigten OpenPGP-Schlüssel importieren."
-#: Src/wptKeyManager.cpp:457 Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:469 Src/wptKeyManager.cpp:597
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -2936,43 +2962,43 @@
"Schlüssel ohne Eigensignatur erkannt!\n"
"(Dieser Schlüssel ist für Verschlüsselung, etc. NICHT verwendbar)\n"
-#: Src/wptKeyManager.cpp:486 Src/wptKeyManager.cpp:493
-#: Src/wptKeyManager.cpp:502
+#: Src/wptKeyManager.cpp:498 Src/wptKeyManager.cpp:505
+#: Src/wptKeyManager.cpp:514
msgid "Key Import HTTP"
msgstr "Schlüssel Import HTTP"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:448
-#: Src/wptKeyManager.cpp:486
+#: Src/wptKeyManager.cpp:498
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr "Ungültige HTTP URL: %s"
-#: Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:515
#, c-format
msgid "Could not fetch key from URL: %s"
msgstr "Konnte Schlüssel von der URL: %s nicht runterladen"
-#: Src/wptKeyManager.cpp:532
+#: Src/wptKeyManager.cpp:544
msgid "Choose Name of the Key File"
msgstr "Namen der Schlüsseldatei auswählen"
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:557
msgid "File Import"
msgstr "Dateiimport"
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:568
msgid "Could not read key-data from file."
msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
-#: Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:688
msgid "Do you really want to confirm each key?"
msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
-#: Src/wptKeyManager.cpp:677
+#: Src/wptKeyManager.cpp:689
msgid "Delete Confirmation"
msgstr "Löschen Bestätigen"
-#: Src/wptKeyManager.cpp:701
+#: Src/wptKeyManager.cpp:715
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2984,7 +3010,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:710
+#: Src/wptKeyManager.cpp:724
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3001,7 +3027,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:717
+#: Src/wptKeyManager.cpp:731
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3011,265 +3037,265 @@
"Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
"Schlüssel werden gelöscht.\n"
-#: Src/wptKeyManager.cpp:781
+#: Src/wptKeyManager.cpp:793
#, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "Wollen Sie '0x%s' wirklich zum Schlüsselserver %s senden?"
-#: Src/wptKeyManager.cpp:803
+#: Src/wptKeyManager.cpp:815
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:890
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:888
+#: Src/wptKeyManager.cpp:895
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:974
+#: Src/wptKeyManager.cpp:977
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
-#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:89
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:87
msgid "0. No reason specified"
msgstr "0. Kein Grund angeben"
-#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:90
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:88
msgid "1. Key has been compromised"
msgstr "1. Der Schlüssel ist nicht mehr sicher"
-#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:91
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:89
msgid "2. Key is superseded"
msgstr "2. Der Schlüssel ist veraltet"
-#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:92
+#: Src/wptKeyManager.cpp:1049 Src/wptKeyRevokeDlg.cpp:90
msgid "3. Key is no longer used"
msgstr "3. Der Schlüssel wird nicht mehr benutzt"
-#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:449 Src/wptKeyManagerDlg.cpp:985
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
-#: Src/wptKeyManagerDlg.cpp:456
+#: Src/wptKeyManagerDlg.cpp:470
#, c-format
msgid "Default Key: %s"
msgstr "Standardschlüssel: %s"
-#: Src/wptKeyManagerDlg.cpp:458
+#: Src/wptKeyManagerDlg.cpp:472
#, c-format
msgid "Default Key: 0x%s"
msgstr "Standardschlüssel: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:479
+#: Src/wptKeyManagerDlg.cpp:493
#, c-format
msgid "%d secret keys"
msgstr "%d geheime Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:480
+#: Src/wptKeyManagerDlg.cpp:494
#, c-format
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyManagerDlg.cpp:930
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:919
+#: Src/wptKeyManagerDlg.cpp:934
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyManagerDlg.cpp:936
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:922
+#: Src/wptKeyManagerDlg.cpp:937
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:923
+#: Src/wptKeyManagerDlg.cpp:938
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:924
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:940
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:927
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:943
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1549
+#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:936
+#: Src/wptKeyManagerDlg.cpp:951
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:952
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeysigDlg.cpp:405
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:957
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:958
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:959
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:960
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:982
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:983
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:984
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:995
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:997
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:999
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Revoker..."
msgstr "Widerrufer..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1173
+#: Src/wptKeyManagerDlg.cpp:1189
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3277,90 +3303,90 @@
"Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
"Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
-#: Src/wptKeyManagerDlg.cpp:1184
+#: Src/wptKeyManagerDlg.cpp:1200
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:1301
+#: Src/wptKeyManagerDlg.cpp:1318
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1305
+#: Src/wptKeyManagerDlg.cpp:1322
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1309
+#: Src/wptKeyManagerDlg.cpp:1326
msgid "Delete key from keyring"
msgstr "Schlüssel aus Keyring löschen"
-#: Src/wptKeyManagerDlg.cpp:1313
+#: Src/wptKeyManagerDlg.cpp:1330
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1317
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1321
+#: Src/wptKeyManagerDlg.cpp:1338
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1325
+#: Src/wptKeyManagerDlg.cpp:1342
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1329
+#: Src/wptKeyManagerDlg.cpp:1346
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1333
+#: Src/wptKeyManagerDlg.cpp:1350
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1460
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1503 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
+#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeysignDlg.cpp:258
+#: Src/wptKeysignDlg.cpp:273 Src/wptKeysignDlg.cpp:353
+#: Src/wptKeysignDlg.cpp:368 Src/wptKeysignDlg.cpp:385
+#: Src/wptKeysignDlg.cpp:390 Src/wptKeysignDlg.cpp:392
msgid "Key Signing"
msgstr "Schlüsselsignierung"
-#: Src/wptKeyManagerDlg.cpp:1519
+#: Src/wptKeyManagerDlg.cpp:1536
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyRevokeDlg.cpp:72
-#: Src/wptKeyRevokeDlg.cpp:82 Src/wptKeyRevokeDlg.cpp:145
-#: Src/wptKeyRevokeDlg.cpp:150 Src/wptKeyRevokeDlg.cpp:158
-#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:174
+#: Src/wptKeyManagerDlg.cpp:1550 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:169
+#: Src/wptKeyRevokeDlg.cpp:174 Src/wptKeyRevokeDlg.cpp:182
+#: Src/wptKeyRevokeDlg.cpp:191 Src/wptKeyRevokeDlg.cpp:196
msgid "Key Revocation Cert"
msgstr "Schlüsselwiderruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:1543
+#: Src/wptKeyManagerDlg.cpp:1560
msgid "It does not make any sense with a key pair!"
msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
-#: Src/wptKeyManagerDlg.cpp:1560
+#: Src/wptKeyManagerDlg.cpp:1577
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1575 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1585
+#: Src/wptKeyManagerDlg.cpp:1602
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3369,27 +3395,27 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1615
+#: Src/wptKeyManagerDlg.cpp:1632
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1638 Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyManagerDlg.cpp:1655 Src/wptKeyserverDlg.cpp:584
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
-#: Src/wptKeyManagerDlg.cpp:1655
+#: Src/wptKeyManagerDlg.cpp:1672
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
-#: Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1714
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:1702
+#: Src/wptKeyManagerDlg.cpp:1719
msgid "You can only export one secret key."
msgstr "Sie können nur einen geheimen Schlüssel exportieren."
-#: Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1724
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3407,11 +3433,11 @@
"\n"
"Wirklich den Schlüssel exportieren?"
-#: Src/wptKeyManagerDlg.cpp:1712
+#: Src/wptKeyManagerDlg.cpp:1729
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1775
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
@@ -3419,8 +3445,8 @@
msgid "I trust ultimately (implicit)"
msgstr "(Implizites) Absolutes Vertrauen"
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
-#: Src/wptVerifyList.cpp:245
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:224
msgid "Unknown"
msgstr "Unbekannt"
@@ -3498,27 +3524,27 @@
msgid "Ownertrust successfully changed."
msgstr "Besitzervertrauen erfolgreich geändert."
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
msgid "Key Revokers"
msgstr "Schlüsselwiderrufer"
-#: Src/wptKeyRevokeDlg.cpp:84
+#: Src/wptKeyRevokeDlg.cpp:82
msgid "Reason for revocation"
msgstr "Grund des Widerrufes"
-#: Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyRevokeDlg.cpp:83
msgid "Optional description text"
msgstr "Optionale Beschreibung"
-#: Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyRevokeDlg.cpp:84
msgid "&Passphrase"
msgstr "&Passwort"
-#: Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyRevokeDlg.cpp:85
msgid "Output file"
msgstr "Ausgabedatei"
-#: Src/wptKeyRevokeDlg.cpp:112
+#: Src/wptKeyRevokeDlg.cpp:136
msgid ""
"Please move this certificate to a medium where it can bestored in a safe "
"place (floppy, CDR, etc..).\n"
@@ -3530,31 +3556,31 @@
"Wenn jemand darauf Zugriff bekommt, kann er Ihren Schlüssel unbrauchbar "
"machen!"
-#: Src/wptKeyRevokeDlg.cpp:135
+#: Src/wptKeyRevokeDlg.cpp:159
msgid "Choose File to save the Certificate"
msgstr "Dateinamen für Zertifikat auswählen"
-#: Src/wptKeyRevokeDlg.cpp:144
+#: Src/wptKeyRevokeDlg.cpp:168
msgid "Please select a reason."
msgstr "Bitte geben Sie einen Grund an."
-#: Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyRevokeDlg.cpp:195
msgid "Revocation certificate generated."
msgstr "Widerrufzertifikat wurde erstellt."
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:57
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
msgid "Algorithm"
msgstr "Algorithmus"
-#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
+#: Src/wptKeyRevokersDlg.cpp:121 Src/wptKeyRevokersDlg.cpp:175
msgid "Designated Key Revokers"
msgstr "Designierte Schlüsselwiderrufer"
-#: Src/wptKeyRevokersDlg.cpp:147
+#: Src/wptKeyRevokersDlg.cpp:161
msgid "Designated Revoker Keys"
msgstr "Liste der Schlüsselwiderrufer"
-#: Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyRevokersDlg.cpp:176
#, 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?"
@@ -3673,85 +3699,85 @@
msgid "Port"
msgstr "Port"
-#: Src/wptKeyserverDlg.cpp:476
+#: Src/wptKeyserverDlg.cpp:475
msgid "No space for new keyserver entry"
msgstr "Kein Platz für neuen Keserver-Eintrag"
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:496
msgid "HKP Keyserver"
msgstr "HKP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:497
msgid "LDAP Keyserver"
msgstr "LDAP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:498
msgid "Finger Keyserver"
msgstr "Finger-Keyserver"
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:758
+#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:757
msgid "Edit Keyserver"
msgstr "Editiere Keyserver"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
msgid "&Add"
msgstr "&Hinzufügen"
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:526
msgid "Type:"
msgstr "Typ:"
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:527
msgid "Port:"
msgstr "Port:"
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:528
msgid "Host name:"
msgstr "Rechnername:"
-#: Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:536
msgid "Please enter a host name"
msgstr "Bitte einen Rechnernamen eingeben."
-#: Src/wptKeyserverDlg.cpp:542
+#: Src/wptKeyserverDlg.cpp:541
msgid "Invalid port, valid numbers are < 65535"
msgstr "Ungültiger Port, gültige Nummern sind < 65535"
-#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "&Empfangen"
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:587
msgid "Send key (default is receiving)"
msgstr "Schlüssel senden (sonst empfangen)"
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:589
msgid "Please enter the key ID or email address you search for"
msgstr "Bitte die key ID oder E-Mail-Adresse angeben die gesucht wird"
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:590
msgid "&Search"
msgstr "&Suchen"
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:591
msgid "C&hange proxy"
msgstr "Proxy Ä&ndern"
-#: Src/wptKeyserverDlg.cpp:593
+#: Src/wptKeyserverDlg.cpp:592
msgid "Set &default"
msgstr "Als &Standard"
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:617
msgid "&Remove"
msgstr "&Entfernen"
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Edit"
msgstr "&Edtieren"
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:69
#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
@@ -3759,27 +3785,27 @@
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
msgid "Please select one of the keyservers."
msgstr "Bitte einen Keyserver auswählen."
-#: Src/wptKeyserverDlg.cpp:660
+#: Src/wptKeyserverDlg.cpp:659
msgid "This is not implemented yet!"
msgstr "Das ist noch nicht implementiert!"
-#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:666 Src/wptKeyserverDlg.cpp:698
msgid "Please enter the search pattern."
msgstr "Bitte Suchmuster eingeben."
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:703
msgid "Only keyids are allowed."
msgstr "Nur Schlüssel-IDs zulässig"
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:709
msgid "Only enter the name of the user."
msgstr "Nur den Namen des Benutzers eingeben."
-#: Src/wptKeyserverDlg.cpp:716
+#: Src/wptKeyserverDlg.cpp:715
msgid "Only email addresses or keyids are allowed."
msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
@@ -3792,7 +3818,7 @@
msgid "Keyserver Searching"
msgstr "Schlüsselserver-Suche"
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptKeyserverSearchDlg.cpp:87 Src/wptKeyserverSearchDlg.cpp:117
msgid "Keyserver Search"
msgstr "Schlüsselserver-Suche"
@@ -3820,78 +3846,82 @@
msgid "%s %s signature"
msgstr "%s %s Signatur"
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:210
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
msgid "Signature Properties"
msgstr "Signatureigenschaften"
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:164 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
msgid "Exportable"
msgstr "Exportierbar"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:183
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:207
+#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
msgid "Non-revocably"
msgstr "Nicht widerrufbar"
# c:\oss\winpt-gpgme\src\wptSigList.cpp:49
-#: Src/wptKeysigDlg.cpp:144 Src/wptSigList.cpp:53
+#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
msgid "Class"
msgstr "Klasse"
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:146
msgid "Expire date"
msgstr "Ablaufdatum"
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:147
msgid "Issuer key"
msgstr "Schlüssel des Ausstellers"
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:148
msgid "Issuer key ID"
msgstr "Key ID des Ausstellers"
-#: Src/wptKeysigDlg.cpp:164
+#: Src/wptKeysigDlg.cpp:149
+msgid "Policy URL"
+msgstr "Policy URL"
+
+#: Src/wptKeysigDlg.cpp:166
msgid "Non-exportable"
msgstr "Nicht-exportierbar"
-#: Src/wptKeysigDlg.cpp:177 Src/wptSigList.cpp:156
+#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
msgid " user ID not found"
msgstr " Benutzerkennung nicht gefunden"
-#: Src/wptKeysigDlg.cpp:283
+#: Src/wptKeysigDlg.cpp:288
msgid "Really receive all missing keys?"
msgstr "Alle fehlenden Schlüssel empfangen?"
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:322 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "Signatur-&Eigenschaften"
-#: Src/wptKeysigDlg.cpp:318
+#: Src/wptKeysigDlg.cpp:323
msgid "Signing &Key Properties"
msgstr "Signing Key-Eigenschaften"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:294
-#: Src/wptKeysigDlg.cpp:357
+#: Src/wptKeysigDlg.cpp:362
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr ""
"Schlüssel nicht im Schlüsselbund gefunden, wollen Sie den Schlüssel "
"runterladen?"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:367
+#: Src/wptKeysigDlg.cpp:372
msgid "Key not found in keyring."
msgstr "Schlüssel im Keyring nicht gefunden."
-#: Src/wptKeysigDlg.cpp:395
+#: Src/wptKeysigDlg.cpp:400
#, c-format
msgid "Signature List for \"%s\""
msgstr "Signaturliste für \"%s\""
-#: Src/wptKeysigDlg.cpp:399
+#: Src/wptKeysigDlg.cpp:404
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
-#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
msgid "Choose Signature Class"
msgstr "Signaturklasse auswählen"
@@ -3928,7 +3958,7 @@
msgid "never"
msgstr "niemals"
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:261
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -3949,47 +3979,47 @@
"\n"
"Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
-#: Src/wptKeysignDlg.cpp:277
+#: Src/wptKeysignDlg.cpp:273
msgid "No valid secret key found."
msgstr "Keine gültigen geheimen Schlüssel gefunden."
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:279
msgid "Sign local only (non exportable signature)"
msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
-#: Src/wptKeysignDlg.cpp:283
+#: Src/wptKeysignDlg.cpp:280
msgid "Signature expires on"
msgstr "Signatur läuft ab am"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:284
+#: Src/wptKeysignDlg.cpp:281
msgid "Sign non-revocably"
msgstr "Nicht-widerrufbar signieren"
-#: Src/wptKeysignDlg.cpp:285
+#: Src/wptKeysignDlg.cpp:282
msgid "&Ask for certification level"
msgstr "Zertifizierungslevel erfragen"
-#: Src/wptKeysignDlg.cpp:288
+#: Src/wptKeysignDlg.cpp:285
msgid "&Show photo"
msgstr "&Photo anzeigen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
-#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
+#: Src/wptKeysignDlg.cpp:286 Src/wptPassphraseCB.cpp:94
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr "&Maskiere Eingabe"
-#: Src/wptKeysignDlg.cpp:355
+#: Src/wptKeysignDlg.cpp:352
msgid "You cannot select today as the expiration date."
msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
-#: Src/wptKeysignDlg.cpp:371
+#: Src/wptKeysignDlg.cpp:368
msgid "Could not get Key ID from key."
msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
-#: Src/wptKeysignDlg.cpp:392
+#: Src/wptKeysignDlg.cpp:389
msgid "This key is already signed by your key"
msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
@@ -4076,32 +4106,32 @@
msgid "MAPI Login failed."
msgstr "MAPI Login fehlgeschlagen."
-#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:227
msgid "Could not sent mail."
msgstr "Konnte E-Mail nicht versenden."
-#: Src/wptMDSumDlg.cpp:72
+#: Src/wptMDSumDlg.cpp:103
msgid "Digest"
msgstr "Prüfsumme"
-#: Src/wptMDSumDlg.cpp:103
+#: Src/wptMDSumDlg.cpp:121
msgid "&Save..."
msgstr "&Speichern..."
-#: Src/wptMDSumDlg.cpp:105
+#: Src/wptMDSumDlg.cpp:123
msgid "Save to clipboard"
msgstr "In Ablage speichern"
-#: Src/wptMDSumDlg.cpp:106
+#: Src/wptMDSumDlg.cpp:124
msgid "Print Message Digest"
msgstr "Ausgabe Prüfsummen"
# c:\oss\winpt-gpgme\src\wptMDSumDlg.cpp:114
-#: Src/wptMDSumDlg.cpp:149
+#: Src/wptMDSumDlg.cpp:177
msgid "Select file to save checksums"
msgstr "Datei auswählen zum Speichern der Prüfsummen"
-#: Src/wptMDSumDlg.cpp:154
+#: Src/wptMDSumDlg.cpp:182
#, c-format
msgid "Checksums successfully saved in '%s'"
msgstr "Prüfsummen erfolgreich in '%s' gespeichert."
@@ -4132,25 +4162,25 @@
msgid "Ownertrust succefully imported."
msgstr "Besitzervertrauen erfolgreich importiert."
-#: Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:98
msgid "Encrypted with the following public key(s)"
msgstr "Verschlüsselt mit folgenden öffentlichen Schlüssel(n)"
-#: Src/wptPassphraseCB.cpp:143
+#: Src/wptPassphraseCB.cpp:142
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "Unbekannte Schlüssel-ID (%s, 0x%s)"
# c:\oss\winpt-gpgme\src\wptPassphraseCB.cpp:124
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:153
msgid "Bad passphrase; Enter passphrase again"
msgstr "Ungültiges Passwort; Bitte Passwort erneut eingeben"
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:154
msgid "Please enter your passphrase"
msgstr "Bitte geben Sie Ihr Passwort ein"
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:158
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -4159,7 +4189,7 @@
"Symmetrisch verschlüsselt.\n"
"%s verschlüsselte Daten."
-#: Src/wptPassphraseCB.cpp:304
+#: Src/wptPassphraseCB.cpp:302
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4170,7 +4200,7 @@
"Benutzer: \"%s\"\n"
"%s Schlüssel, ID %s (Hauptschlüssel ID %s)\n"
-#: Src/wptPassphraseCB.cpp:310
+#: Src/wptPassphraseCB.cpp:308
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4181,7 +4211,7 @@
"Benutzer: \"%s\"\n"
"%s key, ID %s\n"
-#: Src/wptPassphraseCB.cpp:398
+#: Src/wptPassphraseCB.cpp:396
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -4439,11 +4469,11 @@
msgid "Could not write to Registry."
msgstr "Konnte Werte in der Registrierung nicht speichern."
-#: Src/wptSigList.cpp:52
+#: Src/wptSigList.cpp:53
msgid "Valid"
msgstr "Gültig"
-#: Src/wptSigList.cpp:56
+#: Src/wptSigList.cpp:57
msgid "Expiration"
msgstr "Ablauf"
@@ -4452,7 +4482,7 @@
msgid "Signature Tree for \"%s\" (0x%s)"
msgstr "Signaturliste für \"%s\" (0x%s)"
-#: Src/wptSigTreeDlg.cpp:167
+#: Src/wptSigTreeDlg.cpp:166
msgid "Edit..."
msgstr "Edit..."
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Po/fr.po 2006-05-01 12:22:18 UTC (rev 208)
@@ -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-04-22 20:08+0200\n"
+"POT-Creation-Date: 2006-04-29 19:32+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"
@@ -49,16 +49,16 @@
msgstr "Impossible de créer le répertoire de WinPT"
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyserver.cpp:541
#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
-#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
-#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
-#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
-#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
-#: Src/wptKeyserverDlg.cpp:717
+#: Src/wptKeyserverDlg.cpp:476 Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:541 Src/wptKeyserverDlg.cpp:652
+#: Src/wptKeyserverDlg.cpp:660 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:704 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:716
msgid "Keyserver"
msgstr "Serveur de clé"
@@ -105,7 +105,7 @@
msgstr ""
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:810
+#: Src/wptFileManagerDlg.cpp:814
msgid "Wipe Free Space"
msgstr ""
@@ -150,7 +150,7 @@
msgid "The AUTHORS files contains a list of all contributors and co-authors."
msgstr ""
-#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1741
#: Src/wptMainProc.cpp:586
msgid "About WinPT"
msgstr "A propos de WinPT"
@@ -190,8 +190,8 @@
msgid "&About GPG..."
msgstr ""
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
-#: Src/wptKeyManagerDlg.cpp:947
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2156
+#: Src/wptKeyManagerDlg.cpp:962
msgid "&Help"
msgstr "&Aide"
@@ -270,15 +270,15 @@
"Still proceed?"
msgstr ""
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:515
msgid "&Name"
msgstr "&Nom"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "&Commentaire (optionnel)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "&Date d'expiration"
@@ -286,11 +286,11 @@
msgid "Off-card passphrase"
msgstr ""
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Jamais"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "Adresse &email"
@@ -302,7 +302,7 @@
msgid "Make off-card backup of encryption key"
msgstr ""
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1620
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1637
msgid "Card Key Generation"
msgstr ""
@@ -330,7 +330,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr ""
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1397
msgid "The date you have chosen lies in the past."
msgstr ""
@@ -387,20 +387,20 @@
msgstr ""
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
-#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
-#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
+#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
+#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
+#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
msgid "user ID not found"
msgstr ""
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
-#: Src/wptFileManager.cpp:1357
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1304
+#: Src/wptFileManager.cpp:1351
msgid "Decryption"
msgstr "Déchiffrement"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -433,32 +433,32 @@
#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:274
-#: Src/wptKeyManager.cpp:752 Src/wptKeyManager.cpp:951 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:286
+#: Src/wptKeyManager.cpp:766 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "Etat de GnuPG: Terminé"
-#: Src/wptClipDecryptDlg.cpp:181
+#: Src/wptClipDecryptDlg.cpp:177
msgid "Signature Status: Created with a fully trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:179
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:186
+#: Src/wptClipDecryptDlg.cpp:182
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:189
+#: Src/wptClipDecryptDlg.cpp:185
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:196
+#: Src/wptClipDecryptDlg.cpp:192
msgid "WinPT Verify"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:193
#, c-format
msgid ""
"%s\n"
@@ -476,7 +476,7 @@
msgid "Clipboard"
msgstr "Presse papiers"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
msgid "File Open"
msgstr ""
@@ -524,8 +524,8 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
-#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
+#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fermer"
@@ -550,12 +550,12 @@
#: 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:367 Src/wptKeyEditDlgs.cpp:455
-#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
-#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
-#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:539 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:284 Src/wptPassphraseCB.cpp:93
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -584,8 +584,8 @@
#: 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:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1082
+#: Src/wptFileManager.cpp:1098 Src/wptFileManager.cpp:1408
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signer"
@@ -618,7 +618,7 @@
msgid "Signing key:"
msgstr ""
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1203
msgid "No key was selected."
msgstr "Aucune clé n'a été sélectionnée"
@@ -632,9 +632,9 @@
msgstr ""
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
-#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
-#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
-#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:209
+#: Src/wptClipVerifyDlg.cpp:241 Src/wptClipVerifyDlg.cpp:252
+#: Src/wptFileManager.cpp:1586 Src/wptFileManager.cpp:1639
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -642,7 +642,7 @@
msgid "Verify"
msgstr "Vérifier"
-#: Src/wptClipVerifyDlg.cpp:206
+#: Src/wptClipVerifyDlg.cpp:203
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -651,19 +651,19 @@
"Do you want to try to retrieve the key from the keyserver?"
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:244
+#: Src/wptClipVerifyDlg.cpp:241
msgid "Invalid signature state."
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:254
+#: Src/wptClipVerifyDlg.cpp:251
msgid "Could not extract key or signature information."
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:258
+#: Src/wptClipVerifyDlg.cpp:255
msgid "The signature is expired!"
msgstr "La signature est expirée!"
-#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:289 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -682,36 +682,37 @@
msgid "Enter URL to retrieve the public key"
msgstr ""
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
-#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
-#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
-#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
-#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
-#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
-#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
-#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
-#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
-#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
-#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
-#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
-#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
-#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
-#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
-#: Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:893 Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:921 Src/wptKeyEditDlgs.cpp:951
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1034 Src/wptKeyEditDlgs.cpp:1052
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1105
+#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1326 Src/wptKeyEditDlgs.cpp:1333
+#: Src/wptKeyEditDlgs.cpp:1369 Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1383 Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1402 Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1449 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1462 Src/wptKeyEditDlgs.cpp:1467
+#: Src/wptKeyEditDlgs.cpp:1512 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1524 Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1534 Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1582 Src/wptKeyEditDlgs.cpp:1599
+#: Src/wptKeyEditDlgs.cpp:1619 Src/wptKeyEditDlgs.cpp:1627
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyEditDlgs.cpp:1769
+#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1818 Src/wptKeyEditDlgs.cpp:1940
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1958
+#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1993
+#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2007
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2025
+#: Src/wptKeyEditDlgs.cpp:2092 Src/wptKeyEditDlgs.cpp:2133
+#: Src/wptKeyEditDlgs.cpp:2146 Src/wptKeyEditDlgs.cpp:2160
+#: Src/wptKeyEditDlgs.cpp:2189 Src/wptKeyEditDlgs.cpp:2194
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1765
msgid "Key Edit"
msgstr ""
@@ -920,12 +921,12 @@
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
-#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
-#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
-#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:664
+#: Src/wptFileManager.cpp:809 Src/wptFileManager.cpp:924
+#: Src/wptFileManager.cpp:1493 Src/wptFileManager.cpp:1520
+#: Src/wptFileManager.cpp:1539 Src/wptFileManager.cpp:1790
+#: Src/wptFileManager.cpp:1852 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "Gestionnaire de fichier"
@@ -948,13 +949,13 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1085
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
-#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1184
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Nom"
@@ -963,64 +964,64 @@
msgid "Operation"
msgstr "Opération"
-#: Src/wptFileManager.cpp:666
+#: Src/wptFileManager.cpp:663
msgid "Please select a file."
msgstr "Sélectionner un fichier."
-#: Src/wptFileManager.cpp:813
+#: Src/wptFileManager.cpp:810
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
"Do you really want to clearsign it?"
msgstr ""
-#: Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:925
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" n'existe pas"
-#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1008 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Status du fichier"
-#: Src/wptFileManager.cpp:1055
+#: Src/wptFileManager.cpp:1052
msgid "Enter filename for encrypted file"
msgstr ""
-#: Src/wptFileManager.cpp:1084
+#: Src/wptFileManager.cpp:1081
msgid "Could not get default secret key."
msgstr "Ne peut obtenir la clé secrète par défaut."
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
+#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signer"
-#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1125 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Chiffrer"
-#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
-#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
+#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symétrique"
-#: Src/wptFileManager.cpp:1193
+#: Src/wptFileManager.cpp:1190
msgid "Encryption failed."
msgstr "Erreur de chiffrement."
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "Bonne signature"
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "MAUVAISE signature"
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1231
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1028,31 +1029,31 @@
"%s"
msgstr ""
-#: Src/wptFileManager.cpp:1241
+#: Src/wptFileManager.cpp:1236
msgid "Decrypt Verify"
msgstr ""
-#: Src/wptFileManager.cpp:1319
+#: Src/wptFileManager.cpp:1313
msgid "Choose Filename for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1328
+#: Src/wptFileManager.cpp:1322
msgid "Please enter filename for plaintext file"
msgstr ""
-#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
+#: Src/wptFileManager.cpp:1360 Src/wptFileManager.cpp:1372
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Déchiffrer"
-#: Src/wptFileManager.cpp:1372
+#: Src/wptFileManager.cpp:1366
#, c-format
msgid ""
"Decryption failed.\n"
"%s: does not exist."
msgstr ""
-#: Src/wptFileManager.cpp:1379
+#: Src/wptFileManager.cpp:1373
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1060,40 +1061,40 @@
"Do you want to use this instead of '%s'?"
msgstr ""
-#: Src/wptFileManager.cpp:1427
+#: Src/wptFileManager.cpp:1421
msgid "Enter filename for signed file"
msgstr ""
-#: Src/wptFileManager.cpp:1531
+#: Src/wptFileManager.cpp:1519
msgid "Could not find detached signature in the clipboard."
msgstr ""
-#: Src/wptFileManager.cpp:1551
+#: Src/wptFileManager.cpp:1539
msgid "No files to check."
msgstr "Aucun fichiers à vérifier."
-#: Src/wptFileManager.cpp:1568
+#: Src/wptFileManager.cpp:1556
msgid "Select Data File"
msgstr ""
-#: Src/wptFileManager.cpp:1570
+#: Src/wptFileManager.cpp:1558
msgid "Selected Output File"
msgstr ""
-#: Src/wptFileManager.cpp:1598
+#: Src/wptFileManager.cpp:1586
msgid "Invalid file name. Exit"
msgstr ""
-#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
-#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
-#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
-#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:459
-#: Src/wptKeyManager.cpp:587 Src/wptKeyserverDlg.cpp:223
+#: Src/wptFileManager.cpp:1684 Src/wptFileManager.cpp:1695
+#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
+#: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
+#: Src/wptKeyManager.cpp:460 Src/wptKeyManager.cpp:471
+#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:223
msgid "Import"
msgstr "Importer"
-#: Src/wptFileManager.cpp:1704
+#: Src/wptFileManager.cpp:1692
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1101,58 +1102,58 @@
"Cannot import these key(s)!"
msgstr ""
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
+#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
+#: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
msgid "No key was selected for export."
msgstr ""
-#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1718 Src/wptFileManager.cpp:1741
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exporter"
-#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
-#: Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "Status de GnuPG"
-#: Src/wptFileManager.cpp:1757
+#: Src/wptFileManager.cpp:1745
#, c-format
msgid "Finished (Output: %s)"
msgstr ""
-#: Src/wptFileManager.cpp:1803
+#: Src/wptFileManager.cpp:1791
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManager.cpp:1863
+#: Src/wptFileManager.cpp:1851
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr ""
-#: Src/wptFileManager.cpp:1868
+#: Src/wptFileManager.cpp:1856
msgid "Choose File Name for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1938
+#: Src/wptFileManager.cpp:1926
msgid "Choose a Name for the Archive"
msgstr ""
-#: Src/wptFileManager.cpp:1941
+#: Src/wptFileManager.cpp:1929
msgid "Invalid archive name. Exit."
msgstr ""
-#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1929 Src/wptFileManager.cpp:1936
msgid "Encrypt Directory"
msgstr ""
-#: Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1936
msgid "Could not create zip archive."
msgstr ""
@@ -1181,12 +1182,12 @@
msgstr ""
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:412
+#: Src/wptKeyManager.cpp:424
msgid "No valid OpenPGP data found."
msgstr ""
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:437
+#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr ""
@@ -1196,7 +1197,7 @@
msgstr ""
#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Fichier"
@@ -1228,18 +1229,18 @@
msgid "Signature mode"
msgstr "Mode de signature"
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
msgid "Options"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
-#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:787
+#: Src/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1511
+#: Src/wptKeyManagerDlg.cpp:1527 Src/wptKeyManagerDlg.cpp:1555
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "Sélectionner une clé."
@@ -1256,12 +1257,12 @@
msgid "File Manager (use drag & drop to add files)"
msgstr "Gestionnaire de fichier (utilisez le drag & drop)"
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
-#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
msgid "Edit"
msgstr "Editer"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
msgid "View"
msgstr "Voir"
@@ -1281,8 +1282,8 @@
msgid "&Decrypt"
msgstr "&Déchiffrer"
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:993
msgid "&Sign"
msgstr "&Signer"
@@ -1355,27 +1356,27 @@
msgid "&Calc Digest"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:762
+#: Src/wptFileManagerDlg.cpp:766
msgid "Are you sure you want to secure delete these files?"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Oui"
-#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Non"
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:811
msgid "Operation Status: Error"
msgstr "Statut de l'opération : Erreur"
-#: Src/wptFileManagerDlg.cpp:808
+#: Src/wptFileManagerDlg.cpp:812
msgid "Operation Status: Done."
msgstr "Statut de l'opération : Fait"
-#: Src/wptFileManagerDlg.cpp:851
+#: Src/wptFileManagerDlg.cpp:855
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1462,7 +1463,7 @@
#: 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:1762 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyManagerDlg.cpp:955
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1530,35 +1531,35 @@
msgid "No GPG error description available."
msgstr ""
-#: Src/wptGPGME.cpp:313
+#: Src/wptGPGME.cpp:318
msgid "Error during verification process."
msgstr ""
-#: Src/wptGPGME.cpp:314
+#: Src/wptGPGME.cpp:319
msgid "The signature is good."
msgstr "La signature est bonne."
-#: Src/wptGPGME.cpp:315
+#: Src/wptGPGME.cpp:320
msgid "The signature is BAD!"
msgstr "La signature est MAUVAISE!"
-#: Src/wptGPGME.cpp:316
+#: Src/wptGPGME.cpp:321
msgid "The signature could not be checked due to a missing key."
msgstr ""
-#: Src/wptGPGME.cpp:317
+#: Src/wptGPGME.cpp:322
msgid "No valid OpenPGP signature."
msgstr ""
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:323
msgid "Signature Error"
msgstr ""
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:324
msgid "Good Signature (Expired Key)"
msgstr ""
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:325
msgid "Good Signature (Revoked Key)"
msgstr ""
@@ -1597,7 +1598,7 @@
"Are you sure?"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1646
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1663
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr ""
@@ -1678,36 +1679,36 @@
msgstr ""
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:154 Src/wptKeyManager.cpp:159
-#: Src/wptKeyManager.cpp:210 Src/wptKeyManager.cpp:253
-#: Src/wptKeyManager.cpp:265 Src/wptKeyManager.cpp:296
-#: Src/wptKeyManager.cpp:301 Src/wptKeyManager.cpp:308
-#: Src/wptKeyManager.cpp:310 Src/wptKeyManager.cpp:331
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:344
-#: Src/wptKeyManager.cpp:364 Src/wptKeyManager.cpp:405
-#: Src/wptKeyManager.cpp:410 Src/wptKeyManager.cpp:413
-#: Src/wptKeyManager.cpp:418 Src/wptKeyManager.cpp:424
-#: Src/wptKeyManager.cpp:429 Src/wptKeyManager.cpp:557
-#: Src/wptKeyManager.cpp:565 Src/wptKeyManager.cpp:671
-#: Src/wptKeyManager.cpp:700 Src/wptKeyManager.cpp:709
-#: Src/wptKeyManager.cpp:720 Src/wptKeyManager.cpp:746
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:780
-#: Src/wptKeyManager.cpp:804 Src/wptKeyManager.cpp:809
-#: Src/wptKeyManager.cpp:829 Src/wptKeyManager.cpp:884
-#: Src/wptKeyManager.cpp:889 Src/wptKeyManager.cpp:949
-#: Src/wptKeyManager.cpp:979 Src/wptKeyManager.cpp:1068
-#: Src/wptKeyManagerDlg.cpp:1162 Src/wptKeyManagerDlg.cpp:1175
-#: Src/wptKeyManagerDlg.cpp:1185 Src/wptKeyManagerDlg.cpp:1473
-#: Src/wptKeyManagerDlg.cpp:1495 Src/wptKeyManagerDlg.cpp:1510
-#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeyManagerDlg.cpp:1528
-#: Src/wptKeyManagerDlg.cpp:1538 Src/wptKeyManagerDlg.cpp:1544
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyManagerDlg.cpp:1616
-#: Src/wptKeyManagerDlg.cpp:1675 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
-#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
-#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:168 Src/wptKeyManager.cpp:173
+#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:265
+#: Src/wptKeyManager.cpp:277 Src/wptKeyManager.cpp:308
+#: Src/wptKeyManager.cpp:313 Src/wptKeyManager.cpp:320
+#: Src/wptKeyManager.cpp:322 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:352 Src/wptKeyManager.cpp:356
+#: Src/wptKeyManager.cpp:376 Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:422 Src/wptKeyManager.cpp:425
+#: Src/wptKeyManager.cpp:430 Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:441 Src/wptKeyManager.cpp:569
+#: Src/wptKeyManager.cpp:577 Src/wptKeyManager.cpp:683
+#: Src/wptKeyManager.cpp:714 Src/wptKeyManager.cpp:723
+#: Src/wptKeyManager.cpp:734 Src/wptKeyManager.cpp:760
+#: Src/wptKeyManager.cpp:787 Src/wptKeyManager.cpp:792
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManager.cpp:821
+#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:891
+#: Src/wptKeyManager.cpp:896 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:982 Src/wptKeyManager.cpp:1069
+#: Src/wptKeyManagerDlg.cpp:1178 Src/wptKeyManagerDlg.cpp:1191
+#: Src/wptKeyManagerDlg.cpp:1201 Src/wptKeyManagerDlg.cpp:1490
+#: Src/wptKeyManagerDlg.cpp:1512 Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyManagerDlg.cpp:1537 Src/wptKeyManagerDlg.cpp:1545
+#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1561
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyManagerDlg.cpp:1633
+#: Src/wptKeyManagerDlg.cpp:1692 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1715 Src/wptKeyManagerDlg.cpp:1720
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1925
+#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:289
+#: Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:372 Src/wptKeysigDlg.cpp:420
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Gestionnaire de clés"
@@ -1776,352 +1777,353 @@
msgid "Unknown Hotkey"
msgstr ""
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
-#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
-#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
-#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
+#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:255
+#: Src/wptKeyEditDlgs.cpp:1156 Src/wptKeyEditDlgs.cpp:1214
+#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1522 Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeylist.cpp:420 Src/wptKeylist.cpp:454
+#: Src/wptKeyPropsDlg.cpp:163 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:213
msgid "Revoked"
msgstr ""
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
-#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
-#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
+#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
+#: Src/wptKeyEditDlgs.cpp:1154 Src/wptKeyEditDlgs.cpp:1380
+#: Src/wptKeylist.cpp:422 Src/wptKeylist.cpp:452 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:214
msgid "Expired"
msgstr ""
-#: Src/wptImportList.cpp:268
+#: Src/wptImportList.cpp:272
msgid "secret key"
msgstr "clé secrète"
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
msgid "public key"
msgstr "clé publique"
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
msgid "Invalid user ID"
msgstr ""
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
-#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
+#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:575 Src/wptKeylist.cpp:583
+#: Src/wptKeyManagerDlg.cpp:872 Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:52
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr ""
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
-#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
+#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Taille"
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
-#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1082
+#: Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584 Src/wptKeyManagerDlg.cpp:873
+#: Src/wptKeyManagerDlg.cpp:964 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:56
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr ""
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
-#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
-#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1083
+#: Src/wptKeyEditDlgs.cpp:1186 Src/wptKeylist.cpp:590
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
msgid "Creation"
msgstr "Création"
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
+#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
msgid "Type"
msgstr ""
-#: Src/wptImportList.cpp:426
+#: Src/wptImportList.cpp:418
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
"and thus a CRC error occurs."
msgstr ""
-#: Src/wptKeyCache.cpp:655
+#: Src/wptKeyCache.cpp:747
msgid "Load GPG Keyrings..."
msgstr ""
-#: Src/wptKeyCacheDlg.cpp:53
+#: Src/wptKeyCacheDlg.cpp:52
msgid "WinPT Key Caching"
msgstr ""
-#: Src/wptKeyCacheDlg.cpp:56
+#: Src/wptKeyCacheDlg.cpp:55
msgid "Caching keyrings, please wait..."
msgstr ""
-#: Src/wptKeyCacheDlg.cpp:69
+#: Src/wptKeyCacheDlg.cpp:70
msgid "Key Cache"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:234
+#: Src/wptKeyEditDlgs.cpp:228
msgid "Ultimate"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
msgid "Never"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
+#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1158
msgid "OK"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:288
+#: Src/wptKeyEditDlgs.cpp:281
msgid "user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:289
+#: Src/wptKeyEditDlgs.cpp:282
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
"%s"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:364
+#: Src/wptKeyEditDlgs.cpp:354
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
"close to 240x288 is a good size to use."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:355
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
-#: Src/wptKeysignDlg.cpp:286
+#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:368
+#: Src/wptKeyEditDlgs.cpp:358
msgid "Add Photo ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:383
+#: Src/wptKeyEditDlgs.cpp:373
msgid "Select Image File"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
-#: Src/wptKeyEditDlgs.cpp:926
+#: Src/wptKeyEditDlgs.cpp:377 Src/wptKeyEditDlgs.cpp:387
+#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:915
msgid "Add Photo"
msgstr "Ajouter une photo"
-#: Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:378
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyRevokeDlg.cpp:173
msgid "Please enter a file name."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:401
+#: Src/wptKeyEditDlgs.cpp:391
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:420
+#: Src/wptKeyEditDlgs.cpp:410
msgid "Photo successfully added."
msgstr "Photo ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
-#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
-#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:564 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1642 Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "Etat de GnuPG"
-#: Src/wptKeyEditDlgs.cpp:452
+#: Src/wptKeyEditDlgs.cpp:442
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:453
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "Clé publique"
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
-#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
msgid "Add Revoker"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
-#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1574 Src/wptKeyEditDlgs.cpp:1619
+#: Src/wptKeyEditDlgs.cpp:1769 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1993
msgid "Please select a user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:490
+#: Src/wptKeyEditDlgs.cpp:480
msgid "Revoker successfully addded."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:524
+#: Src/wptKeyEditDlgs.cpp:514
msgid "Add new User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:526
+#: Src/wptKeyEditDlgs.cpp:516
msgid "&Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:527
+#: Src/wptKeyEditDlgs.cpp:517
msgid "&Comment"
msgstr "&Commentaire"
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:533
msgid "Please enter a name (min. 5 chars.)"
msgstr "Entrer un nom (min. 5 caractères)"
-#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
-#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
-#: Src/wptKeyEditDlgs.cpp:573
+#: Src/wptKeyEditDlgs.cpp:534 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:562
msgid "UserID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:539
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:552
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "Entrer une adresse email"
-#: Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:575
+#: Src/wptKeyEditDlgs.cpp:564
msgid "user ID successfully added."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:853
msgid "Add new Subkey"
msgstr "Ajouter la nouvelle clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:661
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:662
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:663
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:709
+#: Src/wptKeyEditDlgs.cpp:698
msgid "Please select one entry."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
-#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
msgid "Add Subkey"
msgstr "Ajouter la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:715
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:750
+#: Src/wptKeyEditDlgs.cpp:739
msgid "Subkey successfully added."
msgstr "Clé secondaire ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
-#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
-#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
-#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
-#: Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:767 Src/wptKeyEditDlgs.cpp:835
+#: Src/wptKeyEditDlgs.cpp:914 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:1026 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1506
+#: Src/wptKeyManagerDlg.cpp:1544
msgid "There is no secret key available!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:786
msgid "Add user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:904
+#: Src/wptKeyEditDlgs.cpp:893
msgid "Preferred keyserver successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
msgid "Key status changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1032
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1050
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Current (old) Passphrase"
msgstr "Actuel (ancienne) Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "New Passphrase"
msgstr "Nouvelle Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1050 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1062
msgid "Change Passwd"
msgstr "Changement de mot de passe"
-#: Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1064
msgid "Passphrase successfully changed."
msgstr "Passphrase modifiée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
msgid "Description"
msgstr "Déscription"
-#: Src/wptKeyEditDlgs.cpp:1095
+#: Src/wptKeyEditDlgs.cpp:1084
msgid "Expires"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
msgid "Could not find key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1105
msgid "No subkey(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
-#: Src/wptKeyManagerDlg.cpp:862
+#: Src/wptKeyEditDlgs.cpp:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
+#: Src/wptKeyManagerDlg.cpp:877
msgid "Validity"
msgstr "Validité"
-#: Src/wptKeyEditDlgs.cpp:1200
+#: Src/wptKeyEditDlgs.cpp:1185
msgid "Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1198
msgid "No user ID(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1280
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2143,21 +2145,22 @@
"SIGN\t \t\tsign a user-id (exportable)\r\n"
"LSIGN\t \t\tsign a user-id (non-exportable)\r\n"
"CLEAN \t\tremove unusable signatures from key\r\n"
+"MINIMIZE \t\tremove all signatures from key\r\n"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1328
+#: Src/wptKeyEditDlgs.cpp:1302
msgid "Key Edit Help"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Primary key can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1326
msgid "Primary subkey can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1334
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2168,34 +2171,34 @@
"Do you really want to delete this subkey?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1346
msgid "Delete Subkey"
msgstr "Effacer la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:1376
+#: Src/wptKeyEditDlgs.cpp:1350
msgid "Subkey successfully deleted."
msgstr "Clé secondaire effacée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1407
+#: Src/wptKeyEditDlgs.cpp:1381
msgid ""
"Key already expired.\n"
"\n"
"Do you want to change the expiration date?"
msgstr "Voulez-vous changer la date d'expiration?"
-#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
+#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1393
msgid "Key Expiration Date"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1416
msgid "Expire Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1422
msgid "Subkey expire date successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1453
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2203,31 +2206,31 @@
"This command is only available to revoke single subkeys"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1462
msgid "Key already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Revoke Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1511
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Subkey successfully revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1533
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1512
msgid "Key has only one user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1523
msgid "This user ID has been already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1529
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2235,47 +2238,47 @@
"Do you really want to revoke this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1579
+#: Src/wptKeyEditDlgs.cpp:1553
msgid "Revoke User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1557
msgid "User ID successfully revoked"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1599
msgid "Could not set user ID preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1665
+#: Src/wptKeyEditDlgs.cpp:1639
msgid "Primary"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1668
+#: Src/wptKeyEditDlgs.cpp:1642
msgid "User ID successfully flagged"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1736
msgid "No preferences available."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1740
msgid "MDC feature"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1763
+#: Src/wptKeyEditDlgs.cpp:1742
msgid "user ID:"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1815
+#: Src/wptKeyEditDlgs.cpp:1802
msgid "Primary user ID can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1826
+#: Src/wptKeyEditDlgs.cpp:1813
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2285,43 +2288,59 @@
"Do you really want to delete this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1846
+#: Src/wptKeyEditDlgs.cpp:1833
msgid "Delete user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeyEditDlgs.cpp:1837
msgid "User ID successfully deleted"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1955
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
msgid "Finished to compact key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:1997
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2074
+#: Src/wptKeyEditDlgs.cpp:2084
+#, c-format
+msgid ""
+"Your keys is listed as a designated revoker for the key\n"
+"\n"
+"%s\n"
+"\n"
+"Are you sure you want to create a revocation certificate\n"
+"which allow to revoke the key listed above?"
+msgstr ""
+
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2087
+#: Src/wptKeyEditDlgs.cpp:2145
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2096
+#: Src/wptKeyEditDlgs.cpp:2154
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2157
+#, fuzzy
+msgid "&Revoke..."
+msgstr "&Enregistrer..."
+
+#: Src/wptKeyEditDlgs.cpp:2189
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2193
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2357,8 +2376,8 @@
msgstr ""
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
-#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2377,11 +2396,11 @@
msgstr ""
#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
-#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
-#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
-#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:408 Src/wptKeygenDlg.cpp:413
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:423 Src/wptKeygenDlg.cpp:430
+#: Src/wptKeygenDlg.cpp:438 Src/wptKeygenDlg.cpp:452 Src/wptKeygenDlg.cpp:461
+#: Src/wptKeygenDlg.cpp:486 Src/wptKeygenDlg.cpp:582
+#: Src/wptKeyManagerDlg.cpp:1624 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr ""
@@ -2444,97 +2463,97 @@
msgid "RSA and RSA (PGP)"
msgstr ""
-#: Src/wptKeygenDlg.cpp:370
+#: Src/wptKeygenDlg.cpp:371
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
msgstr ""
-#: Src/wptKeygenDlg.cpp:372
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr ""
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "&Nom réel"
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr ""
-#: Src/wptKeygenDlg.cpp:406
+#: Src/wptKeygenDlg.cpp:407
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr ""
-#: Src/wptKeygenDlg.cpp:411
+#: Src/wptKeygenDlg.cpp:412
msgid "Do you really need such a large key?"
msgstr ""
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:559
msgid "Please enter the name."
msgstr ""
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
msgid "Please do not enter the email address in the name field."
msgstr ""
-#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
+#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:571
msgid "Please enter a valid email address."
msgstr ""
-#: Src/wptKeygenDlg.cpp:434
+#: Src/wptKeygenDlg.cpp:437
msgid "Please do NOT enter the email address in the comment field."
msgstr ""
-#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:460 Src/wptKeyRevokeDlg.cpp:181
msgid "Please enter the passphrase."
msgstr "Entrer la passphrase."
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
msgid "Key Generation completed"
msgstr "Génération des clés terminée"
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:532
msgid "&Prefer RSA keys"
msgstr ""
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:533
msgid "Real name:"
msgstr "Nom réel:"
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:534
msgid "Email address:"
msgstr "Adresse email:"
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:535
msgid "Name and E-Mail Assignment"
msgstr ""
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:536
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
"using belongs to us."
msgstr ""
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:537
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
"key when communicating with you."
msgstr ""
-#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
-#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeygenDlg.cpp:538 Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:572 Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeyManagerDlg.cpp:1647
msgid "Key Generation Wizard"
msgstr ""
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:540
msgid "E&xpert"
msgstr ""
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:577
msgid "Please do not add '<' or '>' to the email address."
msgstr ""
@@ -2586,53 +2605,53 @@
msgid "No keys updated."
msgstr ""
-#: Src/wptKeylist.cpp:252
+#: Src/wptKeylist.cpp:260
msgid "Key Pair"
msgstr ""
-#: Src/wptKeylist.cpp:254
+#: Src/wptKeylist.cpp:262
msgid "Key Pair (Card)"
msgstr ""
-#: Src/wptKeylist.cpp:255
+#: Src/wptKeylist.cpp:263
msgid "Public Key"
msgstr ""
-#: Src/wptKeylist.cpp:353
+#: Src/wptKeylist.cpp:380
msgid "None"
msgstr ""
-#: Src/wptKeylist.cpp:357
+#: Src/wptKeylist.cpp:384
msgid "Marginal"
msgstr ""
-#: Src/wptKeylist.cpp:360
+#: Src/wptKeylist.cpp:387
msgid "Full"
msgstr ""
-#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr ""
-#: Src/wptKeylist.cpp:433
+#: Src/wptKeylist.cpp:460
msgid "key pair"
msgstr ""
-#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
-#: Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
+#: Src/wptKeyManagerDlg.cpp:965
msgid "Cipher"
msgstr ""
-#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Confiance"
-#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:762 Src/wptPassphraseCB.cpp:124
msgid "Invalid User ID"
msgstr ""
-#: Src/wptKeylist.cpp:1007
+#: Src/wptKeylist.cpp:1030
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2642,103 +2661,103 @@
"Use \"%s\" anyway?"
msgstr ""
-#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1038 Src/wptKeylist.cpp:1100
msgid "Recipients"
msgstr ""
-#: Src/wptKeylist.cpp:1080
+#: Src/wptKeylist.cpp:1101
#, c-format
msgid ""
"KeyID %s.\n"
"Do you really want to export a revoked key?"
msgstr ""
-#: Src/wptKeylist.cpp:1182
+#: Src/wptKeylist.cpp:1203
msgid "Secret Key List"
msgstr ""
-#: Src/wptKeyManager.cpp:153
+#: Src/wptKeyManager.cpp:167
msgid ""
"This key has expired!\n"
"Key check failed."
msgstr ""
-#: Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:172
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
msgstr ""
-#: Src/wptKeyManager.cpp:300
+#: Src/wptKeyManager.cpp:312
msgid "Only one secret key can be exported."
msgstr ""
-#: Src/wptKeyManager.cpp:311
+#: Src/wptKeyManager.cpp:323
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr ""
-#: Src/wptKeyManager.cpp:345
+#: Src/wptKeyManager.cpp:357
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr ""
-#: Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:429
msgid "No valid OpenPGP keys found."
msgstr ""
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:434
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
msgstr ""
-#: Src/wptKeyManager.cpp:428
+#: Src/wptKeyManager.cpp:440
msgid "Cannot import dash escaped OpenPGP keys."
msgstr ""
-#: Src/wptKeyManager.cpp:457 Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:469 Src/wptKeyManager.cpp:597
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
msgstr ""
-#: Src/wptKeyManager.cpp:486 Src/wptKeyManager.cpp:493
-#: Src/wptKeyManager.cpp:502
+#: Src/wptKeyManager.cpp:498 Src/wptKeyManager.cpp:505
+#: Src/wptKeyManager.cpp:514
msgid "Key Import HTTP"
msgstr ""
-#: Src/wptKeyManager.cpp:486
+#: Src/wptKeyManager.cpp:498
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr ""
-#: Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:515
#, c-format
msgid "Could not fetch key from URL: %s"
msgstr ""
-#: Src/wptKeyManager.cpp:532
+#: Src/wptKeyManager.cpp:544
msgid "Choose Name of the Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptKeyManager.cpp:545
+#: Src/wptKeyManager.cpp:557
msgid "File Import"
msgstr ""
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:568
msgid "Could not read key-data from file."
msgstr ""
-#: Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:688
msgid "Do you really want to confirm each key?"
msgstr ""
-#: Src/wptKeyManager.cpp:677
+#: Src/wptKeyManager.cpp:689
msgid "Delete Confirmation"
msgstr "Confirmation de l'effacement"
-#: Src/wptKeyManager.cpp:701
+#: Src/wptKeyManager.cpp:715
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2746,7 +2765,7 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:710
+#: Src/wptKeyManager.cpp:724
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2757,365 +2776,365 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:717
+#: Src/wptKeyManager.cpp:731
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:781
+#: Src/wptKeyManager.cpp:793
#, fuzzy, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "Voulez-vous effacer le contenu du presse papiers?"
-#: Src/wptKeyManager.cpp:803
+#: Src/wptKeyManager.cpp:815
msgid "Please only select one key."
msgstr ""
-#: Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:890
msgid "Do you really want to refresh all keys in the keyring?"
msgstr ""
-#: Src/wptKeyManager.cpp:888
+#: Src/wptKeyManager.cpp:895
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search"
msgstr "Chercher"
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search for:"
msgstr ""
-#: Src/wptKeyManager.cpp:974
+#: Src/wptKeyManager.cpp:977
#, c-format
msgid "String pattern \"%s\" not found."
msgstr ""
-#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:89
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:87
msgid "0. No reason specified"
msgstr ""
-#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:90
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:88
msgid "1. Key has been compromised"
msgstr ""
-#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:91
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:89
msgid "2. Key is superseded"
msgstr ""
-#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:92
+#: Src/wptKeyManager.cpp:1049 Src/wptKeyRevokeDlg.cpp:90
msgid "3. Key is no longer used"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:449 Src/wptKeyManagerDlg.cpp:985
msgid "Paste Key from Clipboard"
msgstr "Coller la clé du presse papiers"
-#: Src/wptKeyManagerDlg.cpp:456
+#: Src/wptKeyManagerDlg.cpp:470
#, c-format
msgid "Default Key: %s"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:458
+#: Src/wptKeyManagerDlg.cpp:472
#, c-format
msgid "Default Key: 0x%s"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:479
+#: Src/wptKeyManagerDlg.cpp:493
#, c-format
msgid "%d secret keys"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:480
+#: Src/wptKeyManagerDlg.cpp:494
#, c-format
msgid "%d keys"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyManagerDlg.cpp:930
msgid "Key"
msgstr "Clé"
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
msgid "Groups"
msgstr "Groupes"
-#: Src/wptKeyManagerDlg.cpp:919
+#: Src/wptKeyManagerDlg.cpp:934
msgid "Send Mail..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyManagerDlg.cpp:936
msgid "&Copy\tCtrl+C"
msgstr "&Copier\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:922
+#: Src/wptKeyManagerDlg.cpp:937
msgid "&Paste\tCtrl+V"
msgstr "&Coller\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:923
+#: Src/wptKeyManagerDlg.cpp:938
msgid "Search...\tCtrl+F"
msgstr "Chercher...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:924
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Select All\tCtrl+A"
msgstr "Sélectionner tout\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:940
msgid "&Quit"
msgstr "&Quitter"
-#: Src/wptKeyManagerDlg.cpp:927
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Expert"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:943
msgid "&Normal"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Delete"
msgstr "&Effacer"
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
msgid "&Revoke Cert"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
msgid "&List Signatures"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1549
+#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:936
+#: Src/wptKeyManagerDlg.cpp:951
msgid "&Export..."
msgstr "&Exporter..."
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:952
msgid "&Import..."
msgstr "&Importer..."
-#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeysigDlg.cpp:405
msgid "&Properties"
msgstr "&Propriétés"
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:957
msgid "E&xport Secret Key"
msgstr "E&xporter la clé privée"
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:958
msgid "Re&load Key Cache"
msgstr "Re&charger le cache"
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:959
msgid "R&everify Signatures"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:960
msgid "Refresh &Keys (Keyserver)"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Copy User ID to Clipboard"
msgstr "Copier l'ID de l'utilisateur dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Copy Key ID to Clipboard"
msgstr "Copier l'ID de la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:982
msgid "Copy Fingerprint to Clipboard"
msgstr "Copier l'empreinte dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:983
msgid "Copy Key Info to Clipboard"
msgstr "Copier l'info de la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:984
msgid "Copy Key to Clipboard"
msgstr "Copier la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Refresh from Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Set Implicit &Trust"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Enable"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:995
msgid "&Disable"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&fresh from Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:997
msgid "Set preferred Keyserver URL"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Send Key to Mail Recipient"
msgstr "Envoyer la clé au destinataire de courrier"
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:999
msgid "Set as Default Key"
msgstr "Clé par défaut"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "Key..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "User ID..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Photo ID..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Revoker..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "Key Attributes"
msgstr "Attributs de clé"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Add"
msgstr "Ajouter"
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Send to Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1173
+#: Src/wptKeyManagerDlg.cpp:1189
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1184
+#: Src/wptKeyManagerDlg.cpp:1200
msgid "Could not set keylist window procedure."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1301
+#: Src/wptKeyManagerDlg.cpp:1318
msgid "Generate new key pair"
msgstr "Générer une nouvelle paire de clés"
-#: Src/wptKeyManagerDlg.cpp:1305
+#: Src/wptKeyManagerDlg.cpp:1322
msgid "Search for a specific key"
msgstr "Chercher pour une clé spécifique"
-#: Src/wptKeyManagerDlg.cpp:1309
+#: Src/wptKeyManagerDlg.cpp:1326
msgid "Delete key from keyring"
msgstr "Effacer une clé du porte-clés"
-#: Src/wptKeyManagerDlg.cpp:1313
+#: Src/wptKeyManagerDlg.cpp:1330
msgid "Show key properties"
msgstr "Voir les propriétés de la clé"
-#: Src/wptKeyManagerDlg.cpp:1317
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Sign key"
msgstr "Signer la clé"
-#: Src/wptKeyManagerDlg.cpp:1321
+#: Src/wptKeyManagerDlg.cpp:1338
msgid "Copy key to clipboard"
msgstr "Copier la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:1325
+#: Src/wptKeyManagerDlg.cpp:1342
msgid "Paste key from clipboard"
msgstr "Coller la clé du presse papiers"
-#: Src/wptKeyManagerDlg.cpp:1329
+#: Src/wptKeyManagerDlg.cpp:1346
msgid "Import key to keyring"
msgstr "Importer la clé dans le porte-clés"
-#: Src/wptKeyManagerDlg.cpp:1333
+#: Src/wptKeyManagerDlg.cpp:1350
msgid "Export key to a file"
msgstr "Exporter la clé dans un fichier"
-#: Src/wptKeyManagerDlg.cpp:1460
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "New"
msgstr "Nouveau"
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Could not access public keyring"
msgstr "Ne peut accéder au porte-clés publique"
-#: Src/wptKeyManagerDlg.cpp:1503 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
+#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeysignDlg.cpp:258
+#: Src/wptKeysignDlg.cpp:273 Src/wptKeysignDlg.cpp:353
+#: Src/wptKeysignDlg.cpp:368 Src/wptKeysignDlg.cpp:385
+#: Src/wptKeysignDlg.cpp:390 Src/wptKeysignDlg.cpp:392
msgid "Key Signing"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1519
+#: Src/wptKeyManagerDlg.cpp:1536
msgid "Key already revoked!"
msgstr "Clé déjà révoquée!"
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyRevokeDlg.cpp:72
-#: Src/wptKeyRevokeDlg.cpp:82 Src/wptKeyRevokeDlg.cpp:145
-#: Src/wptKeyRevokeDlg.cpp:150 Src/wptKeyRevokeDlg.cpp:158
-#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:174
+#: Src/wptKeyManagerDlg.cpp:1550 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:169
+#: Src/wptKeyRevokeDlg.cpp:174 Src/wptKeyRevokeDlg.cpp:182
+#: Src/wptKeyRevokeDlg.cpp:191 Src/wptKeyRevokeDlg.cpp:196
msgid "Key Revocation Cert"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1543
+#: Src/wptKeyManagerDlg.cpp:1560
msgid "It does not make any sense with a key pair!"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1560
+#: Src/wptKeyManagerDlg.cpp:1577
msgid "Key Signature List"
msgstr "Liste de signature de clé"
-#: Src/wptKeyManagerDlg.cpp:1575 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1585
+#: Src/wptKeyManagerDlg.cpp:1602
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:1615
+#: Src/wptKeyManagerDlg.cpp:1632
msgid "Smart Card support is not available."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1638 Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyManagerDlg.cpp:1655 Src/wptKeyserverDlg.cpp:584
msgid "Keyserver Access"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1655
+#: Src/wptKeyManagerDlg.cpp:1672
msgid "GnuPG Options"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1714
msgid "There is no corresponding secret key for this key."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1702
+#: Src/wptKeyManagerDlg.cpp:1719
msgid "You can only export one secret key."
msgstr "Vous pouvez exporter seulement une clé secrète."
-#: Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1724
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3133,11 +3152,11 @@
"\n"
"Voulez-vous vraiment exporter cette clé?"
-#: Src/wptKeyManagerDlg.cpp:1712
+#: Src/wptKeyManagerDlg.cpp:1729
msgid "WARNING"
msgstr "ATTENTION"
-#: Src/wptKeyManagerDlg.cpp:1775
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "No key was selected, select all by default."
msgstr ""
@@ -3145,8 +3164,8 @@
msgid "I trust ultimately (implicit)"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
-#: Src/wptVerifyList.cpp:245
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:224
msgid "Unknown"
msgstr ""
@@ -3207,27 +3226,27 @@
msgid "Ownertrust successfully changed."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
msgid "Key Revokers"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:84
+#: Src/wptKeyRevokeDlg.cpp:82
msgid "Reason for revocation"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyRevokeDlg.cpp:83
msgid "Optional description text"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyRevokeDlg.cpp:84
msgid "&Passphrase"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyRevokeDlg.cpp:85
msgid "Output file"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:112
+#: Src/wptKeyRevokeDlg.cpp:136
msgid ""
"Please move this certificate to a medium where it can bestored in a safe "
"place (floppy, CDR, etc..).\n"
@@ -3235,31 +3254,31 @@
"key unusable!"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:135
+#: Src/wptKeyRevokeDlg.cpp:159
msgid "Choose File to save the Certificate"
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:144
+#: Src/wptKeyRevokeDlg.cpp:168
msgid "Please select a reason."
msgstr ""
-#: Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyRevokeDlg.cpp:195
msgid "Revocation certificate generated."
msgstr ""
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:57
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
msgid "Algorithm"
msgstr ""
-#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
+#: Src/wptKeyRevokersDlg.cpp:121 Src/wptKeyRevokersDlg.cpp:175
msgid "Designated Key Revokers"
msgstr ""
-#: Src/wptKeyRevokersDlg.cpp:147
+#: Src/wptKeyRevokersDlg.cpp:161
msgid "Designated Revoker Keys"
msgstr ""
-#: Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyRevokersDlg.cpp:176
#, c-format
msgid "Do you want to retrieve 0x%s via the default keyserver?"
msgstr ""
@@ -3368,84 +3387,84 @@
msgid "Port"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:476
+#: Src/wptKeyserverDlg.cpp:475
msgid "No space for new keyserver entry"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:496
msgid "HKP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:497
msgid "LDAP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:498
msgid "Finger Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:758
+#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:757
msgid "Edit Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
msgid "&Add"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:526
msgid "Type:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:527
msgid "Port:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:528
msgid "Host name:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:536
msgid "Please enter a host name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:542
+#: Src/wptKeyserverDlg.cpp:541
msgid "Invalid port, valid numbers are < 65535"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:587
msgid "Send key (default is receiving)"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:589
msgid "Please enter the key ID or email address you search for"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:590
msgid "&Search"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:591
msgid "C&hange proxy"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:593
+#: Src/wptKeyserverDlg.cpp:592
msgid "Set &default"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:617
msgid "&Remove"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Edit"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:69
#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
@@ -3453,27 +3472,27 @@
msgid "Proxy Settings"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
msgid "Please select one of the keyservers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:660
+#: Src/wptKeyserverDlg.cpp:659
msgid "This is not implemented yet!"
msgstr "Ceci n'est pas encore implémenté!"
-#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:666 Src/wptKeyserverDlg.cpp:698
msgid "Please enter the search pattern."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:703
msgid "Only keyids are allowed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:709
msgid "Only enter the name of the user."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:716
+#: Src/wptKeyserverDlg.cpp:715
msgid "Only email addresses or keyids are allowed."
msgstr ""
@@ -3486,7 +3505,7 @@
msgid "Keyserver Searching"
msgstr ""
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptKeyserverSearchDlg.cpp:87 Src/wptKeyserverSearchDlg.cpp:117
msgid "Keyserver Search"
msgstr ""
@@ -3511,72 +3530,76 @@
msgid "%s %s signature"
msgstr ""
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:210
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
msgid "Signature Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:164 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
msgid "Exportable"
msgstr ""
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:207
+#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
msgid "Non-revocably"
msgstr ""
-#: Src/wptKeysigDlg.cpp:144 Src/wptSigList.cpp:53
+#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
msgid "Class"
msgstr ""
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:146
msgid "Expire date"
msgstr ""
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:147
msgid "Issuer key"
msgstr ""
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:148
msgid "Issuer key ID"
msgstr ""
-#: Src/wptKeysigDlg.cpp:164
+#: Src/wptKeysigDlg.cpp:149
+msgid "Policy URL"
+msgstr ""
+
+#: Src/wptKeysigDlg.cpp:166
msgid "Non-exportable"
msgstr ""
-#: Src/wptKeysigDlg.cpp:177 Src/wptSigList.cpp:156
+#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
msgid " user ID not found"
msgstr ""
-#: Src/wptKeysigDlg.cpp:283
+#: Src/wptKeysigDlg.cpp:288
msgid "Really receive all missing keys?"
msgstr ""
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:322 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:318
+#: Src/wptKeysigDlg.cpp:323
msgid "Signing &Key Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:357
+#: Src/wptKeysigDlg.cpp:362
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr ""
-#: Src/wptKeysigDlg.cpp:367
+#: Src/wptKeysigDlg.cpp:372
msgid "Key not found in keyring."
msgstr "Clé non trouvée dans le porte-clés."
-#: Src/wptKeysigDlg.cpp:395
+#: Src/wptKeysigDlg.cpp:400
#, c-format
msgid "Signature List for \"%s\""
msgstr ""
-#: Src/wptKeysigDlg.cpp:399
+#: Src/wptKeysigDlg.cpp:404
msgid "&Receive Key"
msgstr ""
-#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
msgid "Choose Signature Class"
msgstr ""
@@ -3606,7 +3629,7 @@
msgid "never"
msgstr "jamais"
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:261
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -3619,45 +3642,45 @@
"Are you really sure that you want to sign this key with YOUR key?\n"
msgstr ""
-#: Src/wptKeysignDlg.cpp:277
+#: Src/wptKeysignDlg.cpp:273
msgid "No valid secret key found."
msgstr "Aucune clé secrète valide n'a été trouvée."
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:279
msgid "Sign local only (non exportable signature)"
msgstr ""
-#: Src/wptKeysignDlg.cpp:283
+#: Src/wptKeysignDlg.cpp:280
msgid "Signature expires on"
msgstr ""
-#: Src/wptKeysignDlg.cpp:284
+#: Src/wptKeysignDlg.cpp:281
msgid "Sign non-revocably"
msgstr ""
-#: Src/wptKeysignDlg.cpp:285
+#: Src/wptKeysignDlg.cpp:282
msgid "&Ask for certification level"
msgstr ""
-#: Src/wptKeysignDlg.cpp:288
+#: Src/wptKeysignDlg.cpp:285
msgid "&Show photo"
msgstr "&Montrer la photo"
-#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
-#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
+#: Src/wptKeysignDlg.cpp:286 Src/wptPassphraseCB.cpp:94
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr ""
-#: Src/wptKeysignDlg.cpp:355
+#: Src/wptKeysignDlg.cpp:352
msgid "You cannot select today as the expiration date."
msgstr ""
-#: Src/wptKeysignDlg.cpp:371
+#: Src/wptKeysignDlg.cpp:368
msgid "Could not get Key ID from key."
msgstr ""
-#: Src/wptKeysignDlg.cpp:392
+#: Src/wptKeysignDlg.cpp:389
msgid "This key is already signed by your key"
msgstr "Cette clé est déja signée par votre clé"
@@ -3736,31 +3759,31 @@
msgid "MAPI Login failed."
msgstr ""
-#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:227
msgid "Could not sent mail."
msgstr ""
-#: Src/wptMDSumDlg.cpp:72
+#: Src/wptMDSumDlg.cpp:103
msgid "Digest"
msgstr ""
-#: Src/wptMDSumDlg.cpp:103
+#: Src/wptMDSumDlg.cpp:121
msgid "&Save..."
msgstr "&Enregistrer..."
-#: Src/wptMDSumDlg.cpp:105
+#: Src/wptMDSumDlg.cpp:123
msgid "Save to clipboard"
msgstr "Enregistrer dans le presse papiers"
-#: Src/wptMDSumDlg.cpp:106
+#: Src/wptMDSumDlg.cpp:124
msgid "Print Message Digest"
msgstr ""
-#: Src/wptMDSumDlg.cpp:149
+#: Src/wptMDSumDlg.cpp:177
msgid "Select file to save checksums"
msgstr ""
-#: Src/wptMDSumDlg.cpp:154
+#: Src/wptMDSumDlg.cpp:182
#, c-format
msgid "Checksums successfully saved in '%s'"
msgstr ""
@@ -3788,31 +3811,31 @@
msgid "Ownertrust succefully imported."
msgstr ""
-#: Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:98
msgid "Encrypted with the following public key(s)"
msgstr "Chiffré avec la clé publique suivante"
-#: Src/wptPassphraseCB.cpp:143
+#: Src/wptPassphraseCB.cpp:142
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr ""
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:153
msgid "Bad passphrase; Enter passphrase again"
msgstr "Mauvaise passphrase; réessayer encore"
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:154
msgid "Please enter your passphrase"
msgstr "Entrer votre passphrase"
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:158
#, c-format
msgid ""
"Symmetric encryption.\n"
"%s encrypted data."
msgstr ""
-#: Src/wptPassphraseCB.cpp:304
+#: Src/wptPassphraseCB.cpp:302
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -3823,7 +3846,7 @@
"secrète de l'utilisateur: \"%s\"\n"
"%s key, ID %s (main key ID %s)\n"
-#: Src/wptPassphraseCB.cpp:310
+#: Src/wptPassphraseCB.cpp:308
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -3834,7 +3857,7 @@
"secrète de l'utilisateur: \"%s\"\n"
"%s key, ID %s\n"
-#: Src/wptPassphraseCB.cpp:398
+#: Src/wptPassphraseCB.cpp:396
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -4075,11 +4098,11 @@
msgid "Could not write to Registry."
msgstr ""
-#: Src/wptSigList.cpp:52
+#: Src/wptSigList.cpp:53
msgid "Valid"
msgstr ""
-#: Src/wptSigList.cpp:56
+#: Src/wptSigList.cpp:57
msgid "Expiration"
msgstr ""
@@ -4088,7 +4111,7 @@
msgid "Signature Tree for \"%s\" (0x%s)"
msgstr ""
-#: Src/wptSigTreeDlg.cpp:167
+#: Src/wptSigTreeDlg.cpp:166
msgid "Edit..."
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Po/jp.po 2006-05-01 12:22:18 UTC (rev 208)
@@ -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-04-22 20:08+0200\n"
+"POT-Creation-Date: 2006-04-29 19:32+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"
@@ -80,16 +80,16 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyserver.cpp:541
#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
-#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
-#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
-#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
-#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
-#: Src/wptKeyserverDlg.cpp:717
+#: Src/wptKeyserverDlg.cpp:476 Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:541 Src/wptKeyserverDlg.cpp:652
+#: Src/wptKeyserverDlg.cpp:660 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:704 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:716
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
@@ -153,7 +153,7 @@
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:810
+#: Src/wptFileManagerDlg.cpp:814
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
@@ -216,7 +216,7 @@
# c:\oss\winpt\src\wptAboutDlgs.cpp:78
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
# c:\oss\winpt\src\wptMainProc.cpp:560
-#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1741
#: Src/wptMainProc.cpp:586
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -269,8 +269,8 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
-#: Src/wptKeyManagerDlg.cpp:947
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2156
+#: Src/wptKeyManagerDlg.cpp:962
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
@@ -380,12 +380,12 @@
"‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:515
msgid "&Name"
msgstr "–¼‘O(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "ƒIƒvƒVƒ‡ƒiƒ‹ƒRƒƒ“ƒg(&C)"
@@ -394,7 +394,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "—LŒøŠúŒÀ(&E)"
@@ -404,12 +404,12 @@
msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX(&A)"
@@ -423,7 +423,7 @@
msgstr "ˆÃ†‰»ƒL[‚̃J[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1620
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1637
msgid "Card Key Generation"
msgstr "ƒJ[ƒhƒL[ì¬"
@@ -459,7 +459,7 @@
# c:\oss\winpt\src\wptCardDlg.cpp:580
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
# c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1397
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -546,9 +546,9 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
-#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
-#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
+#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
+#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
+#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
msgid "user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -560,14 +560,14 @@
# c:\oss\winpt\src\wptFileManager.cpp:996
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
-#: Src/wptFileManager.cpp:1357
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1304
+#: Src/wptFileManager.cpp:1351
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -615,38 +615,38 @@
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:274
-#: Src/wptKeyManager.cpp:752 Src/wptKeyManager.cpp:951 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:286
+#: Src/wptKeyManager.cpp:766 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:181
+#: Src/wptClipDecryptDlg.cpp:177
msgid "Signature Status: Created with a fully trusted key"
msgstr "–¼‚Ìó‘ÔFŠ®‘S‚ÉM—p‚Å‚«‚éƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:172
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:179
msgid "Signature Status: Created with a marginal trusted key"
msgstr "–¼‚Ìó‘ÔF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:186
+#: Src/wptClipDecryptDlg.cpp:182
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr "–¼‚Ìó‘ÔFM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:189
+#: Src/wptClipDecryptDlg.cpp:185
msgid "Signature Status: Created with an undefined trusted key"
msgstr "–¼‚Ìó‘ÔF’è‹`‚³‚ê‚Ä‚¢‚È‚¢Š®‘S‚ÉM—p‚Å‚«‚éƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:187
-#: Src/wptClipDecryptDlg.cpp:196
+#: Src/wptClipDecryptDlg.cpp:192
msgid "WinPT Verify"
msgstr "WinPT Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:193
#, c-format
msgid ""
"%s\n"
@@ -680,7 +680,7 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:114
# c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
msgid "File Open"
msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
@@ -747,8 +747,8 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
-#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
+#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -782,12 +782,12 @@
#: 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:367 Src/wptKeyEditDlgs.cpp:455
-#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
-#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
-#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
+#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:539 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/wptKeysignDlg.cpp:284 Src/wptPassphraseCB.cpp:93
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -837,8 +837,8 @@
#: 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:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1082
+#: Src/wptFileManager.cpp:1098 Src/wptFileManager.cpp:1408
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
@@ -882,7 +882,7 @@
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1203
msgid "No key was selected."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -912,9 +912,9 @@
# c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
# c:\oss\winpt\src\wptMainProc.cpp:406
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
-#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
-#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
-#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:209
+#: Src/wptClipVerifyDlg.cpp:241 Src/wptClipVerifyDlg.cpp:252
+#: Src/wptFileManager.cpp:1586 Src/wptFileManager.cpp:1639
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -923,7 +923,7 @@
msgstr "Šm”F‚·‚é"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:81
-#: Src/wptClipVerifyDlg.cpp:206
+#: Src/wptClipVerifyDlg.cpp:203
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -937,17 +937,17 @@
"ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
-#: Src/wptClipVerifyDlg.cpp:244
+#: Src/wptClipVerifyDlg.cpp:241
msgid "Invalid signature state."
msgstr "–¼‚Ì󋵂͖³Œø‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:118
-#: Src/wptClipVerifyDlg.cpp:254
+#: Src/wptClipVerifyDlg.cpp:251
msgid "Could not extract key or signature information."
msgstr "ƒL[‚Ü‚½‚Í–¼î•ñ‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptClipVerifyDlg.cpp:258
+#: Src/wptClipVerifyDlg.cpp:255
msgid "The signature is expired!"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚ª‰ß‚¬‚Ä‚¢‚Ü‚·I"
@@ -959,7 +959,7 @@
# c:\oss\winpt\src\wptFileSaveDlg.cpp:92
# c:\oss\winpt\src\wptFileSaveDlg.cpp:97
# c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:289 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -1021,36 +1021,37 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1568
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1173
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
-#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
-#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
-#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
-#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
-#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
-#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
-#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
-#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
-#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
-#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
-#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
-#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
-#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
-#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
-#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
-#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
-#: Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:893 Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:921 Src/wptKeyEditDlgs.cpp:951
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1034 Src/wptKeyEditDlgs.cpp:1052
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1105
+#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1326 Src/wptKeyEditDlgs.cpp:1333
+#: Src/wptKeyEditDlgs.cpp:1369 Src/wptKeyEditDlgs.cpp:1373
+#: Src/wptKeyEditDlgs.cpp:1383 Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1402 Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1449 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1462 Src/wptKeyEditDlgs.cpp:1467
+#: Src/wptKeyEditDlgs.cpp:1512 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1524 Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1534 Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1582 Src/wptKeyEditDlgs.cpp:1599
+#: Src/wptKeyEditDlgs.cpp:1619 Src/wptKeyEditDlgs.cpp:1627
+#: Src/wptKeyEditDlgs.cpp:1736 Src/wptKeyEditDlgs.cpp:1769
+#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1818 Src/wptKeyEditDlgs.cpp:1940
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1958
+#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1993
+#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2007
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2025
+#: Src/wptKeyEditDlgs.cpp:2092 Src/wptKeyEditDlgs.cpp:2133
+#: Src/wptKeyEditDlgs.cpp:2146 Src/wptKeyEditDlgs.cpp:2160
+#: Src/wptKeyEditDlgs.cpp:2189 Src/wptKeyEditDlgs.cpp:2194
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1765
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1323,12 +1324,12 @@
# c:\oss\winpt\src\wptMainProc.cpp:387 c:\oss\winpt\src\wptMainProc.cpp:526
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
-#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
-#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
-#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
-#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:664
+#: Src/wptFileManager.cpp:809 Src/wptFileManager.cpp:924
+#: Src/wptFileManager.cpp:1493 Src/wptFileManager.cpp:1520
+#: Src/wptFileManager.cpp:1539 Src/wptFileManager.cpp:1790
+#: Src/wptFileManager.cpp:1852 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1364,7 +1365,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:179
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
# c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1085
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1373,8 +1374,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:919
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:43
# c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
-#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1184
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "–¼‘O"
@@ -1385,12 +1386,12 @@
msgstr "‘€ì"
# c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:666
+#: Src/wptFileManager.cpp:663
msgid "Please select a file."
msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:813
+#: Src/wptFileManager.cpp:810
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1400,25 +1401,25 @@
"‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:925
#, c-format
msgid "\"%s\" does not exist"
msgstr "%s ‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:779
# c:\oss\winpt\src\wptFileStatDlg.cpp:225
-#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1008 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:825
-#: Src/wptFileManager.cpp:1055
+#: Src/wptFileManager.cpp:1052
msgid "Enter filename for encrypted file"
msgstr "ˆÃ†‰»‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:837
-#: Src/wptFileManager.cpp:1084
+#: Src/wptFileManager.cpp:1081
msgid "Could not get default secret key."
msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1427,7 +1428,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:296
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
+#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1436,7 +1437,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:868
# c:\oss\winpt\src\wptFileManagerDlg.cpp:401
# c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
-#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1125 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1445,28 +1446,28 @@
# c:\oss\winpt\src\wptFileManager.cpp:914
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
-#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
-#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
+#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
# c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1193
+#: Src/wptFileManager.cpp:1190
msgid "Encryption failed."
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1231
#, fuzzy, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1477,30 +1478,30 @@
"%s ‚©‚ç \"%s\"‚Å‚·B"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1241
+#: Src/wptFileManager.cpp:1236
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1319
+#: Src/wptFileManager.cpp:1313
msgid "Choose Filename for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1328
+#: Src/wptFileManager.cpp:1322
msgid "Please enter filename for plaintext file"
msgstr "ƒvƒŒ[ƒ“ƒeƒLƒX—p‚̃gƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1006
# c:\oss\winpt\src\wptFileManager.cpp:1011
# c:\oss\winpt\src\wptFileManagerDlg.cpp:402
-#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
+#: Src/wptFileManager.cpp:1360 Src/wptFileManager.cpp:1372
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1372
+#: Src/wptFileManager.cpp:1366
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1509,7 +1510,7 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
-#: Src/wptFileManager.cpp:1379
+#: Src/wptFileManager.cpp:1373
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1518,32 +1519,32 @@
msgstr ""
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1427
+#: Src/wptFileManager.cpp:1421
msgid "Enter filename for signed file"
msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1531
+#: Src/wptFileManager.cpp:1519
msgid "Could not find detached signature in the clipboard."
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ÉŽæ‚èo‚µ‚½–¼‚ðŒ©‚Â‚¯‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1551
+#: Src/wptFileManager.cpp:1539
msgid "No files to check."
msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1568
+#: Src/wptFileManager.cpp:1556
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1570
+#: Src/wptFileManager.cpp:1558
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1598
+#: Src/wptFileManager.cpp:1586
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1558,18 +1559,18 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
-#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
-#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
-#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:459
-#: Src/wptKeyManager.cpp:587 Src/wptKeyserverDlg.cpp:223
+#: Src/wptFileManager.cpp:1684 Src/wptFileManager.cpp:1695
+#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
+#: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
+#: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
+#: Src/wptKeyManager.cpp:460 Src/wptKeyManager.cpp:471
+#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:223
msgid "Import"
msgstr "ƒCƒ“ƒ|[ƒg"
# c:\oss\winpt\src\wptFileManager.cpp:1285
# c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptFileManager.cpp:1704
+#: Src/wptFileManager.cpp:1692
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1585,15 +1586,15 @@
# c:\oss\winpt\src\wptKeyManager.cpp:262
# c:\oss\winpt\src\wptKeyManager.cpp:294
# c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
-#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
+#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
+#: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
msgid "No key was selected for export."
msgstr "ƒGƒLƒXƒ|[ƒg‚·‚邽‚߂̃L[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1718 Src/wptFileManager.cpp:1741
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1601,8 +1602,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:1738 Src/wptKeyManagerDlg.cpp:1684
-#: Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1611,51 +1612,51 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1757
+#: Src/wptFileManager.cpp:1745
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1803
+#: Src/wptFileManager.cpp:1791
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1863
+#: Src/wptFileManager.cpp:1851
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "‘½”‚̃tƒ@ƒCƒ‹‚ðZipƒA[ƒJƒCƒu‚ɈƉ»‚·‚邱‚Æ‚ª—Ç‚¢‚±‚Æ‚Å‚·B"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1868
+#: Src/wptFileManager.cpp:1856
msgid "Choose File Name for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1938
+#: Src/wptFileManager.cpp:1926
msgid "Choose a Name for the Archive"
msgstr "ƒA[ƒJƒCƒu‚É–¼‘O‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
-#: Src/wptFileManager.cpp:1941
+#: Src/wptFileManager.cpp:1929
msgid "Invalid archive name. Exit."
msgstr "–³Œø‚ȃA[ƒJƒCƒu–¼BI—¹B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1929 Src/wptFileManager.cpp:1936
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1936
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1693,14 +1694,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:412
+#: Src/wptKeyManager.cpp:424
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:437
+#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
@@ -1711,7 +1712,7 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
@@ -1757,7 +1758,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:939
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
msgid "Options"
msgstr "ƒIƒvƒVƒ‡ƒ“"
@@ -1777,14 +1778,14 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
-#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
-#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
+#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:787
+#: Src/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1511
+#: Src/wptKeyManagerDlg.cpp:1527 Src/wptKeyManagerDlg.cpp:1555
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1803,12 +1804,12 @@
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
-#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
msgid "View"
msgstr "ƒrƒ…["
@@ -1839,8 +1840,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:357
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:993
msgid "&Sign"
msgstr "–¼(&S)"
@@ -1949,30 +1950,30 @@
msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:762
+#: Src/wptFileManagerDlg.cpp:766
msgid "Are you sure you want to secure delete these files?"
msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘S휂µ‚Ü‚·‚©Hn"
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:811
msgid "Operation Status: Error"
msgstr "‘€ìó‹µFƒGƒ‰["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:808
+#: Src/wptFileManagerDlg.cpp:812
msgid "Operation Status: Done."
msgstr "‘€ìó‹µFŠ®—¹B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:851
+#: Src/wptFileManagerDlg.cpp:855
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -2107,7 +2108,7 @@
#: 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:1762 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1741 Src/wptKeyManagerDlg.cpp:955
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -2188,42 +2189,42 @@
msgid "No GPG error description available."
msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
-#: Src/wptGPGME.cpp:313
+#: Src/wptGPGME.cpp:318
msgid "Error during verification process."
msgstr "Šm”F’iŠK‚ŃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptGPGME.cpp:314
+#: Src/wptGPGME.cpp:319
msgid "The signature is good."
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptGPGME.cpp:315
+#: Src/wptGPGME.cpp:320
msgid "The signature is BAD!"
msgstr "–³Œø‚È–¼"
-#: Src/wptGPGME.cpp:316
+#: Src/wptGPGME.cpp:321
msgid "The signature could not be checked due to a missing key."
msgstr "‚È‚‚È‚Á‚½ƒL[‚Ì‚½‚ß–¼‚ªƒ`ƒFƒbƒN‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:190
# c:\oss\winpt\src\wptKeyManager.cpp:408
-#: Src/wptGPGME.cpp:317
+#: Src/wptGPGME.cpp:322
msgid "No valid OpenPGP signature."
msgstr "—LŒø‚ÈOpenPGP–¼‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:323
msgid "Signature Error"
msgstr "–¼ƒGƒ‰["
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:324
msgid "Good Signature (Expired Key)"
msgstr "—LŒø‚È–¼iŠúŒÀØ‚êƒL[j"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:325
msgid "Good Signature (Revoked Key)"
msgstr "—LŒø‚È–¼i–³Œø‚ȃL[j"
@@ -2275,7 +2276,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:1646
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1663
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2441,36 +2442,36 @@
# 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:154 Src/wptKeyManager.cpp:159
-#: Src/wptKeyManager.cpp:210 Src/wptKeyManager.cpp:253
-#: Src/wptKeyManager.cpp:265 Src/wptKeyManager.cpp:296
-#: Src/wptKeyManager.cpp:301 Src/wptKeyManager.cpp:308
-#: Src/wptKeyManager.cpp:310 Src/wptKeyManager.cpp:331
-#: Src/wptKeyManager.cpp:340 Src/wptKeyManager.cpp:344
-#: Src/wptKeyManager.cpp:364 Src/wptKeyManager.cpp:405
-#: Src/wptKeyManager.cpp:410 Src/wptKeyManager.cpp:413
-#: Src/wptKeyManager.cpp:418 Src/wptKeyManager.cpp:424
-#: Src/wptKeyManager.cpp:429 Src/wptKeyManager.cpp:557
-#: Src/wptKeyManager.cpp:565 Src/wptKeyManager.cpp:671
-#: Src/wptKeyManager.cpp:700 Src/wptKeyManager.cpp:709
-#: Src/wptKeyManager.cpp:720 Src/wptKeyManager.cpp:746
-#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:780
-#: Src/wptKeyManager.cpp:804 Src/wptKeyManager.cpp:809
-#: Src/wptKeyManager.cpp:829 Src/wptKeyManager.cpp:884
-#: Src/wptKeyManager.cpp:889 Src/wptKeyManager.cpp:949
-#: Src/wptKeyManager.cpp:979 Src/wptKeyManager.cpp:1068
-#: Src/wptKeyManagerDlg.cpp:1162 Src/wptKeyManagerDlg.cpp:1175
-#: Src/wptKeyManagerDlg.cpp:1185 Src/wptKeyManagerDlg.cpp:1473
-#: Src/wptKeyManagerDlg.cpp:1495 Src/wptKeyManagerDlg.cpp:1510
-#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeyManagerDlg.cpp:1528
-#: Src/wptKeyManagerDlg.cpp:1538 Src/wptKeyManagerDlg.cpp:1544
-#: Src/wptKeyManagerDlg.cpp:1554 Src/wptKeyManagerDlg.cpp:1567
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyManagerDlg.cpp:1616
-#: Src/wptKeyManagerDlg.cpp:1675 Src/wptKeyManagerDlg.cpp:1693
-#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
-#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
-#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:168 Src/wptKeyManager.cpp:173
+#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:265
+#: Src/wptKeyManager.cpp:277 Src/wptKeyManager.cpp:308
+#: Src/wptKeyManager.cpp:313 Src/wptKeyManager.cpp:320
+#: Src/wptKeyManager.cpp:322 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:352 Src/wptKeyManager.cpp:356
+#: Src/wptKeyManager.cpp:376 Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:422 Src/wptKeyManager.cpp:425
+#: Src/wptKeyManager.cpp:430 Src/wptKeyManager.cpp:436
+#: Src/wptKeyManager.cpp:441 Src/wptKeyManager.cpp:569
+#: Src/wptKeyManager.cpp:577 Src/wptKeyManager.cpp:683
+#: Src/wptKeyManager.cpp:714 Src/wptKeyManager.cpp:723
+#: Src/wptKeyManager.cpp:734 Src/wptKeyManager.cpp:760
+#: Src/wptKeyManager.cpp:787 Src/wptKeyManager.cpp:792
+#: Src/wptKeyManager.cpp:816 Src/wptKeyManager.cpp:821
+#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:891
+#: Src/wptKeyManager.cpp:896 Src/wptKeyManager.cpp:952
+#: Src/wptKeyManager.cpp:982 Src/wptKeyManager.cpp:1069
+#: Src/wptKeyManagerDlg.cpp:1178 Src/wptKeyManagerDlg.cpp:1191
+#: Src/wptKeyManagerDlg.cpp:1201 Src/wptKeyManagerDlg.cpp:1490
+#: Src/wptKeyManagerDlg.cpp:1512 Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyManagerDlg.cpp:1537 Src/wptKeyManagerDlg.cpp:1545
+#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1561
+#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
+#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyManagerDlg.cpp:1633
+#: Src/wptKeyManagerDlg.cpp:1692 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1715 Src/wptKeyManagerDlg.cpp:1720
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1925
+#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:289
+#: Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:372 Src/wptKeysigDlg.cpp:420
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2569,12 +2570,13 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
-#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
-#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
-#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
+#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:255
+#: Src/wptKeyEditDlgs.cpp:1156 Src/wptKeyEditDlgs.cpp:1214
+#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1522 Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeylist.cpp:420 Src/wptKeylist.cpp:454
+#: Src/wptKeyPropsDlg.cpp:163 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:213
msgid "Revoked"
msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2583,26 +2585,26 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
-#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
-#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
+#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:257
+#: Src/wptKeyEditDlgs.cpp:1154 Src/wptKeyEditDlgs.cpp:1380
+#: Src/wptKeylist.cpp:422 Src/wptKeylist.cpp:452 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:214
msgid "Expired"
msgstr "ŠúŒÀØ‚ê"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptImportList.cpp:268
+#: Src/wptImportList.cpp:272
msgid "secret key"
msgstr "ӎФΨ"
# c:\oss\winpt\src\wptImportList.cpp:57
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
msgid "public key"
msgstr "ŒöŠJŒ®"
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2612,9 +2614,9 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:45
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
-#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
+#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:575 Src/wptKeylist.cpp:583
+#: Src/wptKeyManagerDlg.cpp:872 Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:52
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr "ƒ†[ƒU[ID"
@@ -2623,8 +2625,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:474 c:\oss\winpt\src\wptKeylist.cpp:40
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
-#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
+#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2634,10 +2636,10 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
-#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1082
+#: Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584 Src/wptKeyManagerDlg.cpp:873
+#: Src/wptKeyManagerDlg.cpp:964 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:56
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "ƒL[‚ÌID"
@@ -2647,21 +2649,21 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
# c:\oss\winpt\src\wptSigList.cpp:44
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
-#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
-#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1083
+#: Src/wptKeyEditDlgs.cpp:1186 Src/wptKeylist.cpp:590
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
msgid "Creation"
msgstr "ì¬"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
+#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
msgid "Type"
msgstr "Ží—Þ"
# c:\oss\winpt\src\wptImportList.cpp:216
-#: Src/wptImportList.cpp:426
+#: Src/wptImportList.cpp:418
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
"and thus a CRC error occurs."
@@ -2671,52 +2673,52 @@
# c:\oss\winpt\src\WinPT.cpp:247 c:\oss\winpt\src\wptGPG.cpp:864
# c:\oss\winpt\src\wptGPG.cpp:884
-#: Src/wptKeyCache.cpp:655
+#: Src/wptKeyCache.cpp:747
msgid "Load GPG Keyrings..."
msgstr "GPGƒL[ƒŠƒ“ƒO‚ðƒ[ƒh‚·‚é..."
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:48
-#: Src/wptKeyCacheDlg.cpp:53
+#: Src/wptKeyCacheDlg.cpp:52
msgid "WinPT Key Caching"
msgstr "WinPT ƒL[ƒLƒƒƒbƒVƒ“ƒO"
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:51
-#: Src/wptKeyCacheDlg.cpp:56
+#: Src/wptKeyCacheDlg.cpp:55
msgid "Caching keyrings, please wait..."
msgstr "ƒL[ƒŠƒ“ƒO‚ªƒLƒƒƒbƒVƒ“ƒO’†‚Å‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢..."
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:65
-#: Src/wptKeyCacheDlg.cpp:69
+#: Src/wptKeyCacheDlg.cpp:70
msgid "Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:234
+#: Src/wptKeyEditDlgs.cpp:228
msgid "Ultimate"
msgstr "ÅI“I"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
# c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
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:265 Src/wptKeyEditDlgs.cpp:1173
+#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1158
msgid "OK"
msgstr "OK"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:288
+#: Src/wptKeyEditDlgs.cpp:281
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:289
+#: Src/wptKeyEditDlgs.cpp:282
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2724,7 +2726,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:364
+#: Src/wptKeyEditDlgs.cpp:354
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
@@ -2735,7 +2737,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:355
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2745,8 +2747,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
-#: Src/wptKeysignDlg.cpp:286
+#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2755,12 +2757,12 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:368
+#: Src/wptKeyEditDlgs.cpp:358
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:383
+#: Src/wptKeyEditDlgs.cpp:373
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2769,25 +2771,25 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
-#: Src/wptKeyEditDlgs.cpp:926
+#: Src/wptKeyEditDlgs.cpp:377 Src/wptKeyEditDlgs.cpp:387
+#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:915
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:378
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "ŽŸ‚̃tƒ@ƒCƒ‹'%s'‚ª—LŒø‚ÈJPEG‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:248
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyRevokeDlg.cpp:173
msgid "Please enter a file name."
msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:401
+#: Src/wptKeyEditDlgs.cpp:391
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2796,7 +2798,7 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:420
+#: Src/wptKeyEditDlgs.cpp:410
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2815,23 +2817,23 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:167
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:75
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
-#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
-#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
-#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
-#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:564 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1642 Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:318
-#: Src/wptKeyEditDlgs.cpp:452
+#: Src/wptKeyEditDlgs.cpp:442
msgid "Appointing a key as designated revoker cannot be undone."
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤Žw’肳‚ꂽŒãAŒ³‚É–ß‚³‚ê‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:319
-#: Src/wptKeyEditDlgs.cpp:453
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2839,8 +2841,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:358
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:708
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
-#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2849,35 +2851,35 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1324
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1365
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
-#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
-#: Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1517
+#: Src/wptKeyEditDlgs.cpp:1574 Src/wptKeyEditDlgs.cpp:1619
+#: Src/wptKeyEditDlgs.cpp:1769 Src/wptKeyEditDlgs.cpp:1807
+#: Src/wptKeyEditDlgs.cpp:1993
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:490
+#: Src/wptKeyEditDlgs.cpp:480
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:524
+#: Src/wptKeyEditDlgs.cpp:514
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:526
+#: Src/wptKeyEditDlgs.cpp:516
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:527
+#: Src/wptKeyEditDlgs.cpp:517
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:533
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2885,14 +2887,14 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
-#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
-#: Src/wptKeyEditDlgs.cpp:573
+#: Src/wptKeyEditDlgs.cpp:534 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:562
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:539
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2900,43 +2902,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:552
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:575
+#: Src/wptKeyEditDlgs.cpp:564
msgid "user ID successfully added."
msgstr "ƒ†[ƒU[ID‚𳂵‚’ljÁ‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:472
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:853
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:661
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:662
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:663
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:709
+#: Src/wptKeyEditDlgs.cpp:698
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2949,18 +2951,18 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:540
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:637
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:676
-#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
-#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:715
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS‚͌ŒèƒL[ƒTƒCƒY1024‚ªŽg—p‚µ‚Ü‚·BƒTƒCƒY‚ª•ÏX‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:678
-#: Src/wptKeyEditDlgs.cpp:750
+#: Src/wptKeyEditDlgs.cpp:739
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2973,40 +2975,40 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1196
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
-#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
-#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
-#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
-#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
-#: Src/wptKeyManagerDlg.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:767 Src/wptKeyEditDlgs.cpp:835
+#: Src/wptKeyEditDlgs.cpp:914 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:1026 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1506
+#: Src/wptKeyManagerDlg.cpp:1544
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:579
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:599
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:613
-#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:786
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:904
+#: Src/wptKeyEditDlgs.cpp:893
msgid "Preferred keyserver successfully set."
msgstr "Šó–]‚̃L[ƒT[ƒo[‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:58
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:189
-#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyManager.cpp:156
-#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
msgid "Key status changed."
msgstr "ƒL[‚Ìó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1032
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -3015,19 +3017,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:1050
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Current (old) Passphrase"
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "New Passphrase"
msgstr "V‚µ‚¢ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:771
# c:\oss\winpt\src\wptKeygenDlg.cpp:250
# c:\oss\winpt\src\wptPassphraseDlg.cpp:153
-#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1050 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3036,55 +3038,55 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1062
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1064
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1095
+#: Src/wptKeyEditDlgs.cpp:1084
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
+#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
msgid "Could not find key."
msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
-#: Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1105
msgid "No subkey(s) found."
msgstr "ƒTƒuƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
# c:\oss\winpt\src\wptKeylist.cpp:53
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
-#: Src/wptKeyManagerDlg.cpp:862
+#: Src/wptKeyEditDlgs.cpp:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
+#: Src/wptKeyManagerDlg.cpp:877
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1200
+#: Src/wptKeyEditDlgs.cpp:1185
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1198
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1280
#, fuzzy
msgid ""
"ADDUID \t\tadd a user ID\r\n"
@@ -3107,6 +3109,7 @@
"SIGN\t \t\tsign a user-id (exportable)\r\n"
"LSIGN\t \t\tsign a user-id (non-exportable)\r\n"
"CLEAN \t\tremove unusable signatures from key\r\n"
+"MINIMIZE \t\tremove all signatures from key\r\n"
msgstr ""
"ADDUID \t\tƒ†[ƒU[ID‚ð’ljÁ‚·‚é\r\n"
"ADDPHOTO \t\tƒtƒHƒgID‚ð’ljÁ‚·‚é\r\n"
@@ -3125,22 +3128,22 @@
"ENABLE \t\tƒL[‚ð—LŒø‚É‚·‚é\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1328
+#: Src/wptKeyEditDlgs.cpp:1302
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1326
msgid "Primary subkey can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒTƒuƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptKeyEditDlgs.cpp:1334
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3158,16 +3161,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1346
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1376
+#: Src/wptKeyEditDlgs.cpp:1350
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1407
+#: Src/wptKeyEditDlgs.cpp:1381
msgid ""
"Key already expired.\n"
"\n"
@@ -3180,22 +3183,22 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1146
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1149
# c:\oss\winpt\src\wptKeygenDlg.cpp:303 c:\oss\winpt\src\wptKeygenDlg.cpp:306
-#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
+#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1393
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1416
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1422
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1453
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3208,37 +3211,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1462
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1511
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1533
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1512
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1523
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1555
+#: Src/wptKeyEditDlgs.cpp:1529
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3250,57 +3253,57 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1579
+#: Src/wptKeyEditDlgs.cpp:1553
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1557
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1599
#, fuzzy
msgid "Could not set user ID preferences"
msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1665
+#: Src/wptKeyEditDlgs.cpp:1639
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1668
+#: Src/wptKeyEditDlgs.cpp:1642
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1736
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1740
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1763
+#: Src/wptKeyEditDlgs.cpp:1742
#, fuzzy
msgid "user ID:"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1815
+#: Src/wptKeyEditDlgs.cpp:1802
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1826
+#: Src/wptKeyEditDlgs.cpp:1813
#, fuzzy, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3314,21 +3317,21 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1846
+#: Src/wptKeyEditDlgs.cpp:1833
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeyEditDlgs.cpp:1837
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1955
+#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
msgid "Finished to compact key."
msgstr ""
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:1997
#, fuzzy
msgid "Do you really want to make this sig exportable?"
msgstr ""
@@ -3337,32 +3340,49 @@
"%s"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
+#: Src/wptKeyEditDlgs.cpp:2084
+#, c-format
+msgid ""
+"Your keys is listed as a designated revoker for the key\n"
+"\n"
+"%s\n"
+"\n"
+"Are you sure you want to create a revocation certificate\n"
+"which allow to revoke the key listed above?"
+msgstr ""
+
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:2074
+#: Src/wptKeyEditDlgs.cpp:2132
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:2087
+#: Src/wptKeyEditDlgs.cpp:2145
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:2096
+#: Src/wptKeyEditDlgs.cpp:2154
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
+# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
+#: Src/wptKeyEditDlgs.cpp:2157
+#, fuzzy
+msgid "&Revoke..."
+msgstr "–³Œø‰»‚«‚Ì‚¤"
+
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2189
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2193
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3422,8 +3442,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:920
-#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -3457,11 +3477,11 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:289 c:\oss\winpt\src\wptKeygenDlg.cpp:311
# c:\oss\winpt\src\wptKeygenDlg.cpp:392
#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
-#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
-#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
-#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:408 Src/wptKeygenDlg.cpp:413
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:423 Src/wptKeygenDlg.cpp:430
+#: Src/wptKeygenDlg.cpp:438 Src/wptKeygenDlg.cpp:452 Src/wptKeygenDlg.cpp:461
+#: Src/wptKeygenDlg.cpp:486 Src/wptKeygenDlg.cpp:582
+#: Src/wptKeyManagerDlg.cpp:1624 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
@@ -3535,7 +3555,7 @@
msgstr "RSA ‹y‚Ñ RSA (PGP)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:144
-#: Src/wptKeygenDlg.cpp:370
+#: Src/wptKeygenDlg.cpp:371
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
@@ -3544,84 +3564,84 @@
"ƒZ[ƒW‚ª‚Ђ傤‚¶‚·‚é‚Ü‚Å‚¨‘Ò‚¿‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeygenDlg.cpp:372
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr "ƒTƒuƒL[‚̃rƒbƒg’PˆÊ‚Å‚Ì‘å‚«‚³(&B)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:147
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "ŽÀ–¼(&R)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:153
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr "ƒL[‚ÌŽí—Þ(&T)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:189
-#: Src/wptKeygenDlg.cpp:406
+#: Src/wptKeygenDlg.cpp:407
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "–³Œø‚È’lB—LŒø”͈͂Í1024`4096ƒrƒbƒg‚Å‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:194
-#: Src/wptKeygenDlg.cpp:411
+#: Src/wptKeygenDlg.cpp:412
msgid "Do you really need such a large key?"
msgstr "‚±‚̂悤‚È’·‚¢ƒL[‚ð–{“–‚É‚¢‚è‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:559
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
msgid "Please do not enter the email address in the name field."
msgstr "–¼‘O‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
+#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:571
msgid "Please enter a valid email address."
msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:211
-#: Src/wptKeygenDlg.cpp:434
+#: Src/wptKeygenDlg.cpp:437
msgid "Please do NOT enter the email address in the comment field."
msgstr "ƒRƒƒ“ƒg‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:460 Src/wptKeyRevokeDlg.cpp:181
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:292 c:\oss\winpt\src\wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:532
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:533
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:534
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:535
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:536
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -3632,7 +3652,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:537
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3645,19 +3665,19 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1057
# c:\oss\winpt\src\wptKeygenDlg.cpp:378 c:\oss\winpt\src\wptKeygenDlg.cpp:383
# c:\oss\winpt\src\wptKeygenDlg.cpp:389 c:\oss\winpt\src\wptKeygenDlg.cpp:413
-#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
-#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeygenDlg.cpp:538 Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:572 Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeyManagerDlg.cpp:1647
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:540
msgid "E&xpert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:577
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3723,51 +3743,51 @@
msgstr "ƒL[‚ªƒAƒbƒvƒf[ƒg‚³‚ê‚Ä‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:252
+#: Src/wptKeylist.cpp:260
msgid "Key Pair"
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:254
+#: Src/wptKeylist.cpp:262
msgid "Key Pair (Card)"
msgstr "ƒL[ƒyƒA(ƒJ[ƒh)"
# c:\oss\winpt\src\wptKeylist.cpp:168
-#: Src/wptKeylist.cpp:255
+#: Src/wptKeylist.cpp:263
msgid "Public Key"
msgstr "ŒöŠJŒ®"
-#: Src/wptKeylist.cpp:353
+#: Src/wptKeylist.cpp:380
msgid "None"
msgstr "‚È‚µ"
# c:\oss\winpt\src\wptMAPI.cpp:396 c:\oss\winpt\src\wptMAPI.cpp:404
-#: Src/wptKeylist.cpp:357
+#: Src/wptKeylist.cpp:384
msgid "Marginal"
msgstr "‚Ù‚ñ‚̂킸‚©‚΂©‚è"
-#: Src/wptKeylist.cpp:360
+#: Src/wptKeylist.cpp:387
msgid "Full"
msgstr "ƒtƒ‹"
-#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr "–³Œø‰»‚È‚Á‚½"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:433
+#: Src/wptKeylist.cpp:460
msgid "key pair"
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
-#: Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
+#: Src/wptKeyManagerDlg.cpp:965
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:559 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "M—p"
@@ -3776,12 +3796,12 @@
# c:\oss\winpt\src\wptFileManager.cpp:1030
# c:\oss\winpt\src\wptKeylist.cpp:569 c:\oss\winpt\src\wptPassphraseCB.cpp:75
# c:\oss\winpt\src\wptVerifyList.cpp:160
-#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:762 Src/wptPassphraseCB.cpp:124
msgid "Invalid User ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
# c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1007
+#: Src/wptKeylist.cpp:1030
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -3797,12 +3817,12 @@
"‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1038 Src/wptKeylist.cpp:1100
msgid "Recipients"
msgstr "ŽóMŽÒ"
# c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1080
+#: Src/wptKeylist.cpp:1101
#, c-format
msgid ""
"KeyID %s.\n"
@@ -3812,12 +3832,12 @@
"–{“–‚É–³Œø‚ȃL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1182
+#: Src/wptKeylist.cpp:1203
msgid "Secret Key List"
msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManager.cpp:97
-#: Src/wptKeyManager.cpp:153
+#: Src/wptKeyManager.cpp:167
msgid ""
"This key has expired!\n"
"Key check failed."
@@ -3826,7 +3846,7 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:100
-#: Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:172
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
@@ -3835,29 +3855,29 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:298
-#: Src/wptKeyManager.cpp:300
+#: Src/wptKeyManager.cpp:312
msgid "Only one secret key can be exported."
msgstr "ˆêŒÂ‚̔閧Œ®‚Ì‚Ý‚ªƒGƒLƒXƒ|[ƒg‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:311
+#: Src/wptKeyManager.cpp:323
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr "”é–§Œ®‚ð'%s'‚É•Û‘¶‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptKeyManager.cpp:345
+#: Src/wptKeyManager.cpp:357
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr "ƒL[‚𳂵‚'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:412
-#: Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:429
msgid "No valid OpenPGP keys found."
msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:416
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:434
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
@@ -3866,13 +3886,13 @@
"ƒL[‚ðˆø‚o‚µ‚½‚¢‚Å‚µ‚傤‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:422
-#: Src/wptKeyManager.cpp:428
+#: Src/wptKeyManager.cpp:440
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:457 Src/wptKeyManager.cpp:585
+#: Src/wptKeyManager.cpp:469 Src/wptKeyManager.cpp:597
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -3883,51 +3903,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:486 Src/wptKeyManager.cpp:493
-#: Src/wptKeyManager.cpp:502
+#: Src/wptKeyManager.cpp:498 Src/wptKeyManager.cpp:505
+#: Src/wptKeyManager.cpp:514
msgid "Key Import HTTP"
msgstr "ƒL[ƒCƒ“ƒ|[ƒg‚ÌHTTP"
# c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:486
+#: Src/wptKeyManager.cpp:498
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr "–³Œø‚ÈHTTP URL: %s"
# c:\oss\winpt\src\wptMAPI.cpp:348
-#: Src/wptKeyManager.cpp:503
+#: Src/wptKeyManager.cpp:515
#, 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:532
+#: Src/wptKeyManager.cpp:544
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:545
+#: Src/wptKeyManager.cpp:557
msgid "File Import"
msgstr "ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒ|[ƒg"
# c:\oss\winpt\src\wptKeyManager.cpp:500
-#: Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:568
msgid "Could not read key-data from file."
msgstr "ƒL[‚̃f[ƒ^‚ðƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:676
+#: Src/wptKeyManager.cpp:688
msgid "Do you really want to confirm each key?"
msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
-#: Src/wptKeyManager.cpp:677
+#: Src/wptKeyManager.cpp:689
msgid "Delete Confirmation"
msgstr "Šm”F‚ð휂·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:701
+#: Src/wptKeyManager.cpp:715
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -3939,7 +3959,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:710
+#: Src/wptKeyManager.cpp:724
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3957,7 +3977,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:717
+#: Src/wptKeyManager.cpp:731
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3968,86 +3988,86 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:781
+#: Src/wptKeyManager.cpp:793
#, fuzzy, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "'%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s? ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:803
+#: Src/wptKeyManager.cpp:815
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:890
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:888
+#: Src/wptKeyManager.cpp:895
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:963
+#: Src/wptKeyManager.cpp:966
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:974
+#: Src/wptKeyManager.cpp:977
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:74
-#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:89
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:87
msgid "0. No reason specified"
msgstr "0. ——R‚Í–¾Ž¦‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:75
-#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:90
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:88
msgid "1. Key has been compromised"
msgstr "1. ƒL[‚ÍM—p‚Å‚«‚È‚‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:76
-#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:91
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:89
msgid "2. Key is superseded"
msgstr "2. ƒL[‚Í”pŽ~‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:77
-#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:92
+#: Src/wptKeyManager.cpp:1049 Src/wptKeyRevokeDlg.cpp:90
msgid "3. Key is no longer used"
msgstr "3. ƒL[‚Í‚à‚Í‚âŽg‚í‚ê‚Ä‚¢‚Ü‚¹‚ñ "
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:449 Src/wptKeyManagerDlg.cpp:985
msgid "Paste Key from Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:456
+#: Src/wptKeyManagerDlg.cpp:470
#, c-format
msgid "Default Key: %s"
msgstr "‹K’èƒL[‚Í: %s"
# c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:458
+#: Src/wptKeyManagerDlg.cpp:472
#, c-format
msgid "Default Key: 0x%s"
msgstr "‹K’èƒL[‚Í: 0x%s"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:479
+#: Src/wptKeyManagerDlg.cpp:493
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:480
+#: Src/wptKeyManagerDlg.cpp:494
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4058,71 +4078,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:915
+#: Src/wptKeyManagerDlg.cpp:930
msgid "Key"
msgstr "ƒL["
# c:\oss\winpt\src\wptGroupsDlg.cpp:49
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:919
+#: Src/wptKeyManagerDlg.cpp:934
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyManagerDlg.cpp:936
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:922
+#: Src/wptKeyManagerDlg.cpp:937
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:923
+#: Src/wptKeyManagerDlg.cpp:938
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:924
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:940
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:927
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:943
msgid "&Normal"
msgstr "•’Ê(&N)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
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:935 Src/wptKeyManagerDlg.cpp:1549
+#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4130,112 +4150,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:936
+#: Src/wptKeyManagerDlg.cpp:951
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:937
+#: Src/wptKeyManagerDlg.cpp:952
msgid "&Import..."
msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeysigDlg.cpp:405
msgid "&Properties"
msgstr "‘®«(&P)"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:957
msgid "E&xport Secret Key"
msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:958
msgid "Re&load Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyManagerDlg.cpp:959
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:960
msgid "Refresh &Keys (Keyserver)"
msgstr "ƒL[‚ðƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&K)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:586
# c:\oss\winpt\src\wptTextInputDlg.cpp:47
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Copy User ID to Clipboard"
msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Copy Key ID to Clipboard"
msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:982
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:968
+#: Src/wptKeyManagerDlg.cpp:983
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:969
+#: Src/wptKeyManagerDlg.cpp:984
msgid "Copy Key to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:995
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&fresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:997
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:999
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "Key..."
msgstr "ƒL[..."
@@ -4245,24 +4265,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:987
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Add"
msgstr "’ljÁ"
@@ -4281,11 +4301,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:994
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1173
+#: Src/wptKeyManagerDlg.cpp:1189
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -4293,61 +4313,61 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
# c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1184
+#: Src/wptKeyManagerDlg.cpp:1200
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:1301
+#: Src/wptKeyManagerDlg.cpp:1318
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1305
+#: Src/wptKeyManagerDlg.cpp:1322
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1309
+#: Src/wptKeyManagerDlg.cpp:1326
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1313
+#: Src/wptKeyManagerDlg.cpp:1330
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1317
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1321
+#: Src/wptKeyManagerDlg.cpp:1338
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:1325
+#: Src/wptKeyManagerDlg.cpp:1342
msgid "Paste key from clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1329
+#: Src/wptKeyManagerDlg.cpp:1346
msgid "Import key to keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1333
+#: Src/wptKeyManagerDlg.cpp:1350
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1460
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "New"
msgstr "V‹Kì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4359,15 +4379,15 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
# c:\oss\winpt\src\wptKeysignDlg.cpp:320
# c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1503 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
+#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeysignDlg.cpp:258
+#: Src/wptKeysignDlg.cpp:273 Src/wptKeysignDlg.cpp:353
+#: Src/wptKeysignDlg.cpp:368 Src/wptKeysignDlg.cpp:385
+#: Src/wptKeysignDlg.cpp:390 Src/wptKeysignDlg.cpp:392
msgid "Key Signing"
msgstr "ƒL[‚𖼂·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1519
+#: Src/wptKeyManagerDlg.cpp:1536
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4378,31 +4398,31 @@
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:140
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:151
-#: Src/wptKeyManagerDlg.cpp:1533 Src/wptKeyRevokeDlg.cpp:72
-#: Src/wptKeyRevokeDlg.cpp:82 Src/wptKeyRevokeDlg.cpp:145
-#: Src/wptKeyRevokeDlg.cpp:150 Src/wptKeyRevokeDlg.cpp:158
-#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:174
+#: Src/wptKeyManagerDlg.cpp:1550 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:169
+#: Src/wptKeyRevokeDlg.cpp:174 Src/wptKeyRevokeDlg.cpp:182
+#: Src/wptKeyRevokeDlg.cpp:191 Src/wptKeyRevokeDlg.cpp:196
msgid "Key Revocation Cert"
msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
-#: Src/wptKeyManagerDlg.cpp:1543
+#: Src/wptKeyManagerDlg.cpp:1560
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:1560
+#: Src/wptKeyManagerDlg.cpp:1577
msgid "Key Signature List"
msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1575 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1585
+#: Src/wptKeyManagerDlg.cpp:1602
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4411,34 +4431,34 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1615
+#: Src/wptKeyManagerDlg.cpp:1632
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:1638 Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyManagerDlg.cpp:1655 Src/wptKeyserverDlg.cpp:584
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:1655
+#: Src/wptKeyManagerDlg.cpp:1672
msgid "GnuPG Options"
msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1714
msgid "There is no corresponding secret key for this key."
msgstr "‚±‚̃L[‚ɑ΂µ‚Ă̔閧Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1702
+#: Src/wptKeyManagerDlg.cpp:1719
msgid "You can only export one secret key."
msgstr "ˆêŒÂ‚̔閧Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1724
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -4457,12 +4477,12 @@
"‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1712
+#: Src/wptKeyManagerDlg.cpp:1729
msgid "WARNING"
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1775
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
@@ -4473,8 +4493,8 @@
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:170
-#: Src/wptVerifyList.cpp:245
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:224
msgid "Unknown"
msgstr "–³–¼"
@@ -4558,30 +4578,30 @@
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚ͳ‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
msgid "Key Revokers"
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤"
# c:\oss\winpt\src\wptImportList.cpp:187
-#: Src/wptKeyRevokeDlg.cpp:84
+#: Src/wptKeyRevokeDlg.cpp:82
msgid "Reason for revocation"
msgstr "–³Œø‰»‚·‚é——R"
-#: Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyRevokeDlg.cpp:83
msgid "Optional description text"
msgstr "Ú×‚ð‚ ‚ç‚í‚·ƒIƒvƒVƒ‡ƒ“ƒeƒLƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:151
-#: Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyRevokeDlg.cpp:84
msgid "&Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY(&P)"
-#: Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyRevokeDlg.cpp:85
msgid "Output file"
msgstr "o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:69
-#: Src/wptKeyRevokeDlg.cpp:112
+#: Src/wptKeyRevokeDlg.cpp:136
msgid ""
"Please move this certificate to a medium where it can bestored in a safe "
"place (floppy, CDR, etc..).\n"
@@ -4593,37 +4613,37 @@
"‚ª‚Å‚«‚Ü‚·I"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:98
-#: Src/wptKeyRevokeDlg.cpp:135
+#: Src/wptKeyRevokeDlg.cpp:159
msgid "Choose File to save the Certificate"
msgstr "Ø–¾‘‚ð•Û‘¶‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:107
-#: Src/wptKeyRevokeDlg.cpp:144
+#: Src/wptKeyRevokeDlg.cpp:168
msgid "Please select a reason."
msgstr "——R‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:148
-#: Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyRevokeDlg.cpp:195
msgid "Revocation certificate generated."
msgstr "–³Œø‰»Ø–¾‘‚ªì¬‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptSigList.cpp:47
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:57
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
msgid "Algorithm"
msgstr "ƒAƒ‹ƒSƒŠƒYƒ€"
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
+#: Src/wptKeyRevokersDlg.cpp:121 Src/wptKeyRevokersDlg.cpp:175
msgid "Designated Key Revokers"
msgstr "Žw’è‚̃L[‚𖳌ø‰»‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:147
+#: Src/wptKeyRevokersDlg.cpp:161
msgid "Designated Revoker Keys"
msgstr "Žw’è‚Ì–³Œø‰»‚·‚éƒL["
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:123
-#: Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyRevokersDlg.cpp:176
#, 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"
@@ -4786,7 +4806,7 @@
msgid "Port"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:476
+#: Src/wptKeyserverDlg.cpp:475
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4805,12 +4825,12 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:496
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:497
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4829,7 +4849,7 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:499
+#: Src/wptKeyserverDlg.cpp:498
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4848,75 +4868,75 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:758
+#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:757
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
msgid "&Add"
msgstr "’ljÁ(&A)"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:526
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:527
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:528
msgid "Host name:"
msgstr "ƒzƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:536
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:542
+#: Src/wptKeyserverDlg.cpp:541
msgid "Invalid port, valid numbers are < 65535"
msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "ŽóM(&R)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:587
msgid "Send key (default is receiving)"
msgstr "ƒL[‚ð‘—M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:589
msgid "Please enter the key ID or email address you search for"
msgstr "ŒŸõ‚·‚é‚à‚̂̃L[ID‚Ü‚½‚Í“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:590
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:591
#, fuzzy
msgid "C&hange proxy"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:593
+#: Src/wptKeyserverDlg.cpp:592
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:617
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4924,7 +4944,7 @@
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:57
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:69
#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
@@ -4934,33 +4954,33 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
msgid "Please select one of the keyservers."
msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:376
-#: Src/wptKeyserverDlg.cpp:660
+#: Src/wptKeyserverDlg.cpp:659
msgid "This is not implemented yet!"
msgstr "‚±‚Ì‚«‚Ì‚¤‚Í‚Ü‚¾Žg—p‚©‚Ì‚¤‚Æ‚È‚Á‚Ä‚¢‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:381
# c:\oss\winpt\src\wptKeyserverDlg.cpp:407
-#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:666 Src/wptKeyserverDlg.cpp:698
msgid "Please enter the search pattern."
msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:703
msgid "Only keyids are allowed."
msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:709
msgid "Only enter the name of the user."
msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:716
+#: Src/wptKeyserverDlg.cpp:715
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
@@ -4976,7 +4996,7 @@
msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
+#: Src/wptKeyserverSearchDlg.cpp:87 Src/wptKeyserverSearchDlg.cpp:117
msgid "Keyserver Search"
msgstr "ƒL[ƒT[ƒo[ŒŸõ"
@@ -5009,22 +5029,22 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:210
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
msgid "Signature Properties"
msgstr "–¼‚Ì‘®«"
# c:\oss\winpt\src\wptKeysigDlg.cpp:189
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:164 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
msgid "Exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚é‚à‚Ì"
# c:\oss\winpt\src\wptKeysigDlg.cpp:190
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:207
+#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
msgid "Non-revocably"
msgstr "–³Œø‚Éo—ˆ‚È‚¢‚æ"
# c:\oss\winpt\src\wptSigList.cpp:43
-#: Src/wptKeysigDlg.cpp:144 Src/wptSigList.cpp:53
+#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
msgid "Class"
msgstr "ƒNƒ‰ƒX"
@@ -5033,70 +5053,76 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:146
msgid "Expire date"
msgstr "—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:147
msgid "Issuer key"
msgstr "”sŽÒƒL["
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:148
msgid "Issuer key ID"
msgstr "”sŽÒƒL[ID"
+# c:\oss\winpt\src\wptClipVerifyDlg.cpp:135
+#: Src/wptKeysigDlg.cpp:149
+#, fuzzy
+msgid "Policy URL"
+msgstr "ƒ|ƒŠƒV[URL:"
+
# c:\oss\winpt\src\wptKeysigDlg.cpp:189
-#: Src/wptKeysigDlg.cpp:164
+#: Src/wptKeysigDlg.cpp:166
msgid "Non-exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢‚à‚Ì"
# c:\oss\winpt\src\wptSigList.cpp:118
-#: Src/wptKeysigDlg.cpp:177 Src/wptSigList.cpp:156
+#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
msgid " user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysigDlg.cpp:396
-#: Src/wptKeysigDlg.cpp:283
+#: Src/wptKeysigDlg.cpp:288
msgid "Really receive all missing keys?"
msgstr "‚·‚ׂĂ̎¸‚Á‚½ƒL[‚ð–{“–‚ÉŽóM‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:322 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "–¼‚Ì‘®«(&P)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:318
+#: Src/wptKeysigDlg.cpp:323
msgid "Signing &Key Properties"
msgstr "ƒL[‚Ì‘®«‚𖼂·‚é(&K)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:357
+#: Src/wptKeysigDlg.cpp:362
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñBƒL[ƒT[ƒo[‚æ‚èŽóM‚³‚ê‚Ü‚·‚©H"
-#: Src/wptKeysigDlg.cpp:367
+#: Src/wptKeysigDlg.cpp:372
msgid "Key not found in keyring."
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptKeysigDlg.cpp:395
+#: Src/wptKeysigDlg.cpp:400
#, c-format
msgid "Signature List for \"%s\""
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeysigDlg.cpp:333
-#: Src/wptKeysigDlg.cpp:399
+#: Src/wptKeysigDlg.cpp:404
msgid "&Receive Key"
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:152
# c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
msgid "Choose Signature Class"
msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
@@ -5137,7 +5163,7 @@
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:261
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -5159,52 +5185,52 @@
"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
# c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:277
+#: Src/wptKeysignDlg.cpp:273
msgid "No valid secret key found."
msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:279
msgid "Sign local only (non exportable signature)"
msgstr "ƒ[ƒJƒ‹—pƒVƒOƒjƒ`ƒƒ[(ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢ƒVƒOƒjƒ`ƒƒ[)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptKeysignDlg.cpp:283
+#: Src/wptKeysignDlg.cpp:280
msgid "Signature expires on"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
# c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:284
+#: Src/wptKeysignDlg.cpp:281
msgid "Sign non-revocably"
msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚É–¼‚·‚é"
-#: Src/wptKeysignDlg.cpp:285
+#: Src/wptKeysignDlg.cpp:282
msgid "&Ask for certification level"
msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:288
+#: Src/wptKeysignDlg.cpp:285
msgid "&Show photo"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
-#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
+#: Src/wptKeysignDlg.cpp:286 Src/wptPassphraseCB.cpp:94
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr "“ü—Í‚ð‰B‚·(&H)"
-#: Src/wptKeysignDlg.cpp:355
+#: Src/wptKeysignDlg.cpp:352
msgid "You cannot select today as the expiration date."
msgstr ""
# c:\oss\winpt\src\wptKeysignDlg.cpp:288
-#: Src/wptKeysignDlg.cpp:371
+#: Src/wptKeysignDlg.cpp:368
msgid "Could not get Key ID from key."
msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:392
+#: Src/wptKeysignDlg.cpp:389
msgid "This key is already signed by your key"
msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
@@ -5307,35 +5333,35 @@
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:103 Src/wptMAPI.cpp:227
msgid "Could not sent mail."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptMDSumDlg.cpp:72
+#: Src/wptMDSumDlg.cpp:103
msgid "Digest"
msgstr "ƒ_ƒCƒWƒFƒXƒg"
# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptMDSumDlg.cpp:103
+#: Src/wptMDSumDlg.cpp:121
msgid "&Save..."
msgstr "•Û‘¶...(&S)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptMDSumDlg.cpp:105
+#: Src/wptMDSumDlg.cpp:123
msgid "Save to clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚É•Û‘¶‚·‚é"
-#: Src/wptMDSumDlg.cpp:106
+#: Src/wptMDSumDlg.cpp:124
msgid "Print Message Digest"
msgstr "ƒƒbƒZ[ƒWƒ_ƒCƒWƒFƒXƒg‚ðˆóü‚·‚éB"
-#: Src/wptMDSumDlg.cpp:149
+#: Src/wptMDSumDlg.cpp:177
msgid "Select file to save checksums"
msgstr "ƒ`ƒFƒbƒNƒTƒ€‚ð•Û‘¶‚·‚邽‚߂̃tƒ@ƒCƒ‹‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptMDSumDlg.cpp:154
+#: Src/wptMDSumDlg.cpp:182
#, c-format
msgid "Checksums successfully saved in '%s'"
msgstr "ƒ`ƒFƒbƒNƒTƒ€‚𳂵‚'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
@@ -5371,27 +5397,27 @@
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚̃Cƒ“ƒ|[ƒg‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:61
-#: Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:98
msgid "Encrypted with the following public key(s)"
msgstr "ˆÈ‰º‚ÌŒöŠJŒ®‚ňƉ»‚µ‚½‚à‚Ì‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:82
-#: Src/wptPassphraseCB.cpp:143
+#: Src/wptPassphraseCB.cpp:142
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "–³–¼ƒL[ID (%s, 0x%s)"
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:153
msgid "Bad passphrase; Enter passphrase again"
msgstr "–³Œø‚ȃpƒXƒtƒŒ[ƒYAÄ“x“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:90
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:154
msgid "Please enter your passphrase"
msgstr "‚ ‚È‚½‚̃pƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:158
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -5401,7 +5427,7 @@
"%s ‚ªˆÃ†‰»ƒf[ƒ^‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:224
-#: Src/wptPassphraseCB.cpp:304
+#: Src/wptPassphraseCB.cpp:302
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5413,7 +5439,7 @@
"%s ƒL[, ID %s (ƒ[ƒ“ƒL[ ID %s)\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:231
-#: Src/wptPassphraseCB.cpp:310
+#: Src/wptPassphraseCB.cpp:308
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5425,7 +5451,7 @@
"%s ƒL[, ID %s\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:283
-#: Src/wptPassphraseCB.cpp:398
+#: Src/wptPassphraseCB.cpp:396
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -5742,12 +5768,12 @@
msgstr "ƒŒƒMƒXƒgƒŠ‚É‘‚‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptSigList.cpp:42
-#: Src/wptSigList.cpp:52
+#: Src/wptSigList.cpp:53
msgid "Valid"
msgstr "—LŒø"
# c:\oss\winpt\src\wptSigList.cpp:46
-#: Src/wptSigList.cpp:56
+#: Src/wptSigList.cpp:57
msgid "Expiration"
msgstr "ŠúŒÀ"
@@ -5758,7 +5784,7 @@
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptSigTreeDlg.cpp:167
+#: Src/wptSigTreeDlg.cpp:166
#, fuzzy
msgid "Edit..."
msgstr "•ÒW"
@@ -6119,10 +6145,6 @@
#~ "Ž‚Á‚Ä‚¢‚é PTD.dll ‚ðÅV”Å‚ÉXV‚µ‚Ä‚‚¾‚³‚¢B‚¨Žg‚¢‚̃o[ƒWƒ‡ƒ“‚Í (%s) "
#~ "‚Å‚Æ‚Ä‚àŒÃ‚¢‚Å‚·B"
-# c:\oss\winpt\src\wptClipVerifyDlg.cpp:135
-#~ msgid "Policy URL: "
-#~ msgstr "ƒ|ƒŠƒV[URL:"
-
# c:\oss\winpt\src\WinPT.cpp:216
#~ msgid "Privacy Tray Dynamic (PTD)"
#~ msgstr "ƒvƒ‰ƒCƒoƒV[ƒgƒŒƒCƒ_ƒCƒiƒ~ƒbƒN(PTD)"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/ChangeLog 2006-05-01 12:22:18 UTC (rev 208)
@@ -1,3 +1,47 @@
+2006-05-01 Timo Schulz <ts at g10code.de>
+
+ * WinPT.cpp (WinMain): Check if the user has admin privileges.
+ * wptW32API.cpp (user_is_admin): New.
+ * wptKeysigDlg.cpp (sigprops_dlg_proc): Cosmetical changes.
+ * wptKeyManagerDlg.cpp (key_manager_dlg_proc): Use timer
+ to re-activate the window again.
+ * wptKeylist.cpp (get_key_trust2): Differ between "full"
+ and "ultimate".
+ * wptKeyCache.cpp (keycache_prepare2): Primary user-id
+ has now highest priority.
+ * wptClipDecryptDlg.cpp (clip_decrypt_dlg): Use new utf8
+ system.
+
+2006-04-30 Timo Schulz <ts at g10code.de>
+
+ * wptKeyCache.cpp (gpg_keycache_release): Release revoker
+ list if needed.
+ * wptKeyRevokersDlg.cpp (key_get_revokers): New.
+ (key_revokers_dlg_proc): Expect winpt_key_t. Change all callers.
+ * wptKeyEditDlgs.cpp (check_desig_rev): New.
+ (do_editkey_minimize): New.
+ * wptKeyRevokeDlg.cpp (key_revoke_dlg_proc): Support to
+ generate a revoc cert as a desig revoker.
+
+2006-04-29 Timo Schulz <ts at g10code.de>
+
+ * wptVerifyList.cpp (verlist_build): Adjusted code for new
+ list view interface.
+ * wptSigList.cpp (siglist_build): Likewise.
+ * wptKeyEditDlgs.cpp (showpref_dlg_proc): Correct code
+ to display the preferences of the selected UID. Thanks to Mathias.
+ * wptKeyCacheDlg.cpp (keycache_dlg_proc): Return 1 in case
+ of an error.
+ * wptKeyCache.cpp (gpg_keycache_update_key): Always update
+ the utf8 decoded uid list.
+ * wptImportList.cpp (decode_userid): Do utf8 decoding here.
+ * wptListView.cpp (listview_new): New param for HWND handle.
+ Change all callers.
+ * wptFileManager.cpp (fm_add_sig_stat): Use utf8 decoding.
+ * wptGPGUtil.cpp (gpg_revoke_cert): Support --desig-revoker.
+ * wptClipVerifyDlg.cpp (wptClipVerifyDlg.cpp): Correct
+ keyid extraction.
+
2006-04-28 Timo Schulz <ts at g10code.de>
* wptMAPI.cpp (mapi_send_pubkey): Use new key struct.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/WinPT-en.rc 2006-05-01 12:22:18 UTC (rev 208)
@@ -120,12 +120,12 @@
PUSHBUTTON "&Cancel",IDCANCEL,130,129,50,14
END
-IDD_WINPT_SIGPROPS DIALOG DISCARDABLE 0, 0, 242, 159
+IDD_WINPT_SIGPROPS DIALOG DISCARDABLE 0, 0, 246, 159
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Signature Properties"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "Signature Info",IDC_STATIC,2,3,235,128
+ GROUPBOX "Signature Info",IDC_STATIC,2,3,239,128
EDITTEXT IDC_SIGPROPS_INFO,9,18,219,13,ES_AUTOHSCROLL |
ES_READONLY
LTEXT "Issuer key",IDC_SIGPROPS_KEYINF,9,36,111,8
@@ -144,36 +144,35 @@
EDITTEXT IDC_SIGPROPS_CLASS,188,99,40,12,ES_AUTOHSCROLL |
ES_READONLY
CONTROL "Exportable",IDC_SIGPROPS_EXP,"Button",BS_AUTOCHECKBOX |
- BS_FLAT | WS_DISABLED | WS_TABSTOP,9,118,53,10
+ BS_FLAT | WS_TABSTOP,9,118,53,10
CONTROL "Non-revocably",IDC_SIGPROPS_NREV,"Button",
- BS_AUTOCHECKBOX | BS_FLAT | WS_DISABLED | WS_TABSTOP,64,
- 118,67,10
+ BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,64,118,67,10
CONTROL "Revoked",IDC_SIGPROPS_REV,"Button",BS_AUTOCHECKBOX |
- BS_FLAT | WS_DISABLED | WS_TABSTOP,133,118,50,10
+ BS_FLAT | WS_TABSTOP,133,118,50,10
CONTROL "Expired",IDC_SIGPROPS_EXPIRED,"Button",BS_AUTOCHECKBOX |
- BS_FLAT | WS_DISABLED | WS_TABSTOP,187,118,50,10
- DEFPUSHBUTTON "OK",IDOK,187,135,50,14
+ BS_FLAT | WS_TABSTOP,186,118,50,10
+ DEFPUSHBUTTON "OK",IDOK,191,135,50,14
END
-IDD_WINPT_KEYEDIT_SHOWPREF DIALOG DISCARDABLE 0, 0, 144, 154
+IDD_WINPT_KEYEDIT_SHOWPREF DIALOG DISCARDABLE 0, 0, 144, 172
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Key Preferences"
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Key Info Dummy",IDC_SHOWPREF_INFO,4,16,130,8
- GROUPBOX "Preferences",IDC_SHOWPREF_PREFINF,2,44,136,87
- LTEXT "Ciphers",IDC_STATIC,8,55,24,8
- LISTBOX IDC_SHOWPREF_CIPHERS,8,63,61,60,LBS_NOINTEGRALHEIGHT |
+ LTEXT "Key Info Dummy",IDC_SHOWPREF_INFO,4,16,136,20
+ GROUPBOX "Preferences",IDC_SHOWPREF_PREFINF,2,55,136,94
+ LTEXT "Ciphers",IDC_STATIC,8,66,24,8
+ LISTBOX IDC_SHOWPREF_CIPHERS,8,74,61,71,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Digests",IDC_STATIC,72,55,24,8
- LISTBOX IDC_SHOWPREF_HASH,72,64,61,27,LBS_NOINTEGRALHEIGHT |
+ LTEXT "Digests",IDC_STATIC,72,66,24,8
+ LISTBOX IDC_SHOWPREF_HASH,72,75,61,27,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Compression",IDC_STATIC,72,93,41,8
- LISTBOX IDC_SHOWPREF_ZIP,72,104,61,20,LBS_NOINTEGRALHEIGHT |
+ LTEXT "Compression",IDC_STATIC,72,104,41,8
+ LISTBOX IDC_SHOWPREF_ZIP,72,115,61,30,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&OK",IDOK,88,135,50,14
+ DEFPUSHBUTTON "&OK",IDOK,88,153,50,14
CONTROL "MDC feature",IDC_SHOWPREF_MDC,"Button",BS_AUTOCHECKBOX |
- BS_FLAT | WS_DISABLED | WS_TABSTOP,4,30,102,10
+ BS_FLAT | WS_DISABLED | WS_TABSTOP,4,41,102,10
LTEXT "user ID:",IDC_SHOWPREF_UIDHINT,4,3,59,9
END
@@ -217,7 +216,7 @@
IDD_WINPT_SIGPROPS, DIALOG
BEGIN
LEFTMARGIN, 2
- RIGHTMARGIN, 237
+ RIGHTMARGIN, 241
TOPMARGIN, 3
BOTTOMMARGIN, 152
END
@@ -227,7 +226,7 @@
LEFTMARGIN, 2
RIGHTMARGIN, 140
TOPMARGIN, 3
- BOTTOMMARGIN, 151
+ BOTTOMMARGIN, 169
END
IDD_WINPT_LANGUAGE, DIALOG
@@ -1135,6 +1134,7 @@
DEFPUSHBUTTON "&OK",IDOK,134,162,50,14
PUSHBUTTON "&Close",IDCANCEL,186,162,50,14
PUSHBUTTON "&Help",IDC_KEYEDIT_HELP,238,162,50,14
+ PUSHBUTTON "&Revoke...",IDC_KEYEDIT_REVOKE,8,162,58,14
END
IDD_WINPT_PROGRESS DIALOG DISCARDABLE 0, 0, 186, 58
@@ -1934,8 +1934,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,12,0
- PRODUCTVERSION 0,11,12,0
+ FILEVERSION 0,11,13,0
+ PRODUCTVERSION 0,11,13,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1953,14 +1953,14 @@
VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
- VALUE "FileVersion", "0.11.12\0"
+ VALUE "FileVersion", "0.11.13\0"
VALUE "InternalName", "WinPT\0"
VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "WinPT.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Windows Privacy Tray\0"
- VALUE "ProductVersion", "0.11.12\0"
+ VALUE "ProductVersion", "0.11.13\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/WinPT.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -43,16 +43,18 @@
#include "wptUTF8.h"
void remove_crit_file_attrs (const char *fname, int force);
+BOOL user_is_admin (void);
-
+/* Global variables. */
HINSTANCE glob_hinst; /* global instance for the dialogs */
HWND glob_hwnd; /* global window handle for the dialogs */
-HWND activ_hwnd;
int scard_support = 0;
int debug = 0;
int mobile_mode_active = 0;
int gpg_read_only = 0;
+int admin_user = 0;
char gpgver[3];
+/* End */
/* Load the key cache and rebuild the signature cache. */
@@ -65,6 +67,9 @@
rcs.tr_update = 1;
DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, hwnd,
keycache_dlg_proc, (LPARAM)&rcs);
+ /* XXX: the dialog return 0 when an error occurs.
+ in this case figure out if the gpg env is OK
+ and supress dialogs to configure gpg. */
}
@@ -417,6 +422,8 @@
}
+#include "wptKeyManager.h"
+
/* Main entry point. */
int WINAPI
WinMain (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)
@@ -430,7 +437,7 @@
int first_start = 0, start_gpgprefs = 0;
int winpt_inst_found = 0;
int start_manager = 0;
- const char *s;
+ const char *s;
glob_hinst = hinst;
if (cmdline && stristr (cmdline, "--stop")) {
@@ -484,6 +491,7 @@
set_default_keyserver ();
load_gettext ();
+ admin_user = user_is_admin ();
if (!mobile_mode_active) {
regist_inst_gnupg (1);
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/resource.h 2006-05-01 12:22:18 UTC (rev 208)
@@ -649,6 +649,7 @@
#define IDC_SHOWPREF_UIDHINT 1525
#define IDC_SIGPROPS_POLICINF 1526
#define IDC_SIGPROPS_POLIC 1527
+#define IDC_KEYEDIT_REVOKE 1528
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -829,7 +830,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 246
#define _APS_NEXT_COMMAND_VALUE 40186
-#define _APS_NEXT_CONTROL_VALUE 1528
+#define _APS_NEXT_CONTROL_VALUE 1529
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -46,20 +46,17 @@
char*
get_key_userid (const char *keyid)
{
- gpgme_key_t key;
- char *p, *uid;
+ winpt_key_s key;
+ char *uid;
- if (get_pubkey (keyid, &key))
+ memset (&key, 0, sizeof (key));
+ if (winpt_get_pubkey (keyid, &key))
return m_strdup (_("user ID not found"));
- uid = utf8_to_native (key->uids->uid);
+ uid = new char[strlen (key.ext->uids->uid) + 4 + 8];
if (!uid)
- uid = strdup (_("user ID not found"));
- p = new char[strlen (uid) + 4 + 8];
- if (!p)
BUG (NULL);
- sprintf (p, "\n \"%s\"", uid);
- safe_free (uid);
- return p;
+ sprintf (uid, "\n \"%s\"", key.ext->uids->uid);
+ return uid;
}
@@ -104,7 +101,7 @@
gpgme_verify_result_t sigres;
passphrase_cb_s pwd;
const char *s;
- char *uid;
+ const char *uid;
int pgp_type = 0;
int novalid = 0;
@@ -128,12 +125,12 @@
res = gpgme_op_decrypt_result (ctx);
if (err && res->recipients && !secret_key_available (res->recipients)) {
gpgme_recipient_t r = res->recipients;
- uid = get_key_userid (r->keyid+8);
+ char *u = get_key_userid (r->keyid+8);
log_box (_("Decryption"), MB_ERR,
_("Encrypted with %s key, ID %s.%s\n"
"Decryption failed: secret key not available."),
- get_key_pubalgo (r->pubkey_algo), r->keyid+8, uid);
- free_if_alloc (uid);
+ get_key_pubalgo (r->pubkey_algo), r->keyid+8, u);
+ free_if_alloc (u);
goto leave;
}
else if (res->unsupported_algorithm) {
@@ -163,31 +160,31 @@
sigres = gpgme_op_verify_result (ctx);
if (sigres && sigres->signatures) {
- gpgme_key_t key=NULL;
+ winpt_key_s key;
const char *keyid;
sig = sigres->signatures;
if (!sig->fpr)
BUG (NULL);
keyid = get_keyid_from_fpr (sig->fpr);
- get_pubkey (keyid, &key);
- if (key) {
- if (key->owner_trust == GPGME_VALIDITY_FULL ||
- key->owner_trust == GPGME_VALIDITY_ULTIMATE)
+ memset (&key, 0, sizeof (key));
+ if (!winpt_get_pubkey (keyid, &key)) {
+ if (key.ctx->owner_trust == GPGME_VALIDITY_FULL ||
+ key.ctx->owner_trust == GPGME_VALIDITY_ULTIMATE)
s = _("Signature Status: Created with a fully trusted key");
- else if (key->owner_trust == GPGME_VALIDITY_MARGINAL)
+ else if (key.ctx->owner_trust == GPGME_VALIDITY_MARGINAL)
s = _("Signature Status: Created with a marginal trusted key");
- else if (key->owner_trust == GPGME_VALIDITY_NEVER) {
+ else if (key.ctx->owner_trust == GPGME_VALIDITY_NEVER) {
novalid = 1;
s = _("Signature Status: Created with an UNTRUSTED key");
}
else
s = _("Signature Status: Created with an undefined trusted key");
- uid = utf8_to_native (key->uids->uid);
+ uid = key.ext->uids->uid;
}
else {
s = "";
- uid = strdup (_("user ID not found"));
+ uid = _("user ID not found");
}
log_box (_("WinPT Verify"), MB_OK,
_("%s\n"
@@ -199,8 +196,7 @@
strtimestamp (sig->timestamp),
uid, keyid,
novalid? "\nPrimary key fingerprint: " : "",
- novalid? get_key_fpr (key) : "");
- safe_free (uid);
+ novalid? get_key_fpr (key.ctx) : "");
}
leave:
Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptClipVerifyDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -198,16 +198,13 @@
const char *kserv;
if (!sig->fpr)
BUG (NULL);
- if (strlen (sig->fpr) == 40)
- keyid = sig->fpr+24;
- else
- keyid = sig->fpr+16;
+ keyid = get_keyid_from_fpr (sig->fpr);
rc = log_box (_("Verify"), MB_INFO|MB_YESNO,
_("Signature made %s using %s key ID 0x%s\n"
"Cannot check signature: public key not found\n\n"
"Do you want to try to retrieve the key from the keyserver?"),
strtimestamp (sig->timestamp),
- get_key_pubalgo (sig->pubkey_algo), keyid+8);
+ get_key_pubalgo (sig->pubkey_algo), keyid);
if (rc == IDNO) {
msg_box (dlg, get_gpg_sigstat (GPGME_SIGSUM_KEY_MISSING), _("Verify"), MB_WARN);
gpgme_release (c);
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptFileManager.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -375,7 +375,7 @@
int
fm_build (listview_ctrl_t *lv, HWND ctrl)
{
- int i, rc = 0;
+ int i;
listview_ctrl_t c;
struct listview_column_s col[] = {
{0, 80, (char *)_("Status") },
@@ -384,10 +384,7 @@
{0, 0, NULL}
};
- rc = listview_new (&c);
- if (rc)
- BUG (NULL);
- c->ctrl = ctrl;
+ listview_new (&c, ctrl);
for (i = 0; col[i].width; i++)
listview_add_column (c, &col[i]);
listview_set_ext_style (c);
@@ -1461,20 +1458,14 @@
static void
fm_add_sig_stat (file_sig_ctx_t log)
{
- gpgme_key_t key;
+ struct winpt_key_s key;
const char *kid;
- kid = log->sig->fpr;
- if (!kid)
- BUG (NULL);
- if (strlen (kid) == 40)
- kid += 32;
- else if (strlen (kid) == 32)
- kid += 24;
- if (get_pubkey (kid, &key))
- log->use_uid = 0;
- else {
- log->user_id = key->uids->uid;
+ memset (&key, 0, sizeof (key));
+ kid = get_keyid_from_fpr (log->sig->fpr);
+ log->use_uid = 0;
+ if (!winpt_get_pubkey (kid, &key)) {
+ log->user_id = key.ext->uids->uid;
log->use_uid = 1;
}
file_verify_add_state (log);
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptFileManagerDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -618,6 +618,11 @@
return TRUE;
case ID_FILEMISC_WIPE_FREES:
+ if (!admin_user) {
+ msg_box (dlg, _("This command requires admin privileges.\n"),
+ _("File Manager"), MB_ERR);
+ break;
+ }
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_SPACE_SECDEL,
dlg, space_wipefrees_dlg_proc, 0);
break;
Modified: trunk/Src/wptGPGME.cpp
===================================================================
--- trunk/Src/wptGPGME.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptGPGME.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -157,7 +157,12 @@
gpg_keycache_t
keycache_get_ctx (int is_pub)
{
- return is_pub? pub : sec;
+ gpg_keycache_t ctx;
+
+ ctx = is_pub? pub : sec;
+ if (!ctx)
+ BUG (0);
+ return ctx;
}
Modified: trunk/Src/wptGPGUtil.cpp
===================================================================
--- trunk/Src/wptGPGUtil.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptGPGUtil.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -494,40 +494,18 @@
}
-char*
-generate_revoke_input (int code, const char *cmt, const char *pass)
-{
- const char *fmt;
- char *p;
- size_t n;
-
- fmt = "Y\n" /* gen_revoke.okay */
- "%d\n" /* ask_revocation_reason.code */
- "%s\n" /* ask_revocation_reason.text */
- "%s" /* text != NULL '\n' otherwise '' */
- "Y\n" /* ask_revocation_reason.okay */
- "%s\n"; /* passphrase.enter. */
- n = strlen (fmt) + 32;
- if (pass)
- n += strlen (pass) + 1;
- if (cmt)
- n += strlen (cmt) + 1;
- p = (char*)xcalloc (1, n+1);
- sprintf (p, fmt, code, cmt? cmt : "", cmt? "\n" : "", pass? pass : "");
- return p;
-}
-
-
/* Generate a revocation certificate for the key with the keyid @keyid.
@inp_data contains all needed data to answer the questions of the
command handler. Each separate with a '\n'.
@r_revcert contains the revocation cert on success.
+ if @desig_revoke is 1, the designated revoker mode is used.
Return value: 0 on success. */
gpgme_error_t
-gpg_revoke_cert (const char *inp_data, const char *keyid, char **r_revcert)
+gpg_revoke_cert (int desig_revoke, const char *inp_data,
+ const char *keyid, char **r_revcert)
{
gpgme_error_t err = gpg_error (GPG_ERR_NO_ERROR);
- const char *fmt;
+ const char *fmt, *revcmd;
char *rcrt;
char *cmd, *p;
HANDLE in, out;
@@ -536,9 +514,11 @@
if (!p)
return gpg_error (GPG_ERR_INV_ARG);
- fmt = "%s --pgp7 --command-fd=0 --status-fd=2 --gen-revoke %s";
- cmd = (char*)xcalloc (1, strlen (p) + strlen (keyid) + strlen (fmt) + 2);
- sprintf (cmd, fmt, p, keyid);
+ revcmd = desig_revoke? "--desig-revoke" : "--gen-revoke";
+ fmt = "%s --pgp7 --command-fd=0 --status-fd=2 %s %s";
+ cmd = (char*)xcalloc (1, strlen (p) + strlen (revcmd) +
+ strlen (keyid) + strlen (fmt) + 2);
+ sprintf (cmd, fmt, p, revcmd, keyid);
in = create_in_pipe (inp_data);
out = create_tmpfile ("gpg_revcert");
Modified: trunk/Src/wptImportList.cpp
===================================================================
--- trunk/Src/wptImportList.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptImportList.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -22,9 +22,10 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <ctype.h>
+
#include <windows.h>
#include <sys/types.h>
+#include <ctype.h>
#include "wptTypes.h"
#include "wptGPG.h"
@@ -90,12 +91,16 @@
userid in the key @c. */
static void
decode_userid (char *pend, import_key_t c)
-{
- c->uid = (char*)calloc (1, strlen (pend) + 1);
- if (!c->uid)
+{
+ char *uid;
+
+ uid = (char*)calloc (1, strlen (pend) + 1);
+ if (!uid)
BUG (NULL);
- gpg_decode_c_string (pend, &c->uid, strlen (pend) + 1);
- c->uid[strlen (c->uid) -3] = '\0';
+ gpg_decode_c_string (pend, &uid, strlen (pend) + 1);
+ uid[strlen (uid) -3] = '\0';
+ c->uid = utf8_to_native (uid);
+ safe_free (uid);
}
@@ -144,7 +149,7 @@
case 1:
if (rectype != KEY_primary)
break;
- for (s = pend; *s && !isdigit ((unsigned int)*s); s++) {
+ for (s = pend; *s && !isdigit (*s); s++) {
switch (*s) {
case 'd': c->disabled = 1;break;
case 'e': c->expired = 1; break;
@@ -344,12 +349,9 @@
{4, 132, (char *)_("Type")},
{0, 0, NULL}
};
- int j, rc = 0;
+ int j;
- rc = listview_new (&c);
- if (rc)
- return rc;
- c->ctrl = ctrl;
+ listview_new (&c, ctrl);
for (j = 0; implist[j].fieldname != NULL; j++)
listview_add_column (c, &implist[j]);
listview_set_ext_style (c);
Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyCache.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -37,6 +37,9 @@
#include "wptW32API.h"
#include "wptGPG.h"
#include "wptTypes.h"
+#include "wptCommonCtl.h"
+#include "wptContext.h"
+#include "wptKeyEdit.h"
#include "wptUTF8.h"
@@ -278,6 +281,7 @@
n->comment = u->comment;
n->email = u->email;
}
+ n->signatures = u->signatures;
n->validity = u->validity;
n->revoked = u->revoked;
if (!ctx->uids)
@@ -326,7 +330,7 @@
/* Merge the information from the keyrings into the key cache structure. */
-gpgme_error_t
+static gpgme_error_t
keycache_prepare2 (gpg_keycache_t ctx, const char *kid,
const char *pubring, const char *secring)
{
@@ -359,7 +363,6 @@
strcpy (keyid, "");
key_seen = 1;
}
-
if (pkt->pkttype == PKT_SIGNATURE &&
pkt->pkt.signature->sig_class == 0x1F) {
if (pkt->pkt.signature->numrevkeys == 0)
@@ -373,7 +376,9 @@
goto next;
c->gloflags.has_desig_rev = 1;
}
- if (pkt->pkttype == PKT_SIGNATURE && key_seen == 1 ) {
+ if (pkt->pkttype == PKT_SIGNATURE && key_seen == 1 && c != NULL) {
+ if (c->sym_prefs) /* only use the prefs from the primary uid. */
+ goto next;
sym_prefs = gpg_parse_sig_subpkt (pkt->pkt.signature->hashed,
SIGSUBPKT_PREF_SYM, &nsym);
if (!sym_prefs)
@@ -451,6 +456,9 @@
c2 = c->next;
gpgme_key_release (c->key);
c->key = NULL;
+ if (c->rev != NULL)
+ gpg_desig_rev_release (c->rev);
+ c->rev = NULL;
safe_free (c->pref_keyserver);
safe_free (c->sym_prefs);
safe_free (c->attrib.d);
@@ -628,7 +636,7 @@
err = gpgme_new (&gctx);
if (err)
return err;
- gpgme_set_keylist_mode (gctx, GPGME_KEYLIST_MODE_SIGS);
+ gpgme_set_keylist_mode (gctx, GPGME_KEYLIST_MODE_SIGS/*|GPGME_KEYLIST_MODE_SIG_NOTATIONS*/);
err = gpgme_get_key (gctx, keyid, &key, is_sec);
gpgme_release (gctx);
if (err)
@@ -646,10 +654,6 @@
}
/* XXX: this is also called for keys without a photo-id. */
keycache_reload_photo (ctx, keyid);
-
- /* refresh utf8 user ID list. */
- free_native_uids (&c->uids);
- keycache_decode_uid (c);
}
else {
log_debug ("keycache add: sync public part\r\n");
@@ -667,7 +671,15 @@
}
if (c)
c->flags = KC_FLAG_ADD;
+
}
+
+ /* refresh utf8 user ID list. */
+ if (c != NULL) {
+ free_native_uids (&c->uids);
+ keycache_decode_uid (c);
+ }
+
return 0;
}
@@ -725,6 +737,7 @@
if (err)
return err;
+ /* XXX: GPGME_KEYLIST_MODE_SIG_NOTATIONS causes an internal error! */
gpgme_set_keylist_mode (c, GPGME_KEYLIST_MODE_SIGS);
err = gpgme_op_keylist_start (c, pattern, secret);
while(!err) {
@@ -928,7 +941,7 @@
decode_subpacket (const char *subpkt_data, int *type,
char **out, WORD *outlen)
{
- char tmp[128], *p = tmp, *val;
+ char tmp[128], *val;
char *enc = NULL;
size_t pos = 0, i=0;
Modified: trunk/Src/wptKeyCacheDlg.cpp
===================================================================
--- trunk/Src/wptKeyCacheDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyCacheDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -37,12 +37,11 @@
BOOL CALLBACK
keycache_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
- gpgme_error_t err;
+ gpgme_error_t err = 0;
refresh_cache_s *rcs;
- char *pubring = NULL;
- char *secring = NULL;
+ char *pubring, *secring;
- switch( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
rcs = (refresh_cache_s *)lparam;
if (!rcs)
@@ -63,14 +62,16 @@
BUG (0);
if (rcs->tr_update)
gpg_rebuild_cache (NULL);
- if (rcs->kr_update) {
+ if (rcs->kr_update)
err = keycache_init (pubring, secring);
- if (err)
- msg_box (dlg, gpgme_strerror (err), _("Key Cache"), MB_ERR);
- }
free_if_alloc (pubring);
free_if_alloc (secring);
- EndDialog (dlg, TRUE);
+ if (err) {
+ msg_box (dlg, gpgme_strerror (err), _("Key Cache"), MB_ERR);
+ EndDialog (dlg, 1);
+ }
+ else
+ EndDialog (dlg, 0);
return FALSE;
}
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -64,6 +64,7 @@
CMD_LSIGN,
CMD_CHECK,
CMD_CLEAN,
+ CMD_MINIMIZE
};
struct cmdlist_s {
@@ -91,6 +92,7 @@
{"LSIGN", 0, CMD_LSIGN},
{"CHECK", 0, CMD_CHECK},
{"CLEAN", 0, CMD_CLEAN},
+ {"MINIMIZE", 0, CMD_MINIMIZE},
{NULL, 0}
};
@@ -121,6 +123,7 @@
const char *keyid;
const char *pass;
listview_ctrl_t lv;
+ int lv_pos;
void *opaque;
unsigned int finished:1;
unsigned int is_protected:1;
@@ -290,7 +293,7 @@
}
continue;
}
- if (ui->email) {
+ if (email && ui->email) {
if (!strcmp (ui->email, email)) {
pos = ui->index;
break;
@@ -1089,7 +1092,7 @@
listview_ctrl_t lv;
char buf[256], tmp[128];
const char *t;
- int nkeys = 0, rc = 0, i, bits;
+ int nkeys = 0, i, bits;
if (get_pubkey (k->keyid, &key)) {
msg_box (dlg, _("Could not find key."), _("Key Edit"), MB_ERR);
@@ -1103,14 +1106,10 @@
return NULL;
}
- rc = listview_new( &lv );
- if( rc )
- BUG( dlg );
+ listview_new (&lv, GetDlgItem (dlg, IDC_KEYEDIT_KEYLIST));
+ for (i = 0; cols[i].fieldname != NULL; i++)
+ listview_add_column (lv, &cols[i]);
- lv->ctrl = GetDlgItem( dlg, IDC_KEYEDIT_KEYLIST );
- for( i = 0; cols[i].fieldname != NULL; i++ )
- listview_add_column( lv, &cols[i] );
-
for( i = 0; i < nkeys; i++ ) {
listview_add_item( lv, "" );
listview_add_sub_item( lv, 0, 1, "" );
@@ -1178,9 +1177,8 @@
listview_ctrl_t lv = NULL;
gpgme_key_t key;
gpgme_key_sig_t ks;
- gpgme_user_id_t u2;
struct native_uid_s *u;
- int nuids = 0, rc, j, u_attr;
+ int nuids = 0, j, u_attr;
struct listview_column_s cols[] = {
{0, 72, (char *)_("Validity")},
{1, 150, (char *)_("Name")},
@@ -1201,37 +1199,34 @@
return NULL;
}
- rc = listview_new (&lv);
- if (rc)
- BUG (dlg);
- lv->ctrl = GetDlgItem( dlg, IDC_KEYEDIT_UIDLIST );
+ listview_new (&lv, GetDlgItem (dlg, IDC_KEYEDIT_UIDLIST));
for( j = 0; cols[j].fieldname != NULL; j++ )
- listview_add_column( lv, &cols[j] );
+ listview_add_column (lv, &cols[j]);
for( j = 0; j < nuids; j++ ) {
- listview_add_item( lv, " " );
- listview_add_sub_item( lv, 0, 1, " " );
+ listview_add_item (lv, " ");
+ listview_add_sub_item (lv, 0, 1, " " );
}
listview_set_ext_style (lv);
- for (j = 0, u2 = key->uids, u=k->ext->uids; j < nuids;
- u2=u2->next, u=u->next, j++) {
+ for (j = 0, u=k->ext->uids; j < nuids; u=u->next, j++) {
if (u->revoked)
attr = _("Revoked");
else {
u_attr = (int)u->validity;
attr = get_key_trust2 (NULL, u_attr, 0, 0);
}
- listview_add_sub_item (lv, j, 0, (char *)attr);
+ listview_add_sub_item (lv, j, UID_COL_VALID, (char *)attr);
/* XXX: add comment if available */
- listview_add_sub_item (lv, j, 1,
+ listview_add_sub_item (lv, j, UID_COL_NAME,
u->name? u->name : _("Invalid user ID"));
if (u->email)
- listview_add_sub_item (lv, j, 2, u->email);
+ listview_add_sub_item (lv, j, UID_COL_EMAIL, u->email);
- ks = get_selfsig (u2, k->keyid, 1);
+ ks = get_selfsig (u->signatures, k->keyid, 1);
if (ks)
- listview_add_sub_item (lv, j, 3, get_key_created (ks->timestamp));
+ listview_add_sub_item (lv, j, UID_COL_CREATION,
+ get_key_created (ks->timestamp));
}
if( !k->key_pair ) {
CheckDlgButton( dlg, IDC_KEYUID_ADD, BST_INDETERMINATE );
@@ -1302,6 +1297,7 @@
"SIGN \t\tsign a user-id (exportable)\r\n"
"LSIGN \t\tsign a user-id (non-exportable)\r\n"
"CLEAN \t\tremove unusable signatures from key\r\n"
+ "MINIMIZE \t\tremove all signatures from key\r\n"
));
msg_box (dlg, helptext, _("Key Edit Help"), MB_OK);
}
@@ -1705,7 +1701,7 @@
showpref_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
static keyedit_cb_t cb = NULL;
- gpg_uid_info_t inf=NULL;
+ gpg_uid_info_t inf=NULL, u;
gpgme_key_t key;
char buf[128];
int pos;
@@ -1716,26 +1712,31 @@
if (!cb)
BUG (NULL);
key = (gpgme_key_t)cb->opaque;
- _snprintf (buf, sizeof (buf)-1, "%s <%s>",
- key->uids->name, key->uids->email);
- SetDlgItemText (dlg, IDC_SHOWPREF_INFO, buf);
- pos = do_find_userid (cb->keyid, key->uids->email, NULL, &inf);
- if (inf) {
- const char *prefs = inf->prefs;
- if (prefs && *prefs) {
- if (parse_preflist (dlg, prefs) <= 0)
+ listview_get_item_text (cb->lv, cb->lv_pos,
+ UID_COL_EMAIL, buf, sizeof (buf)-1);
+ pos = do_find_userid (cb->keyid, buf, NULL, &inf);
+ if (pos < 0 || !inf) {
+ gpg_uid_info_release (inf);
+ EndDialog (dlg, FALSE);
+ break;
+ }
+ for (u=inf; u; u = u->next) {
+ if (u->index == pos && u->prefs && *u->prefs) {
+ _snprintf (buf, sizeof (buf)-1, "%s", u->name);
+ SetDlgItemText (dlg, IDC_SHOWPREF_INFO, buf);
+ if (parse_preflist (dlg, u->prefs) <= 0)
pos = -1;
+ if (u->flags.mdc)
+ CheckDlgButton (dlg, IDC_SHOWPREF_MDC, BST_CHECKED);
+ break;
}
- else
- pos = -1;
- gpg_uid_info_release (inf);
- if (pos == -1) {
- msg_box (dlg, _("No preferences available."), _("Key Edit"), MB_ERR);
- EndDialog (dlg, TRUE);
- }
- if (inf->flags.mdc)
- CheckDlgButton (dlg, IDC_SHOWPREF_MDC, BST_CHECKED);
}
+ gpg_uid_info_release (inf);
+ if (pos == -1) {
+ msg_box (dlg, _("No preferences available."), _("Key Edit"), MB_ERR);
+ EndDialog (dlg, FALSE);
+ break;
+ }
SetDlgItemText (dlg, IDC_SHOWPREF_MDC, _("MDC feature"));
SetDlgItemText (dlg, IDC_SHOWPREF_PREFINF, _("Preferences"));
SetDlgItemText (dlg, IDC_SHOWPREF_UIDHINT, _("user ID:"));
@@ -1759,6 +1760,7 @@
do_editkey_showpref (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
{
struct keyedit_cb_s cb;
+ char status[32];
if (k->is_v3)
return TRUE;
@@ -1767,10 +1769,17 @@
msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
return FALSE;
}
-
memset (&cb, 0, sizeof (cb));
cb.opaque = k->ctx;
cb.keyid = k->keyid;
+ cb.lv = lv;
+ cb.lv_pos = listview_get_curr_pos (lv);
+
+ listview_get_item_text (lv, cb.lv_pos, UID_COL_VALID,
+ status, sizeof (status)-1);
+ if (!strcmp (status, _("Revoked")))
+ return TRUE;
+
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT_SHOWPREF, dlg,
showpref_dlg_proc, (LPARAM)&cb);
return TRUE;
@@ -1920,6 +1929,24 @@
static void
+do_editkey_minimize (winpt_key_t k, HWND dlg)
+{
+ gpgme_error_t err;
+ GpgKeyEdit *ke;
+
+ ke = create_GpgKeyEdit (k->keyid);
+ err = ke->minimizeKey ();
+ if (err)
+ msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+ else {
+ msg_box (dlg, _("Finished to compact key."), _("Key Edit"), MB_OK);
+ k->update = 1;
+ }
+ delete ke;
+}
+
+
+static void
do_editkey_clean (winpt_key_t k, HWND dlg)
{
gpgme_error_t err;
@@ -2020,6 +2047,59 @@
}
+
+gpgme_error_t key_get_revokers (winpt_key_t key, int reload,
+ gpg_desig_rev_t *r_rev);
+
+/* Check if the key supports designated revokers and if
+ secret keys exist to generate such a revoke cert. */
+static bool
+check_desig_rev (winpt_key_t key)
+{
+ gpg_desig_rev_t rev, u;
+ struct winpt_key_s sk;
+
+ if (!key->ext->gloflags.has_desig_rev)
+ return false;
+ key_get_revokers (key, 0, &rev);
+ for (u = rev; u; u = u->next) {
+ memset (&sk, 0, sizeof (sk));
+ if (!winpt_get_seckey (u->fpr+32, &sk))
+ return true;
+ }
+ return false;
+}
+
+
+/* Use the gpg --desig-revoker command to create a revocation
+ cert for a key that lists our key as a designated revoker. */
+static void
+gen_desig_revoke_cert (winpt_key_t key, HWND dlg)
+{
+ const char *warn;
+ char *inf, *p;
+ int id;
+
+ inf = km_key_get_info (key, 0);
+ warn = _("Your keys is listed as a designated revoker for the key\n\n"
+ "%s\n\n"
+ "Are you sure you want to create a revocation certificate\n"
+ "which allow to revoke the key listed above?");
+ p = new char[strlen (inf)+1+strlen (warn)+1];
+ sprintf (p, warn, inf);
+ free_if_alloc (inf);
+
+ id = msg_box (dlg, p, _("Key Edit"), MB_YESNO|MB_ICONWARNING);
+ free_if_alloc (p);
+ if (id == IDNO)
+ return;
+
+ key->internal = 1;
+ DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYREVOKE, dlg,
+ key_revoke_dlg_proc, (LPARAM)key);
+}
+
+
/* Dialog box procedure for the edit key dialog. */
BOOL CALLBACK
keyedit_main_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -2074,6 +2154,9 @@
SetDlgItemText (dlg, IDC_KEYEDIT_CMDINF, _("Command>"));
SetDlgItemText (dlg, IDCANCEL, _("&Close"));
SetDlgItemText (dlg, IDC_KEYEDIT_HELP, _("&Help"));
+ SetDlgItemText (dlg, IDC_KEYEDIT_REVOKE, _("&Revoke..."));
+ if (!check_desig_rev (k))
+ ShowWindow (GetDlgItem (dlg, IDC_KEYEDIT_REVOKE), SW_HIDE);
SetWindowText (dlg, _("Key Edit"));
SetForegroundWindow (dlg);
center_window (dlg, NULL);
@@ -2134,9 +2217,10 @@
lvuid, cmd);
break;
case CMD_CLEAN: do_editkey_clean (k, dlg);
+ case CMD_MINIMIZE: do_editkey_minimize (k, dlg);
}
break;
-
+
case IDCANCEL:
EndDialog (dlg, FALSE);
break;
@@ -2144,6 +2228,10 @@
case IDC_KEYEDIT_HELP:
do_show_help (dlg);
break;
+
+ case IDC_KEYEDIT_REVOKE:
+ gen_desig_revoke_cert (k, dlg);
+ break;
}
break;
}
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -81,6 +81,7 @@
listview_ctrl_t lv;
int lv_idx;
int keylist_sortby;
+ int magic;
};
/* Toolbar button structure. */
@@ -101,6 +102,7 @@
static void km_gui_import (struct km_info_s *kmi, int cmd_id, void *param);
+
/* Subclass the keylist listview control to allow extended commands. */
static BOOL CALLBACK
keylist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -1217,8 +1219,13 @@
SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
(LPCTSTR)IDI_WINPT));
SetForegroundWindow (dlg);
- force_foreground_window (dlg, 1000);
+ kmi->magic = SetTimer (dlg, 1, 1000, NULL);
return TRUE;
+
+ case WM_TIMER:
+ KillTimer (dlg, kmi->magic);
+ SetForegroundWindow (dlg);
+ break;
case WM_DESTROY:
save_column_info (kmi);
Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyPropsDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -365,7 +365,7 @@
case IDC_KEYPROPS_REVOKERS:
k->update = dialog_box_param (
glob_hinst, (LPCTSTR)IDD_WINPT_KEYREVOKERS, dlg,
- key_revokers_dlg_proc, (LPARAM)key,
+ key_revokers_dlg_proc, (LPARAM)k,
_("Key Revokers"), IDS_WINPT_KEY_REVOKERS);
break;
}
Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyRevokeDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -93,7 +93,33 @@
center_window (dlg, NULL);
}
+/* Generate the data expected by the gpg command handler. */
+static char*
+generate_revoke_input (int code, const char *cmt, const char *pass)
+{
+ const char *fmt;
+ char *p;
+ size_t n;
+ fmt = "Y\n" /* gen_revoke.okay */
+ "%d\n" /* ask_revocation_reason.code */
+ "%s\n" /* ask_revocation_reason.text */
+ "%s" /* text != NULL '\n' otherwise '' */
+ "Y\n" /* ask_revocation_reason.okay */
+ "%s\n"; /* passphrase.enter. */
+ n = strlen (fmt) + 32;
+ if (pass)
+ n += strlen (pass) + 1;
+ if (cmt)
+ n += strlen (cmt) + 1;
+ p = new char[n+1];
+ if (!p)
+ BUG (0);
+ sprintf (p, fmt, code, cmt? cmt : "", cmt? "\n" : "", pass? pass : "");
+ return p;
+}
+
+
/* Dialog box procedure for key revocation. */
BOOL CALLBACK
key_revoke_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -116,7 +142,7 @@
case WM_INITDIALOG:
if (!lparam)
dlg_fatal_error (dlg, "Could not get dialog param!");
- k = (winpt_key_t )lparam;
+ k = (winpt_key_t)lparam;
on_init_dialog (dlg);
return TRUE;
@@ -158,7 +184,7 @@
}
inp_data = generate_revoke_input (idx, desc, pwd);
- err = gpg_revoke_cert (inp_data, k->keyid, &revcert);
+ err = gpg_revoke_cert (k->internal, inp_data, k->keyid, &revcert);
wipememory (pwd, sizeof (pwd));
wipememory (inp_data, strlen (inp_data));
if (err) {
@@ -170,7 +196,7 @@
msg_box (dlg, warning, _("Key Revocation Cert"), MB_INFO);
release_cert_as_file (revcert, file);
}
- safe_free (inp_data);
+ free_if_alloc (inp_data);
free_if_alloc (desc);
EndDialog (dlg, TRUE);
return TRUE;
Modified: trunk/Src/wptKeyRevokersDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokersDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyRevokersDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -49,7 +49,7 @@
};
/* Initialize the listview given in @ctrl and return it in @r_lv. */
-static int
+static void
revokelist_build (listview_ctrl_t *r_lv, HWND ctrl)
{
listview_ctrl_t lv;
@@ -59,55 +59,75 @@
{2, 55, (char *)_("Algorithm")},
{0}
};
- int i, rc;
+ int i;
- rc = listview_new (&lv);
- if (rc)
- return rc;
- lv->ctrl = ctrl;
- lv->items = DIM( rlist )-1;
+ listview_new (&lv, ctrl);
+ lv->items = DIM (rlist)-1;
for (i = 0; i < lv->items; i++)
listview_add_column (lv, &rlist[i]);
listview_set_ext_style (lv);
*r_lv = lv;
+}
+
+
+/* Get the key revokers of the key @key.
+ If reload is 1, an update is forced otherwise the
+ cached revokers are returned. */
+gpgme_error_t
+key_get_revokers (winpt_key_t key, int reload, gpg_desig_rev_t *r_rev)
+{
+ gpgme_error_t err;
+ gpg_desig_rev_t rev;
+ GpgKeyEdit *ke;
+
+ if (!reload && key->ext->rev) {
+ *r_rev = key->ext->rev;
+ return 0;
+ }
+ ke = new GpgKeyEdit (key->keyid);
+ if (!ke)
+ BUG (NULL);
+ err = ke->getDesignatedRevoker (&rev);
+ delete ke;
+ if (err) {
+ gpg_desig_rev_release (rev);
+ return err;
+ }
+ if (key->ext->rev)
+ gpg_desig_rev_release (rev);
+ key->ext->rev = rev;
+ *r_rev = rev;
return 0;
}
/* Initialize the listview @ctrl with all designated revokers of the
- key @key. @ctx is used to retrieve the rev key from the cache to
- show the user-id.
+ key @key.
Return value: the initialized listview or NULL on error. */
static listview_ctrl_t
-revokelist_init (HWND ctrl, gpgme_key_t key, gpg_keycache_t ctx)
+revokelist_init (HWND ctrl, winpt_key_t key)
{
gpgme_error_t err;
- gpgme_key_t revkey;
- GpgKeyEdit *ke;
+ struct winpt_key_s revkey;
gpg_desig_rev_t rev=NULL, r;
listview_ctrl_t lv;
const char *alg;
const char *uid = NULL;
char keyid[32];
- ke = new GpgKeyEdit (key);
- if (!ke)
- BUG (NULL);
- err = ke->getDesignatedRevoker (&rev);
+ err = key_get_revokers (key, 0, &rev);
if (err) {
- delete ke;
msg_box (NULL, gpgme_strerror (err),
_("Designated Key Revokers"), MB_ERR);
return NULL;
}
-
- if (revokelist_build (&lv, ctrl))
- BUG (0);
+ revokelist_build (&lv, ctrl);
for (r = rev; r; r = r->next) {
- if (get_pubkey (r->fpr+32, &revkey))
+ memset (&revkey, 0, sizeof (revkey));
+ if (winpt_get_pubkey (r->fpr+32, &revkey))
uid = _("user ID not found");
else
- uid = revkey->uids->name;
+ uid = revkey.ext->uids->name;
_snprintf (keyid, sizeof (keyid)-1, "0x%s", r->fpr+32);
listview_add_item (lv, "");
alg = get_key_pubalgo (r->pubkey_algo);
@@ -115,9 +135,6 @@
listview_add_sub_item (lv, 0, REV_COL_KEYID, keyid);
listview_add_sub_item (lv, 0, REV_COL_NAME, uid);
}
-
- delete ke;
- gpg_desig_rev_release (rev);
return lv;
}
@@ -128,20 +145,18 @@
{
static listview_ctrl_t lv;
static int key_update = 0;
- gpgme_key_t key;
+ winpt_key_t key;
char buf[128], keyid[32];
int rc;
- switch( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
gpg_keycache_t ctx;
- key = (gpgme_key_t)lparam;
+ key = (winpt_key_t)lparam;
if (!key)
dlg_fatal_error( dlg, "Could not get dilaog param" );
ctx = keycache_get_ctx (1);
- if (!ctx)
- BUG (dlg);
- lv = revokelist_init (GetDlgItem (dlg, IDC_KEYREVOKERS_LIST), key, ctx);
+ lv = revokelist_init (GetDlgItem (dlg, IDC_KEYREVOKERS_LIST), key);
SetDlgItemText (dlg, IDC_KEYREVOKERS_INF, _("Designated Revoker Keys"));
SetWindowText (dlg, _("Key Revokers"));
@@ -151,25 +166,28 @@
case WM_NOTIFY:
NMHDR *notify;
notify = (NMHDR *)lparam;
- if (notify && notify->code == NM_DBLCLK &&
+ if (notify && notify->code == (UINT)NM_DBLCLK &&
notify->idFrom == IDC_KEYREVOKERS_LIST) {
int idx = listview_get_curr_pos (lv);
listview_get_item_text (lv, idx, REV_COL_KEYID, keyid, DIM (keyid)-1);
listview_get_item_text (lv, idx, REV_COL_NAME, buf, sizeof (buf)-1);
if (!strcmp (buf, _("user ID not found"))) {
int id = log_box (_("Designated Key Revokers"), MB_YESNO|MB_INFO,
- _("Do you want to retrieve 0x%s via the default keyserver?"), keyid);
+ _("Do you want to retrieve %s via the default keyserver?"), keyid);
if (id == IDNO)
break;
- rc = hkp_recv_key (dlg, default_keyserver,
+ rc = hkp_recv_key (dlg, default_keyserver,
default_keyserver_port, keyid, 0, 0);
if (!rc) {
+ struct winpt_key_s pk;
+
keycache_update (0, keyid);
key_update = 1;
- if (get_pubkey (keyid, &key))
+ memset (&pk, 0, sizeof (pk));
+ if (winpt_get_pubkey (keyid, &pk))
BUG (NULL);
- if (key->uids && key->uids->name)
- listview_add_sub_item (lv, idx, REV_COL_NAME, key->uids->name);
+ if (pk.ext && pk.ext->uids)
+ listview_add_sub_item (lv, idx, REV_COL_NAME, pk.ext->uids->name);
}
}
else {
@@ -194,6 +212,10 @@
case IDOK:
EndDialog (dlg, key_update);
break;
+
+ case IDCANCEL:
+ EndDialog (dlg, 0);
+ break;
}
break;
}
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeylist.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -155,7 +155,7 @@
/* Return the self signature of the key @keyid.
If first is set, the first self sig will be returned. */
gpgme_key_sig_t
-get_selfsig (gpgme_user_id_t uid, const char *keyid, int first)
+get_selfsig (gpgme_key_sig_t sigs, const char *keyid, int first)
{
gpgme_key_sig_t s, self_sig=NULL;
long timestamp=0;
@@ -164,7 +164,7 @@
if (strlen (keyid) == 8)
off = 8;
- for (s = uid->signatures; s; s = s->next) {
+ for (s = sigs; s; s = s->next) {
if (!strcmp (s->keyid+off, keyid) && s->timestamp > timestamp) {
self_sig = s;
timestamp = s->timestamp;
@@ -383,8 +383,9 @@
case GPGME_VALIDITY_MARGINAL:
return _("Marginal");
case GPGME_VALIDITY_FULL:
- case GPGME_VALIDITY_ULTIMATE:
return _("Full");
+ case GPGME_VALIDITY_ULTIMATE:
+ return _("Ultimate");
}
return "";
}
@@ -596,11 +597,7 @@
int j, n = 0, ext_chk = 0;
int rc = 0;
- rc = listview_new (&lv);
- if (rc)
- return rc;
-
- lv->ctrl = ctrl;
+ listview_new (&lv, ctrl);
if (mode & KEYLIST_ENCRYPT_MIN) {
col = klist_enc;
n = (DIM(klist_enc) -1);
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -397,8 +397,7 @@
int j;
ico[0] = LoadIcon (glob_hinst, (LPCTSTR)IDI_COMPUTER);
- listview_new (&lv);
- lv->ctrl = hwnd;
+ listview_new (&lv, hwnd);
for (j=0; keyserver[j].fieldname; j++)
listview_add_column (lv, &keyserver[j]);
listview_set_image_list (lv, 16, 16, ico, 1);
@@ -641,7 +640,7 @@
switch (LOWORD (wparam)) {
case IDC_KEYSERVER_PROXSETT:
dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,
- dlg, keyserver_proxy_dlg_proc, NULL,
+ dlg, keyserver_proxy_dlg_proc, 0,
_("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);
return TRUE;
Modified: trunk/Src/wptKeyserverSearchDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverSearchDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeyserverSearchDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -65,8 +65,7 @@
SetDlgItemText (dlg, IDC_HKPSEARCH_INFO, info);
SetWindowText (dlg, _("Keyserver Searching"));
SetForegroundWindow (dlg);
- listview_new (&lv);
- lv->ctrl = GetDlgItem (dlg, IDC_HKPSEARCH_LIST);
+ listview_new (&lv, GetDlgItem (dlg, IDC_HKPSEARCH_LIST));
for (i = 0; keysearch[i].width; i++)
listview_add_column (lv, &keysearch[i]);
listview_set_ext_style (lv);
Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptKeysigDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -117,9 +117,9 @@
sigprops_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
gpgme_key_sig_t ks;
- gpgme_key_t issuer;
+ winpt_key_s issuer;
char tmpbuf[256];
- struct {
+ static struct {
unsigned int exportable:1;
unsigned int expired:1;
unsigned int nrev:1;
@@ -128,7 +128,7 @@
int _class;
} ctx;
const char *fmt_templ = _("%s %s signature");
- char *s;
+ const char *s;
switch (msg) {
case WM_SYSCOMMAND:
@@ -166,16 +166,17 @@
ctx.exportable? _("Exportable") : _("Non-exportable"), ctx.alg);
SetDlgItemText (dlg, IDC_SIGPROPS_INFO, tmpbuf);
- SetDlgItemText (dlg, IDC_SIGPROPS_KEYID, ks->keyid+8);
+ _snprintf (tmpbuf, DIM (tmpbuf)-1, "0x%s", ks->keyid+8);
+ SetDlgItemText (dlg, IDC_SIGPROPS_KEYID, tmpbuf);
SetDlgItemInt (dlg, IDC_SIGPROPS_CLASS, ctx._class, FALSE);
if (ctx.exportable)
CheckDlgButton (dlg, IDC_SIGPROPS_EXP, BST_CHECKED);
- if (!get_pubkey (ks->keyid+8, &issuer))
- s = utf8_to_native (issuer->uids->uid);
+ memset (&issuer, 0, sizeof (issuer));
+ if (!winpt_get_pubkey (ks->keyid+8, &issuer))
+ s = issuer.ext->uids->uid;
else
- s = strdup (_(" user ID not found"));
+ s = _(" user ID not found");
SetDlgItemText (dlg, IDC_SIGPROPS_ISSUER, s);
- safe_free (s);
if (ks->expires == 0) {
ShowWindow (GetDlgItem (dlg, IDC_SIGPROPS_EXPSTR), SW_HIDE);
ShowWindow (GetDlgItem (dlg, IDC_SIGPROPS_EXPDATE), SW_HIDE);
@@ -204,7 +205,7 @@
if (ctx.expired)
CheckDlgButton (dlg, IDC_SIGPROPS_EXPIRED, BST_CHECKED);
}
- /* XXX: gpgme does not support cert policy URLs yet. */
+ /* XXX (gpgme): \r at the end of the notation value. */
if (ks->notations && !ks->notations->name && ks->notations->value)
SetDlgItemText (dlg, IDC_SIGPROPS_POLIC, ks->notations->value);
@@ -218,6 +219,30 @@
return TRUE;
case WM_COMMAND:
+ if (HIWORD (wparam) == BN_CLICKED) {
+ switch (LOWORD (wparam)) {
+ case IDC_SIGPROPS_EXP:
+ CheckDlgButton (dlg, IDC_SIGPROPS_EXP,
+ ctx.exportable? BST_CHECKED : BST_UNCHECKED);
+ return TRUE;
+
+ case IDC_SIGPROPS_EXPIRED:
+ CheckDlgButton (dlg, IDC_SIGPROPS_EXPIRED,
+ ctx.expired? BST_CHECKED : BST_UNCHECKED);
+ return TRUE;
+
+ case IDC_SIGPROPS_REV:
+ CheckDlgButton (dlg, IDC_SIGPROPS_REV,
+ ctx.rev? BST_CHECKED : BST_UNCHECKED);
+ return TRUE;
+
+ case IDC_SIGPROPS_NREV:
+ CheckDlgButton (dlg, IDC_SIGPROPS_NREV,
+ ctx.nrev? BST_CHECKED : BST_UNCHECKED);
+ return TRUE;
+ }
+ }
+
switch (LOWORD (wparam)) {
case IDOK:
EndDialog (dlg, TRUE);
@@ -395,11 +420,8 @@
k = (winpt_key_t) lparam;
if (!k)
BUG (0);
- if (k->uid) {
- char *p = utf8_to_native (k->uid);
- _snprintf (inf, DIM (inf)-1, _("Signature List for \"%s\""), p);
- safe_free (p);
- }
+ if (k->uid)
+ _snprintf (inf, DIM (inf)-1, _("Signature List for \"%s\""), k->uid);
SetWindowText (dlg, inf);
SetDlgItemText (dlg, IDC_KEYSIG_RECVKEY, _("&Receive Key"));
SetDlgItemText (dlg, IDC_KEYSIG_SIGPROPS, _("&Properties"));
Modified: trunk/Src/wptListView.cpp
===================================================================
--- trunk/Src/wptListView.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptListView.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -38,8 +38,8 @@
#include "resource.h"
-int
-listview_new (listview_ctrl_t *ctx)
+void
+listview_new (listview_ctrl_t *ctx, HWND ctrl)
{
struct listview_ctrl_s *c;
@@ -48,11 +48,10 @@
BUG (NULL);
c->cols = 0;
c->items = 0;
- c->ctrl = NULL;
+ c->ctrl = ctrl? ctrl : NULL;
c->hil = NULL;
c->ext_chkbox = 0;
*ctx = c;
- return 0;
}
Modified: trunk/Src/wptMDSumDlg.cpp
===================================================================
--- trunk/Src/wptMDSumDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptMDSumDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -114,9 +114,7 @@
md = (md_file_s *)lparam;
if (!md)
BUG (NULL);
- if( listview_new (&lv))
- BUG (NULL);
- lv->ctrl = GetDlgItem (dlg, IDC_MDSUM_LIST);
+ listview_new (&lv, GetDlgItem (dlg, IDC_MDSUM_LIST));
for (i = 0; i < cols[i].width; i++)
listview_add_column( lv, &cols[i]);
hash_selected_files (md, lv);
Modified: trunk/Src/wptSigList.cpp
===================================================================
--- trunk/Src/wptSigList.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptSigList.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -35,6 +35,7 @@
#include "wptTypes.h"
#include "wptW32API.h"
#include "wptVersion.h"
+#include "wptContext.h"
/* Is the given signature an user-id signature? */
@@ -44,7 +45,7 @@
/* Create a signature list control in @lv with the parent window
given in @ctrl.
Return value: 0 on success. */
-static int
+static void
siglist_build (listview_ctrl_t * lv, HWND ctrl)
{
struct listview_ctrl_s *c;
@@ -58,18 +59,14 @@
{6, 56, (char *)_("Algorithm")},
{0, 0, NULL}
};
- int j, rc = 0;
-
- rc = listview_new (&c);
- if (rc)
- return rc;
- c->ctrl = ctrl;
+ int j;
+
+ listview_new (&c, ctrl);
for (j=0; implist[j].fieldname != NULL; j++)
listview_add_column (c, &implist[j]);
listview_set_ext_style (c);
listview_del_all_items (c);
*lv = c;
- return 0;
}
@@ -121,10 +118,10 @@
control @lv.
Return value: 0 on success. */
static int
-siglist_add_key (listview_ctrl_t lv, gpgme_user_id_t uid,
+siglist_add_key (listview_ctrl_t lv, struct native_uid_s *uid,
gpgme_key_sig_t ks, int pos)
{
- gpgme_key_t key=NULL;
+ struct winpt_key_s key;
char t[128];
const char *attr;
const char *s;
@@ -140,9 +137,10 @@
attr = NULL;
if (!uid) {
- get_pubkey (ks->keyid, &key);
- if (key)
- attr = key->uids->uid;
+ memset (&key, 0, sizeof (key));
+ winpt_get_pubkey (ks->keyid, &key);
+ if (key.ext != NULL)
+ attr = key.ext->uids->uid;
}
else
attr = uid->uid;
@@ -215,20 +213,19 @@
listview_ctrl_t
siglist_load (HWND ctrl, const char *keyid)
{
- gpgme_key_t key;
- gpgme_user_id_t u;
gpgme_key_sig_t s;
+ struct native_uid_s *u;
+ winpt_key_s key;
listview_ctrl_t lv;
int pos = 0;
- int rc;
+ int rc = 0;
- if (siglist_build (&lv, ctrl))
+ siglist_build (&lv, ctrl);
+ memset (&key, 0, sizeof (key));
+ if (winpt_get_pubkey (keyid, &key))
BUG (NULL);
- rc = get_pubkey(keyid, &key);
- if (rc)
- BUG (NULL);
- for (u=key->uids; u; u = u->next) {
+ for (u=key.ext->uids; u; u = u->next) {
siglist_add_key (lv, u, NULL, pos++);
for (s = u->signatures; s; s = s->next) {
if (!IS_UID_CERT (s->sig_class))
Modified: trunk/Src/wptSigTreeDlg.cpp
===================================================================
--- trunk/Src/wptSigTreeDlg.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptSigTreeDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -43,23 +43,21 @@
/* Initialize the signature tree based on the given key @key. */
static void
-sigtree_load (HWND dlg, gpgme_key_t key)
+sigtree_load (HWND dlg, winpt_key_t key)
{
TVITEM tvi;
TVINSERTSTRUCT ctx;
- HTREEITEM uid;
- gpgme_user_id_t u;
+ HTREEITEM uid;
gpgme_key_sig_t s;
- gpgme_key_t signer;
- char *p;
+ winpt_key_s signer;
+ struct native_uid_s *u;
memset (&tvi, 0, sizeof (tvi));
memset (&ctx, 0, sizeof (ctx));
- for (u=key->uids; u; u = u->next) {
+ for (u=key->ext->uids; u; u = u->next) {
if (u->revoked)
continue;
- p = utf8_to_native (u->uid);
- tvi.pszText = p;
+ tvi.pszText = u->uid;
tvi.state = TVIS_BOLD;
tvi.mask = TVIF_TEXT;
tvi.iImage = 0;
@@ -67,12 +65,11 @@
ctx.hParent = TVI_ROOT;
ctx.item = tvi;
uid = TreeView_InsertItem (dlg, &ctx);
- safe_free (p);
for (s = u->signatures; s; s=s->next) {
- if (get_pubkey (s->keyid+8, &signer))
+ memset (&signer, 0, sizeof (signer));
+ if (winpt_get_pubkey (s->keyid+8, &signer))
continue;
- p = utf8_to_native (signer->uids->uid);
- tvi.pszText = p;
+ tvi.pszText = signer.ext->uids->uid;
tvi.mask = TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE|TVIF_PARAM;
tvi.iImage = 1;
tvi.iSelectedImage = 1;
@@ -80,7 +77,6 @@
ctx.hParent = uid;
ctx.item = tvi;
TreeView_InsertItem (dlg, &ctx);
- safe_free (p);
}
}
}
@@ -142,12 +138,12 @@
BOOL CALLBACK
sigtree_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
- static winpt_key_t key;
- static HWND tree;
+ static winpt_key_t key;
static HIMAGELIST hil;
+ HWND tree;
HICON ico[2];
NMHDR *nft;
- char inf[300], *p;
+ char inf[300];
switch (msg) {
case WM_INITDIALOG:
@@ -158,15 +154,13 @@
ico[1] = LoadIcon (glob_hinst, (LPCTSTR)IDI_KEY_SIG);
tree = GetDlgItem (dlg, IDC_VKEYSIG_TREE);
hil = treeview_set_image_list (tree, ico, 2);
- sigtree_load (tree, key->ctx);
- p = utf8_to_native (key->ctx->uids->uid);
+ sigtree_load (tree, key);
_snprintf (inf, sizeof (inf)-1,
_("Signature Tree for \"%s\" (0x%s)"),
- p, key->ctx->subkeys->keyid+8);
+ key->ext->uids->uid, key->ctx->subkeys->keyid+8);
SetDlgItemText (dlg, IDC_VKEYSIG_EDIT, _("Edit..."));
SetWindowText (dlg, inf);
SetForegroundWindow (dlg);
- safe_free (p);
break;
case WM_DESTROY:
Modified: trunk/Src/wptVerifyList.cpp
===================================================================
--- trunk/Src/wptVerifyList.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptVerifyList.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -31,6 +31,7 @@
#include "wptCommonCtl.h"
#include "wptKeylist.h"
#include "wptNLS.h"
+#include "wptContext.h"
#include "wptErrors.h"
#include "wptW32API.h"
@@ -112,13 +113,8 @@
{6, 0, NULL}
};
int j;
- int rc;
- rc = listview_new (&c);
- if (rc)
- return rc;
- c->ctrl = ctrl;
-
+ listview_new (&c, ctrl);
for(j=0; verlist[j].fieldname; j++)
listview_add_column (c, &verlist[j]);
if (!fm_mode)
@@ -144,7 +140,7 @@
int
verlist_add_sig (listview_ctrl_t lv, gpgme_signature_t sig)
{
- gpgme_key_t key = NULL;
+ struct winpt_key_s key;
u32 key_attr;
const char *attr;
char keyid[32+1];
@@ -154,7 +150,8 @@
listview_add_sub_item (lv, 0, VER_COL_NAME, "Clipboard");
- get_pubkey (sig->fpr, &key);
+ memset (&key, 0, sizeof (key));
+ winpt_get_pubkey (sig->fpr, &key);
if (sig->summary == 0 && gpg_err_code (sig->status) == GPG_ERR_NO_ERROR)
attr = get_gpg_sigstat (GPGME_SIGSUM_GREEN);
else
@@ -166,8 +163,8 @@
listview_add_sub_item (lv, 0, VER_COL_SIGNED, (char *)attr);
attr = _("Unknown");
- if (key) {
- key_attr = key->uids->validity;
+ if (key.ctx) {
+ key_attr = key.ext->uids->validity;
attr = get_key_trust2 (NULL, key_attr, 0, 0);
}
listview_add_sub_item (lv, 0, VER_COL_TRUST, (char *)attr);
@@ -176,11 +173,7 @@
_snprintf (keyid, sizeof keyid -1, "0x%s", attr);
listview_add_sub_item (lv, 0, VER_COL_KEYID, keyid);
- if (!key)
- attr = _("user ID not found");
- else
- attr = key->uids->name;
-
+ attr = key.ctx? key.ext->uids->name : _("user ID not found");
listview_add_sub_item (lv, 0, VER_COL_UID, attr);
return 0;
}
@@ -192,7 +185,7 @@
verlist_add_sig_log (listview_ctrl_t lv, file_sig_ctx_t log)
{
gpgme_signature_t sig = log->sig;
- gpgme_key_t key = NULL;
+ struct winpt_key_s key;
const char *attr;
char t[64], *name;
@@ -201,7 +194,9 @@
return WPTERR_GENERAL;
}
- get_pubkey (sig->fpr, &key);
+
+ memset (&key, 0, sizeof (key));
+ winpt_get_pubkey (sig->fpr, &key);
name = extract_filename (log->file);
if (name)
@@ -223,8 +218,8 @@
attr = "No time";
listview_add_sub_item (lv, 0, VER_COL_SIGNED, attr);
- if (key)
- attr = get_key_trust2 (NULL, key->uids->validity, 0, 0);
+ if (key.ctx != NULL)
+ attr = get_key_trust2 (NULL, key.ctx->uids->validity, 0, 0);
else
attr = _("Unknown");
listview_add_sub_item (lv, 0, VER_COL_TRUST, attr);
Modified: trunk/Src/wptW32API.cpp
===================================================================
--- trunk/Src/wptW32API.cpp 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/Src/wptW32API.cpp 2006-05-01 12:22:18 UTC (rev 208)
@@ -634,37 +634,51 @@
}
-struct reminder_hd_s {
- int msecs;
- HWND dlg;
+/* Return TRUE if the current user has admin privileges. */
+BOOL
+user_is_admin (void)
+{
+ SID_IDENTIFIER_AUTHORITY SystemSidAuthority = SECURITY_NT_AUTHORITY;
HANDLE hd;
-};
+ TOKEN_GROUPS *ptg = NULL;
+ DWORD ngtoken;
+ DWORD i;
+ BOOL admin = FALSE;
+ PSID psid = 0;
+ if (GetVersion () & 0x80000000) /* Win9X */
+ return TRUE;
-static DWORD CALLBACK
-foreground_reminder_thread (void *c)
-{
- struct reminder_hd_s *ctx = (struct reminder_hd_s *)c;
- Sleep (ctx->msecs);
- SetForegroundWindow (ctx->dlg);
- CloseHandle (ctx->hd);
- delete ctx;
- ExitThread (0);
- return 0;
-}
+ if (!OpenThreadToken (GetCurrentThread (), TOKEN_QUERY, FALSE, &hd) &&
+ !OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &hd))
+ return FALSE;
+
+ if (!GetTokenInformation (hd, TokenGroups, NULL, 0, &ngtoken) &&
+ GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+ ptg = (TOKEN_GROUPS*)GlobalAlloc (GPTR, ngtoken);
+ if (!ptg)
+ return FALSE;
-/* Try to force the window @dlg to the foreground.
- On NT5 or later this will not work if the user
- is working in another window (console for example). */
-void
-force_foreground_window (HWND dlg, int msecs)
-{
- struct reminder_hd_s *hd;
- DWORD tid;
+ if (!GetTokenInformation (hd, TokenGroups,
+ ptg, ngtoken, &ngtoken)) {
+ GlobalFree (ptg);
+ return FALSE;
+ }
+ AllocateAndInitializeSid (&SystemSidAuthority,
+ 2, SECURITY_BUILTIN_DOMAIN_RID,
+ DOMAIN_ALIAS_RID_ADMINS,
+ 0, 0, 0, 0, 0, 0,
+ &psid);
+ for (i = 0; i < ptg->GroupCount; i++) {
+ if (EqualSid (ptg->Groups[i].Sid, psid)) {
+ admin = TRUE;
+ break;
+ }
+ }
+ FreeSid (psid);
+ GlobalFree (ptg);
+ }
- hd = new reminder_hd_s;
- hd->dlg = dlg;
- hd->msecs = msecs;
- hd->hd = CreateThread (NULL, 0, foreground_reminder_thread,
- hd, NULL, &tid);
+ CloseHandle (hd);
+ return admin;
}
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/THANKS 2006-05-01 12:22:18 UTC (rev 208)
@@ -40,6 +40,7 @@
Gustavo Vasconcelos gustavo.hlv at gmx.net
Holger Sesterhahn listen at sesterhahn.de
Kurt Fitzner kfitzner at excelcia.org
+Mathias Krueger
Mark sonarte at applink.net
Markus Gerwinski markus.gerwinsiki at sercon.de
Marcus Junk Marcus.Junk at bkk-der-partner.de
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/TODO 2006-05-01 12:22:18 UTC (rev 208)
@@ -1,13 +1,13 @@
(priority: + high, * normal, - low)
version 0.11.x
- + finish the new internal utf8 support for the w32 controls
- to avoid further utf8 en- and decoding problems.
+ + check native language support with non-admin accounts.
* there is a problem with the +E hotkey in EURO countries.
-
+ * find a way to allow a designated revoker to revoke a
+ key he is 'responsible' for.
* migrate keyserver code to use the HTTP class.
Implement proxy authentication into the HTTP class.
- + Implement a system to manage language files. Retrieve a list
+ * Implement a system to manage language files. Retrieve a list
of available files from the server, present it to the user
and allow to download the file and set the default language
accoarding to the downloaded language file.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-04-28 10:28:24 UTC (rev 207)
+++ trunk/configure.ac 2006-05-01 12:22:18 UTC (rev 208)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.13-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.12.0-cvs, http://www.winpt.org)
NEED_GPG_VERSION=1.4.2
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.1
More information about the Winpt-commits
mailing list