[Winpt-commits] r211 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun May 7 14:36:58 CEST 2006
Author: twoaday
Date: 2006-05-07 14:36:48 +0200 (Sun, 07 May 2006)
New Revision: 211
Modified:
trunk/Include/wptDlgs.h
trunk/Include/wptGPG.h
trunk/Include/wptKeyManager.h
trunk/NEWS
trunk/Po/ChangeLog
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptCommonDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptGPGME.cpp
trunk/Src/wptGPGParser.cpp
trunk/Src/wptGroupManager.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyPropsDlg.cpp
trunk/Src/wptKeygenCBDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/configure.ac
Log:
Modified: trunk/Include/wptDlgs.h
===================================================================
--- trunk/Include/wptDlgs.h 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Include/wptDlgs.h 2006-05-07 12:36:48 UTC (rev 211)
@@ -242,7 +242,7 @@
/*-- Key generation callback */
int keygen_cb_dlg_create (void);
-void keygen_cb_dlg_destroy (void);
+void keygen_cb_dlg_destroy (int flush);
void keygen_cb (void *opaque, const char *what,
int type, int curretn, int total);
Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Include/wptGPG.h 2006-05-07 12:36:48 UTC (rev 211)
@@ -155,10 +155,10 @@
const char * get_signature_status( gpgme_sigsum_t sigstat );
void keycache_reload( HWND dlg );
-int get_pubkey (const char *keyid, gpgme_key_t *ret_key);
-int winpt_get_pubkey (const char *keyid, struct winpt_key_s *k);
-int get_seckey (const char *keyid, gpgme_key_t *ret_skey);
-int winpt_get_seckey (const char *keyid, struct winpt_key_s *k);
+gpgme_error_t get_pubkey (const char *keyid, gpgme_key_t *ret_key);
+gpgme_error_t winpt_get_pubkey (const char *keyid, struct winpt_key_s *k);
+gpgme_error_t get_seckey (const char *keyid, gpgme_key_t *ret_skey);
+gpgme_error_t winpt_get_seckey (const char *keyid, struct winpt_key_s *k);
void keycache_reload( HWND dlg );
void keycache_release (int cleanup);
Modified: trunk/Include/wptKeyManager.h
===================================================================
--- trunk/Include/wptKeyManager.h 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Include/wptKeyManager.h 2006-05-07 12:36:48 UTC (rev 211)
@@ -44,13 +44,14 @@
gpg_optfile_t gh;
HWND tree;
unsigned int need_sync:1;
+ char *cfgfile;
};
typedef struct km_group_s * km_group_t;
struct km_group_cb_s {
- km_group_s * gc;
- char name[256];
- int use_name;
+ km_group_s *gc;
+ char name[256];
+ int use_name;
};
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/NEWS 2006-05-07 12:36:48 UTC (rev 211)
@@ -810,5 +810,6 @@
* Unified utf8 decoding system to avoid further problems.
* In some cases the keyserver output were truncated.
Now dynamic buffers are always used to avoid truncated output.
+* Minor bug fixes and usability issues for the Key Manager.
[Updated languages: de, jp]
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Po/ChangeLog 2006-05-07 12:36:48 UTC (rev 211)
@@ -1,3 +1,11 @@
+2006-05-07 Timo Schulz <ts at g10code.de>
+
+ * de.po: Updated for 0.12.0
+
+2006-05-05 Timo Schulz <ts at g10code.de>
+
+ * de.po: Upated.
+
2006-05-01 Timo Schulz <ts at g10code.de>
* jp.po: Updated.
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Po/de.po 2006-05-07 12:36:48 UTC (rev 211)
@@ -3,7 +3,7 @@
# Timo Schulz <twoaday at freakmail.de>, 2002, 2004, 2005, 2006
# g10 Code GmbH <twoaday at g10code.de>, 2005, 2006
# Thomas Henlich <henlich at mmers1.mw.tu-dresden.de>, 2001
-# Ralf Kreutzmann <ralf.kreutzmann at equipmente.de>, 2004,2005
+# Ralf Kreutzmann <ralf.kreutzmann at equipmente.de>, 2004, 2005
#
# Hinweis vom Entwickler:
# Mantra scheint nicht bekannt genug zu sein. Also bitte
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.13\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-29 19:32+0200\n"
+"POT-Creation-Date: 2006-05-07 13:41+0200\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
@@ -22,29 +22,29 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Src/WinPT.cpp:183
+#: Src/WinPT.cpp:188
msgid "Could not create GPG home directory"
msgstr "Konnte Heimatverzeichnis von GPG nicht erstellen"
-#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
-#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
-#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
-#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
+#: Src/WinPT.cpp:189 Src/WinPT.cpp:221 Src/WinPT.cpp:271 Src/WinPT.cpp:275
+#: Src/WinPT.cpp:471 Src/WinPT.cpp:478 Src/WinPT.cpp:519 Src/WinPT.cpp:547
+#: Src/WinPT.cpp:556 Src/WinPT.cpp:560 Src/WinPT.cpp:577 Src/WinPT.cpp:645
+#: Src/WinPT.cpp:658 Src/WinPT.cpp:705 Src/WinPT.cpp:735 Src/WinPT.cpp:753
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
#: Src/wptGPG.cpp:915 Src/wptGPG.cpp:925 Src/wptGPG.cpp:936
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "WinPT Fehler"
-#: Src/WinPT.cpp:215
+#: Src/WinPT.cpp:220
msgid "No useable secret key found."
msgstr "Kein benutzbarer geheimer Schlüssel gefunden."
-#: Src/WinPT.cpp:265
+#: Src/WinPT.cpp:270
msgid "Could not read GnuPG version."
msgstr "Konnte Version von GnuPG nicht auslesen."
-#: Src/WinPT.cpp:271
+#: Src/WinPT.cpp:276
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
@@ -53,39 +53,39 @@
"Sorry, Sie benötigen eine neuere Version von GPG.\n"
"Aktuelle Version von GPG %d.%d.%d benötigte Version von GPG "
-#: Src/WinPT.cpp:299
+#: Src/WinPT.cpp:304
msgid "Failed to create WinPT directory"
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
-#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: 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: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
+#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptKeyserver.cpp:573
+#: Src/wptKeyserverDlg.cpp:68 Src/wptKeyserverDlg.cpp:70
+#: Src/wptKeyserverDlg.cpp:187 Src/wptKeyserverDlg.cpp:195
+#: Src/wptKeyserverDlg.cpp:211 Src/wptKeyserverDlg.cpp:352
+#: Src/wptKeyserverDlg.cpp:358 Src/wptKeyserverDlg.cpp:460
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:636 Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:700
msgid "Keyserver"
msgstr "Schlüsselserver"
-#: Src/WinPT.cpp:316
+#: Src/WinPT.cpp:321
msgid "Failed to copy the keyserver.conf"
msgstr "Das Kopieren der keyserver.conf ist fehlgeschlagen"
# c:\oss\winpt-gpgme\src\WinPT.cpp:245
-#: Src/WinPT.cpp:463
+#: Src/WinPT.cpp:470
msgid "Cryptographic selftest failed."
msgstr "Kryptographischer Selbsttest ist fehlgeschlagen."
# c:\oss\winpt-gpgme\src\WinPT.cpp:252
-#: Src/WinPT.cpp:470
+#: Src/WinPT.cpp:477
msgid "A newer GPGME version is needed; at least "
msgstr "Eine neuere Version von GPGME wird benötigt; mindestens "
-#: Src/WinPT.cpp:512
+#: Src/WinPT.cpp:520
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -96,16 +96,16 @@
"Bitte überprüfen Sie die Registryseinträge von GPG:\n"
"%s."
-#: Src/WinPT.cpp:516
+#: Src/WinPT.cpp:524
msgid "Select GPG Public Keyring"
msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
# c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:546
msgid "GPG home directory could not be determited."
msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
-#: Src/WinPT.cpp:546
+#: Src/WinPT.cpp:554
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -114,7 +114,7 @@
"öffnen um das Problem zu beheben?"
# c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:569
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
@@ -129,20 +129,20 @@
# c:\oss\winpt-gpgme\src\WinPT.cpp:376
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
-#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:814
+#: Src/WinPT.cpp:602 Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:818
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
-#: Src/WinPT.cpp:636
+#: Src/WinPT.cpp:644
msgid "Could not register window class"
msgstr "Konnte Fensterklasse nicht registrieren"
-#: Src/WinPT.cpp:650
+#: Src/WinPT.cpp:658
msgid "Could not create window"
msgstr "Konnte Fenster nicht erstellen"
-#: Src/WinPT.cpp:725
+#: Src/WinPT.cpp:733
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -150,7 +150,7 @@
"Der Schlüsselspeicher wurde nicht initialisiert oder ist leer.\n"
"Bitte überprüfen Sie die Konfiguration von GPG (Schlüsselbunde, Pfade)"
-#: Src/WinPT.cpp:728
+#: Src/WinPT.cpp:736
msgid ""
"It seems that GPG is not set properly.\n"
"Do you want to start the GPG preferences dialog?"
@@ -158,7 +158,7 @@
"GPG ist nicht richtig konfiguriert.\n"
"Den GPG-Einstellungsdialog starten?"
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:754
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -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:1741
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1750
#: 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:2156
-#: Src/wptKeyManagerDlg.cpp:962
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2143
+#: Src/wptKeyManagerDlg.cpp:967
msgid "&Help"
msgstr "&Hilfe"
@@ -321,7 +321,7 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:515
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:513
msgid "&Name"
msgstr "&Name"
@@ -337,7 +337,7 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:650 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Niemals"
@@ -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:1637
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1646
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:1397
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1380
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -445,21 +445,21 @@
"Bitte die OpenPGP-SmartCard einlegen\n"
"OK zum Fortfahren oder Abbrechen"
-#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
-#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
-#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
+#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:187
+#: Src/wptFileManager.cpp:1228 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:1304
-#: Src/wptFileManager.cpp:1351
+#: Src/wptClipDecryptDlg.cpp:116 Src/wptClipDecryptDlg.cpp:129
+#: Src/wptClipDecryptDlg.cpp:137 Src/wptClipDecryptDlg.cpp:144
+#: Src/wptClipDecryptDlg.cpp:146 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
+#: Src/wptClipDecryptDlg.cpp:130 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -468,18 +468,18 @@
"Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
"Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
-#: Src/wptClipDecryptDlg.cpp:140
+#: Src/wptClipDecryptDlg.cpp:137
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Unbekannter Algorithmus: %s"
# c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:143
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Ungültige OpenPGP Nachricht (vielleicht: \"quoted printable\" im Armorteil)."
-#: Src/wptClipDecryptDlg.cpp:154
+#: Src/wptClipDecryptDlg.cpp:151
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -492,40 +492,40 @@
"Es ist möglich, dass die Daten beschädigt worden aber es ist ebenfalls "
"möglich das dies ein Teil eines Attacke ist."
-#: Src/wptClipDecryptDlg.cpp:159
+#: Src/wptClipDecryptDlg.cpp:156
msgid "*** IMPORTANT ***"
msgstr "*** WICHTIG ***"
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipDecryptDlg.cpp:159 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
#: 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:177
+#: Src/wptClipDecryptDlg.cpp:174
msgid "Signature Status: Created with a fully trusted key"
msgstr "Signatur Status: Erstellt mit einem vertraunswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:179
+#: Src/wptClipDecryptDlg.cpp:176
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:182
+#: Src/wptClipDecryptDlg.cpp:179
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr "Signatur Status: Erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:185
+#: Src/wptClipDecryptDlg.cpp:182
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem Schlüssel ohne definiertes Vertrauen"
-#: Src/wptClipDecryptDlg.cpp:192
+#: Src/wptClipDecryptDlg.cpp:189
msgid "WinPT Verify"
msgstr "WinPT Verifikation"
-#: Src/wptClipDecryptDlg.cpp:193
+#: Src/wptClipDecryptDlg.cpp:190
#, c-format
msgid ""
"%s\n"
@@ -541,13 +541,13 @@
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
-#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:211
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
msgstr "Zwischenablage"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:568
msgid "File Open"
msgstr "Datei öffnen"
@@ -599,8 +599,8 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
-#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2142
+#: Src/wptKeyserverDlg.cpp:577 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
@@ -622,15 +622,15 @@
msgstr "&Suche"
#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
-#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
-#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
+#: Src/wptFileManagerDlg.cpp:83 Src/wptFileManagerDlg.cpp:217
+#: Src/wptFileManagerDlg.cpp:286 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:516 Src/wptKeyEditDlgs.cpp:651
#: 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/wptKeygenDlg.cpp:538 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:509 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
@@ -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:1082
-#: Src/wptFileManager.cpp:1098 Src/wptFileManager.cpp:1408
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1080
+#: Src/wptFileManager.cpp:1096 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signieren"
@@ -711,8 +711,8 @@
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
#: 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/wptFileManager.cpp:1584 Src/wptFileManager.cpp:1637
+#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -751,74 +751,73 @@
msgid "Save Plaintext"
msgstr "Klartext speichern"
-#: Src/wptCommonDlg.cpp:86
+#: Src/wptCommonDlg.cpp:85
msgid "Please enter a valid URL."
msgstr "Bitte eine gültige URL eingeben."
-#: Src/wptCommonDlg.cpp:116
+#: Src/wptCommonDlg.cpp:115
msgid "HTTP Key Import"
msgstr "HTTP Schlüssel Import"
-#: Src/wptCommonDlg.cpp:117
+#: Src/wptCommonDlg.cpp:116
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: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
+#: Src/wptCommonDlg.cpp:134 Src/wptKeyEditDlgs.cpp:769
+#: Src/wptKeyEditDlgs.cpp:836 Src/wptKeyEditDlgs.cpp:876
+#: Src/wptKeyEditDlgs.cpp:889 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:917 Src/wptKeyEditDlgs.cpp:947
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1030 Src/wptKeyEditDlgs.cpp:1048
+#: Src/wptKeyEditDlgs.cpp:1094 Src/wptKeyEditDlgs.cpp:1181
+#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1309 Src/wptKeyEditDlgs.cpp:1316
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1366 Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1385 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1514
+#: Src/wptKeyEditDlgs.cpp:1517 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1565 Src/wptKeyEditDlgs.cpp:1582
+#: Src/wptKeyEditDlgs.cpp:1602 Src/wptKeyEditDlgs.cpp:1610
+#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1805 Src/wptKeyEditDlgs.cpp:1927
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1945
+#: Src/wptKeyEditDlgs.cpp:1947 Src/wptKeyEditDlgs.cpp:1980
+#: Src/wptKeyEditDlgs.cpp:1985 Src/wptKeyEditDlgs.cpp:1994
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeyEditDlgs.cpp:2012
+#: Src/wptKeyEditDlgs.cpp:2079 Src/wptKeyEditDlgs.cpp:2120
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2147
+#: Src/wptKeyEditDlgs.cpp:2176 Src/wptKeyEditDlgs.cpp:2181
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1774
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
# c:\oss\winpt-gpgme\src\wptCommonDlg.cpp:117
-#: Src/wptCommonDlg.cpp:136
+#: Src/wptCommonDlg.cpp:135
msgid "Enter preferred keyserver URL"
msgstr "Bevorzugte Keyserver URL eingeben"
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:334
msgid "Choose Locale Directory"
msgstr "Verzeichnis für Sprachdateien auswählen"
-#: Src/wptCommonDlg.cpp:220
+#: Src/wptCommonDlg.cpp:219
msgid "Could not create winpt.mo file"
msgstr "Konnte winpt.mo Datei nicht erstellen"
-#: Src/wptCommonDlg.cpp:251
+#: Src/wptCommonDlg.cpp:250
msgid "Native Language Support"
msgstr "Internationale Sprachunterstützung"
-#: Src/wptCommonDlg.cpp:252
+#: Src/wptCommonDlg.cpp:251
msgid "Please select a language"
msgstr "Bitte eine Sprache auswählen"
-#: Src/wptCommonDlg.cpp:253
+#: Src/wptCommonDlg.cpp:252
msgid "&OK"
msgstr "&OK"
@@ -1004,12 +1003,13 @@
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: 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
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:662
+#: Src/wptFileManager.cpp:807 Src/wptFileManager.cpp:922
+#: Src/wptFileManager.cpp:1491 Src/wptFileManager.cpp:1518
+#: Src/wptFileManager.cpp:1537 Src/wptFileManager.cpp:1788
+#: Src/wptFileManager.cpp:1850 Src/wptFileManagerDlg.cpp:503
+#: Src/wptFileManagerDlg.cpp:622 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "Dateimanager"
@@ -1040,12 +1040,12 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1085
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1080
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1184
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1172
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
@@ -1055,11 +1055,11 @@
msgid "Operation"
msgstr "Prozess"
-#: Src/wptFileManager.cpp:663
+#: Src/wptFileManager.cpp:661
msgid "Please select a file."
msgstr "Bitte eine Datei auswählen."
-#: Src/wptFileManager.cpp:810
+#: Src/wptFileManager.cpp:808
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1068,53 +1068,53 @@
"\"%s\" scheint keine Text-Datei zu sein.\n"
"Möchsten Sie wirklich diese Datei signieren?"
-#: Src/wptFileManager.cpp:925
+#: Src/wptFileManager.cpp:923
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" existiert nicht"
-#: Src/wptFileManager.cpp:1008 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1006 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Dateistatus"
-#: Src/wptFileManager.cpp:1052
+#: Src/wptFileManager.cpp:1050
msgid "Enter filename for encrypted file"
msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
-#: Src/wptFileManager.cpp:1081
+#: Src/wptFileManager.cpp:1079
msgid "Could not get default secret key."
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
-#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
-#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1110 Src/wptFileManager.cpp:1442
+#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signieren"
-#: Src/wptFileManager.cpp:1125 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1123 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
-#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1150 Src/wptFileManager.cpp:1183
+#: Src/wptFileManager.cpp:1188 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symmetrisch"
-#: Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1188
msgid "Encryption failed."
msgstr "Verschlüsselung fehlgeschlagen."
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1218
msgid "Good signature"
msgstr "Korrekte Signatur"
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1218
msgid "BAD signature"
msgstr "Falsche Signatur"
-#: Src/wptFileManager.cpp:1231
+#: Src/wptFileManager.cpp:1229
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1125,24 +1125,24 @@
"%s von \"%s\"\n"
"%s"
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1234
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptFileManager.cpp:1313
+#: Src/wptFileManager.cpp:1311
msgid "Choose Filename for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1322
+#: Src/wptFileManager.cpp:1320
msgid "Please enter filename for plaintext file"
msgstr "Wählen Sie einen Namen für die Klartext-Datei"
-#: Src/wptFileManager.cpp:1360 Src/wptFileManager.cpp:1372
-#: Src/wptFileManagerDlg.cpp:555
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: Src/wptFileManager.cpp:1366
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1151,7 +1151,7 @@
"Entshlüsselung fehlgeschlagen.\n"
"%s: existiert nicht."
-#: Src/wptFileManager.cpp:1373
+#: Src/wptFileManager.cpp:1371
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1162,41 +1162,41 @@
"\n"
"Wollen Sie diesen anstatt von '%s' benutzen?"
-#: Src/wptFileManager.cpp:1421
+#: Src/wptFileManager.cpp:1419
msgid "Enter filename for signed file"
msgstr "Wählen Sie einen Namen für die signierte Datei"
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1517
msgid "Could not find detached signature in the clipboard."
-msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
+msgstr "Konnte abgetrennte Signatur in der Zwischenablage nicht finden."
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1539
+#: Src/wptFileManager.cpp:1537
msgid "No files to check."
msgstr "Keine Datei(en) zu pruefen."
-#: Src/wptFileManager.cpp:1556
+#: Src/wptFileManager.cpp:1554
msgid "Select Data File"
msgstr "Bitte Datendatei auswählen"
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1556
msgid "Selected Output File"
msgstr "Bitte Ausgabedatei auswählen"
-#: Src/wptFileManager.cpp:1586
+#: Src/wptFileManager.cpp:1584
msgid "Invalid file name. Exit"
msgstr "Ungültiger Dateiname. Abbruch"
-#: Src/wptFileManager.cpp:1684 Src/wptFileManager.cpp:1695
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
+#: Src/wptFileManager.cpp:1682 Src/wptFileManager.cpp:1693
+#: Src/wptFileManagerDlg.cpp:243 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
+#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:219
msgid "Import"
msgstr "Importieren"
-#: Src/wptFileManager.cpp:1692
+#: Src/wptFileManager.cpp:1690
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1208,106 +1208,111 @@
"\n"
"Kann diese(n) Schlüssel nicht importieren!"
-#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
+#: Src/wptFileManager.cpp:1716 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:1718 Src/wptFileManager.cpp:1741
-#: Src/wptKeyserverDlg.cpp:89
+#: Src/wptFileManager.cpp:1716 Src/wptFileManager.cpp:1739
+#: Src/wptKeyserverDlg.cpp:90
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
-#: Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptFileManager.cpp:1724 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1742
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
-#: Src/wptKeyserverDlg.cpp:101
+#: Src/wptFileManager.cpp:1743 Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1333 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyserverDlg.cpp:102
msgid "GnuPG status"
msgstr "GnuPG Status"
-#: Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1743
#, c-format
msgid "Finished (Output: %s)"
msgstr "Fertig (Ausgabe: %s)"
-#: Src/wptFileManager.cpp:1791
+#: Src/wptFileManager.cpp:1789
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManager.cpp:1851
+#: Src/wptFileManager.cpp:1849
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:1856
+#: Src/wptFileManager.cpp:1854
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1926
+#: Src/wptFileManager.cpp:1924
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1929
+#: Src/wptFileManager.cpp:1927
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1929 Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1927 Src/wptFileManager.cpp:1934
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1934
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
-#: Src/wptFileManagerDlg.cpp:79 Src/wptFileManagerDlg.cpp:146
+#: Src/wptFileManagerDlg.cpp:77 Src/wptFileManagerDlg.cpp:145
msgid "File Encrypt"
msgstr "Datei verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:80 Src/wptFileManagerDlg.cpp:281
+#: Src/wptFileManagerDlg.cpp:78 Src/wptFileManagerDlg.cpp:280
msgid "&Text Output"
msgstr "&Textausgabe"
-#: Src/wptFileManagerDlg.cpp:81
+#: Src/wptFileManagerDlg.cpp:79
msgid "&Wipe Original"
msgstr "Original &löschen"
-#: Src/wptFileManagerDlg.cpp:82
+#: Src/wptFileManagerDlg.cpp:80
msgid "Anonymize (throw keyid)"
msgstr "Anonymize (throw keyid)"
-#: Src/wptFileManagerDlg.cpp:83
+#: Src/wptFileManagerDlg.cpp:81
msgid "&Select Key for signing"
msgstr "&Schlüssel zum Signieren"
-#: Src/wptFileManagerDlg.cpp:145
+#: Src/wptFileManagerDlg.cpp:82 Src/wptFileManagerDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:959
+msgid "Options"
+msgstr "Optionen"
+
+#: Src/wptFileManagerDlg.cpp:144
msgid "Please select at least one recipient."
msgstr "Bitte wählen Sie wenigstens einen Empfänger."
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
+#: Src/wptFileManagerDlg.cpp:202 Src/wptFileStatDlg.cpp:281
#: 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/wptFileManagerDlg.cpp:202 Src/wptFileManagerDlg.cpp:216
#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr "Schlüsselimport"
-#: Src/wptFileManagerDlg.cpp:208
+#: Src/wptFileManagerDlg.cpp:207
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr "%s enthält %d Schlüssel."
-#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:211 Src/wptFileManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:932 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
-#: Src/wptFileManagerDlg.cpp:241
+#: Src/wptFileManagerDlg.cpp:240
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1319,181 +1324,181 @@
"Die Vertrauensstellungen dieser Schlüssel müssen Sie\n"
"manuell in den Schlüsseleigenschaften setzen."
-#: Src/wptFileManagerDlg.cpp:280 Src/wptFileManagerDlg.cpp:332
+#: Src/wptFileManagerDlg.cpp:279 Src/wptFileManagerDlg.cpp:331
msgid "File Sign"
msgstr "Datei signieren"
-#: Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:281
msgid "&Normal Signature"
msgstr "&Normale Signatur"
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:282
msgid "&Detached Signature"
msgstr "&Angehängte Signatur"
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Cleartext Signature"
msgstr "&Klartextsignatur"
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:284
msgid "Signature mode"
msgstr "Signaturmodus"
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
-msgid "Options"
-msgstr "Optionen"
-
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
-#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1432
#: 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/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1520
+#: Src/wptKeyManagerDlg.cpp:1536 Src/wptKeyManagerDlg.cpp:1564
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1719
#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
-#: Src/wptFileManagerDlg.cpp:392
+#: Src/wptFileManagerDlg.cpp:391
msgid "0 Objects marked"
msgstr "0 Objekte markiert"
-#: Src/wptFileManagerDlg.cpp:396
+#: Src/wptFileManagerDlg.cpp:395
#, c-format
msgid "%d Object(s) marked"
msgstr "%d Objekt(e) markiert"
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:550
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptFileManagerDlg.cpp:473 Src/wptKeyManagerDlg.cpp:933
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:949
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:934
msgid "View"
msgstr "Ansicht"
-#: Src/wptFileManagerDlg.cpp:476
+#: Src/wptFileManagerDlg.cpp:475
msgid "&Open..."
msgstr "Ö&ffnen.."
-#: Src/wptFileManagerDlg.cpp:477
+#: Src/wptFileManagerDlg.cpp:476
msgid "&Encrypt"
msgstr "&Verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManagerDlg.cpp:477 Src/wptFileManagerDlg.cpp:552
msgid "Encrypt into ZIP"
msgstr "Verschlüsseln in ZIP"
-#: Src/wptFileManagerDlg.cpp:479
+#: Src/wptFileManagerDlg.cpp:478
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptFileManagerDlg.cpp:479 Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeyManagerDlg.cpp:998
msgid "&Sign"
msgstr "&Signieren"
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
+#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:556
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:482
+#: Src/wptFileManagerDlg.cpp:481
msgid "&Verify"
msgstr "Über&prüfen"
-#: Src/wptFileManagerDlg.cpp:483
+#: Src/wptFileManagerDlg.cpp:482
msgid "S&ymmetric"
msgstr "S&ymmetrisch"
-#: Src/wptFileManagerDlg.cpp:484
+#: Src/wptFileManagerDlg.cpp:483
msgid "&Import"
msgstr "&Importieren"
-#: Src/wptFileManagerDlg.cpp:485
+#: Src/wptFileManagerDlg.cpp:484
msgid "E&xport"
msgstr "E&xportieren"
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:419
msgid "Exit"
msgstr "Beenden"
-#: Src/wptFileManagerDlg.cpp:487
+#: Src/wptFileManagerDlg.cpp:486
msgid "&Reset"
msgstr "&Reset"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:421
-#: Src/wptFileManagerDlg.cpp:488
+#: Src/wptFileManagerDlg.cpp:487
msgid "Always on Top"
msgstr "Immer im Vordergrund"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
-#: Src/wptFileManagerDlg.cpp:489
+#: Src/wptFileManagerDlg.cpp:488
msgid "&Paste"
msgstr "&Einfügen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:423
-#: Src/wptFileManagerDlg.cpp:490
+#: Src/wptFileManagerDlg.cpp:489
msgid "&Select All"
msgstr "Alles &markieren"
-#: Src/wptFileManagerDlg.cpp:491
+#: Src/wptFileManagerDlg.cpp:490
msgid "&Preferences"
msgstr "&Einstellungen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:491 Src/wptFileManagerDlg.cpp:559
msgid "Send as Mail"
msgstr "Als Mail versenden"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:425
-#: Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:492
msgid "&List Packets"
msgstr "Pakete an&zeigen"
-#: Src/wptFileManagerDlg.cpp:495
+#: Src/wptFileManagerDlg.cpp:494
msgid "&Wipe"
msgstr "&Löschen"
-#: Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:558
msgid "Wipe"
msgstr "Löschen"
-#: Src/wptFileManagerDlg.cpp:561
+#: Src/wptFileManagerDlg.cpp:560
msgid "List Packets"
msgstr "Pakete anzeigen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:607
+#: Src/wptFileManagerDlg.cpp:606
msgid "&Calc Digest"
msgstr "Digest &berechnen"
+#: Src/wptFileManagerDlg.cpp:621
+msgid "This command requires admin privileges.\n"
+msgstr "Dieses Kommando benötigt Adminrechte.\n"
+
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:766
+#: Src/wptFileManagerDlg.cpp:770
msgid "Are you sure you want to secure delete these files?"
msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
-#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:771 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Ja"
-#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:772 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Nein"
-#: Src/wptFileManagerDlg.cpp:811
+#: Src/wptFileManagerDlg.cpp:815
msgid "Operation Status: Error"
msgstr "Prozess-Status: Fehler"
-#: Src/wptFileManagerDlg.cpp:812
+#: Src/wptFileManagerDlg.cpp:816
msgid "Operation Status: Done."
msgstr "Prozess-Status: Fertig."
-#: Src/wptFileManagerDlg.cpp:855
+#: Src/wptFileManagerDlg.cpp:859
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1593,7 +1598,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:1741 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyManagerDlg.cpp:960
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1662,35 +1667,35 @@
msgid "No GPG error description available."
msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:313
msgid "Error during verification process."
msgstr "Fehler während Verifikation."
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:314
msgid "The signature is good."
msgstr "Die Signatur is gut."
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:315
msgid "The signature is BAD!"
msgstr "Die Signatur ist nicht gültig!"
-#: Src/wptGPGME.cpp:321
+#: Src/wptGPGME.cpp:316
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:322
+#: Src/wptGPGME.cpp:317
msgid "No valid OpenPGP signature."
msgstr "Keine gültige OpenPGP Signatur."
-#: Src/wptGPGME.cpp:323
+#: Src/wptGPGME.cpp:318
msgid "Signature Error"
msgstr "Fehler in Signatur"
-#: Src/wptGPGME.cpp:324
+#: Src/wptGPGME.cpp:319
msgid "Good Signature (Expired Key)"
msgstr "Gültige Signature (Abgelaufener Schlüssel)"
-#: Src/wptGPGME.cpp:325
+#: Src/wptGPGME.cpp:320
msgid "Good Signature (Revoked Key)"
msgstr "Gültige Signatur (Widerrufener Schlüssel)"
@@ -1732,7 +1737,7 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1663
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1672
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
@@ -1811,7 +1816,7 @@
msgid "Choose GPG Binary"
msgstr "Wählen Sie GPG.EXE Datei aus"
-#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
+#: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
#: 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
@@ -1830,23 +1835,24 @@
#: 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
+#: Src/wptKeyManagerDlg.cpp:1182 Src/wptKeyManagerDlg.cpp:1195
+#: Src/wptKeyManagerDlg.cpp:1205 Src/wptKeyManagerDlg.cpp:1499
+#: Src/wptKeyManagerDlg.cpp:1521 Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1546 Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1564 Src/wptKeyManagerDlg.cpp:1570
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1610 Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1701 Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyManagerDlg.cpp:1724 Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1800 Src/wptKeyManagerDlg.cpp:1805
+#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:314 Src/wptKeysigDlg.cpp:388
+#: Src/wptKeysigDlg.cpp:397 Src/wptKeysigDlg.cpp:442 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
-#: Src/wptGroupManager.cpp:208
+#: Src/wptGroupManager.cpp:245
#, c-format
msgid ""
"Do you really want to delete this group?\n"
@@ -1857,7 +1863,7 @@
"\n"
"%s"
-#: Src/wptGroupManager.cpp:236
+#: Src/wptGroupManager.cpp:272
#, c-format
msgid ""
"Do you really want to delete this entry?\n"
@@ -1916,20 +1922,20 @@
msgid "Unknown Hotkey"
msgstr "Unbekanntes Tastenkürzel"
-#: 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
+#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:256
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeyEditDlgs.cpp:1197
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptKeyEditDlgs.cpp:1505 Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeylist.cpp:421 Src/wptKeylist.cpp:455
+#: Src/wptKeyPropsDlg.cpp:159 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:214
msgid "Revoked"
msgstr "Widerrufen"
-#: 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
+#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
+#: Src/wptKeyEditDlgs.cpp:1143 Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeylist.cpp:423 Src/wptKeylist.cpp:453 Src/wptKeyPropsDlg.cpp:157
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:215
msgid "Expired"
msgstr "Abgelaufen"
@@ -1937,43 +1943,43 @@
msgid "secret key"
msgstr "geheimer Schlüssel"
-#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:459
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1205
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
-#: 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/wptImportList.cpp:345 Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584
+#: Src/wptKeyManagerDlg.cpp:877 Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr "Benutzerkennung"
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587
+#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Größe"
-#: 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/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1077
+#: Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:585 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: 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
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1078
+#: Src/wptKeyEditDlgs.cpp:1174 Src/wptKeylist.cpp:591
+#: Src/wptKeyManagerDlg.cpp:884 Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Erstellung"
-#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
-#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:586
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:971
msgid "Type"
msgstr "Typ"
@@ -1987,7 +1993,7 @@
"und deshalb ein CRC Fehler auftrat."
# c:\oss\winpt-gpgme\src\wptKeyCache.cpp:479
-#: Src/wptKeyCache.cpp:747
+#: Src/wptKeyCache.cpp:748
msgid "Load GPG Keyrings..."
msgstr "Lade GPG Schlüsselbunde..."
@@ -2003,24 +2009,24 @@
msgid "Key Cache"
msgstr "Schlüsselcache"
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:388
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1140
#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1158
+#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1147
msgid "OK"
msgstr "OK"
-#: Src/wptKeyEditDlgs.cpp:281
+#: Src/wptKeyEditDlgs.cpp:282
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:283
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2030,7 +2036,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:355
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 "
@@ -2041,7 +2047,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:355
+#: Src/wptKeyEditDlgs.cpp:356
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2049,35 +2055,35 @@
"Bitte ein Bild auswählen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:358
+#: Src/wptKeyEditDlgs.cpp:359
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:373
+#: Src/wptKeyEditDlgs.cpp:374
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:377 Src/wptKeyEditDlgs.cpp:387
-#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:378 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:406
+#: Src/wptKeyEditDlgs.cpp:911
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:379
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyRevokeDlg.cpp:173
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:391
+#: Src/wptKeyEditDlgs.cpp:392
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2085,146 +2091,146 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:410
+#: Src/wptKeyEditDlgs.cpp:411
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: 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/wptKeyEditDlgs.cpp:412 Src/wptKeyEditDlgs.cpp:479
+#: Src/wptKeyEditDlgs.cpp:562 Src/wptKeyEditDlgs.cpp:736
+#: Src/wptKeyEditDlgs.cpp:1468 Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1824
+#: Src/wptKeygenDlg.cpp:488 Src/wptKeygenDlg.cpp:604
+#: Src/wptKeyPropsDlg.cpp:361 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:442
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
"Hinzufügen eines Widerrufers kann nicht mehr\n"
"rückgängig gemacht werden."
-#: Src/wptKeyEditDlgs.cpp:443
+#: Src/wptKeyEditDlgs.cpp:444
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
-#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:447 Src/wptKeyEditDlgs.cpp:460
+#: Src/wptKeyEditDlgs.cpp:473 Src/wptKeyEditDlgs.cpp:942
msgid "Add Revoker"
msgstr "Wiederrufer hinzufügen"
-#: 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
+#: Src/wptKeyEditDlgs.cpp:460 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1557 Src/wptKeyEditDlgs.cpp:1602
+#: Src/wptKeyEditDlgs.cpp:1756 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1980
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:478
msgid "Revoker successfully addded."
msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:512
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:514
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:515
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:533
+#: Src/wptKeyEditDlgs.cpp:531
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:534 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:562
+#: Src/wptKeyEditDlgs.cpp:532 Src/wptKeyEditDlgs.cpp:538
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:560
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:537
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:545
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:547
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:564
+#: Src/wptKeyEditDlgs.cpp:562
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:853
+#: Src/wptKeyEditDlgs.cpp:646 Src/wptKeyEditDlgs.cpp:849
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:647
msgid "Key type"
msgstr "Schlüssel-Typ"
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:648
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:649
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:695
msgid "Please select one entry."
msgstr "Bitte wählen Sie einen Eintrag aus."
-#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
-#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
+#: Src/wptKeyEditDlgs.cpp:696 Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:733 Src/wptKeyEditDlgs.cpp:832
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:704
+#: Src/wptKeyEditDlgs.cpp:701
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:739
+#: Src/wptKeyEditDlgs.cpp:735
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: 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
+#: Src/wptKeyEditDlgs.cpp:763 Src/wptKeyEditDlgs.cpp:831
+#: Src/wptKeyEditDlgs.cpp:910 Src/wptKeyEditDlgs.cpp:942
+#: Src/wptKeyEditDlgs.cpp:1022 Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1427 Src/wptKeyEditDlgs.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1553
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:786
+#: Src/wptKeyEditDlgs.cpp:764 Src/wptKeyEditDlgs.cpp:782
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:893
+#: Src/wptKeyEditDlgs.cpp:889
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:349
+#: Src/wptKeyEditDlgs.cpp:976 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:353
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
-#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyManager.cpp:220
msgid "Key status changed."
msgstr "Schlüsselstatus geändert."
-#: Src/wptKeyEditDlgs.cpp:1032
+#: Src/wptKeyEditDlgs.cpp:1028
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2232,15 +2238,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:1039
+#: Src/wptKeyEditDlgs.cpp:1035
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:1050 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1046 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2248,44 +2254,40 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:1062
+#: Src/wptKeyEditDlgs.cpp:1058
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1060
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:885
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1084
+#: Src/wptKeyEditDlgs.cpp:1079
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
-msgid "Could not find key."
-msgstr "Konnte Schlüssel nicht finden."
-
-#: Src/wptKeyEditDlgs.cpp:1105
+#: Src/wptKeyEditDlgs.cpp:1094
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
-#: Src/wptKeyManagerDlg.cpp:877
+#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:589
+#: Src/wptKeyManagerDlg.cpp:882
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1185
+#: Src/wptKeyEditDlgs.cpp:1173
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1181
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1280
+#: Src/wptKeyEditDlgs.cpp:1263
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2329,19 +2331,19 @@
"CLEAN \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
"MINIMIZE \t\tEntferne alle Signaturen vom Schlüssel\r\n"
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1285
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1301
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1326
+#: Src/wptKeyEditDlgs.cpp:1309
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1334
+#: Src/wptKeyEditDlgs.cpp:1317
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2358,15 +2360,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1329
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1333
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1364
msgid ""
"Key already expired.\n"
"\n"
@@ -2376,19 +2378,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1393
+#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1376
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1399
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1405
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1453
+#: Src/wptKeyEditDlgs.cpp:1436
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2400,31 +2402,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1462
+#: Src/wptKeyEditDlgs.cpp:1445
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1464
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1485
+#: Src/wptKeyEditDlgs.cpp:1468
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1512
+#: Src/wptKeyEditDlgs.cpp:1495
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:1506
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1512
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2434,47 +2436,47 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1553
+#: Src/wptKeyEditDlgs.cpp:1536
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1540
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1599
+#: Src/wptKeyEditDlgs.cpp:1582
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1639
+#: Src/wptKeyEditDlgs.cpp:1622
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1642
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1736
+#: Src/wptKeyEditDlgs.cpp:1719
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1723
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1742
+#: Src/wptKeyEditDlgs.cpp:1725
msgid "user ID:"
msgstr "Benutzerkennung:"
-#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1726 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1789
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1813
+#: Src/wptKeyEditDlgs.cpp:1800
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2489,27 +2491,27 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1833
+#: Src/wptKeyEditDlgs.cpp:1820
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1824
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
msgid "Finished to compact key."
msgstr "Schlüssel erfolgreich bearbeitet."
-#: Src/wptKeyEditDlgs.cpp:1997
+#: Src/wptKeyEditDlgs.cpp:1984
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:2084
+#: Src/wptKeyEditDlgs.cpp:2071
#, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
@@ -2527,28 +2529,28 @@
"erstellen wollen welches es erlaubt den gelisteten Schlüssel\n"
"zu widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2119
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2145
+#: Src/wptKeyEditDlgs.cpp:2132
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:2154
+#: Src/wptKeyEditDlgs.cpp:2141
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2157
+#: Src/wptKeyEditDlgs.cpp:2144
msgid "&Revoke..."
msgstr "Widerrufen..."
-#: Src/wptKeyEditDlgs.cpp:2189
+#: Src/wptKeyEditDlgs.cpp:2176
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2193
+#: Src/wptKeyEditDlgs.cpp:2180
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"
@@ -2587,8 +2589,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:935
-#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:1766 Src/wptKeyPropsDlg.cpp:293
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2610,8 +2612,8 @@
#: 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
+#: Src/wptKeygenDlg.cpp:485 Src/wptKeygenDlg.cpp:581
+#: Src/wptKeyManagerDlg.cpp:1633 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
@@ -2702,15 +2704,15 @@
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:558
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:563
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:429 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:570
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
@@ -2722,30 +2724,30 @@
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
+#: Src/wptKeygenDlg.cpp:488 Src/wptKeygenDlg.cpp:604
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:531
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:532
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:533
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:534
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:535
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"
@@ -2756,7 +2758,7 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:536
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -2767,17 +2769,17 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: 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
+#: Src/wptKeygenDlg.cpp:537 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:600
+#: Src/wptKeyManagerDlg.cpp:1656
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:539
msgid "E&xpert"
msgstr "E&xperte"
-#: Src/wptKeygenDlg.cpp:577
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2799,7 +2801,7 @@
#: Src/wptKeyImportStatusDlg.cpp:52
msgid "Revocation certificates"
-msgstr "\"Widerruf-Zertifikate\""
+msgstr "Widerruf-Zertifikate"
#: Src/wptKeyImportStatusDlg.cpp:53
msgid "No (valid) user ID"
@@ -2850,24 +2852,24 @@
msgstr "Marginal"
# c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:387
+#: Src/wptKeylist.cpp:386
msgid "Full"
msgstr "Voll"
-#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:451 Src/wptKeyPropsDlg.cpp:161
msgid "Disabled"
msgstr "Inaktiv"
-#: Src/wptKeylist.cpp:460
+#: Src/wptKeylist.cpp:461
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyManagerDlg.cpp:970
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeylist.cpp:590 Src/wptKeyManagerDlg.cpp:883
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Vertrauen"
@@ -3085,217 +3087,217 @@
msgid "3. Key is no longer used"
msgstr "3. Der Schlüssel wird nicht mehr benutzt"
-#: Src/wptKeyManagerDlg.cpp:449 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:454 Src/wptKeyManagerDlg.cpp:990
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
-#: Src/wptKeyManagerDlg.cpp:470
+#: Src/wptKeyManagerDlg.cpp:475
#, c-format
msgid "Default Key: %s"
msgstr "Standardschlüssel: %s"
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:477
#, c-format
msgid "Default Key: 0x%s"
msgstr "Standardschlüssel: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:493
+#: Src/wptKeyManagerDlg.cpp:498
#, c-format
msgid "%d secret keys"
msgstr "%d geheime Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:494
+#: Src/wptKeyManagerDlg.cpp:499
#, c-format
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:935
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
+#: Src/wptKeyManagerDlg.cpp:936 Src/wptKeyManagerDlg.cpp:1220
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:934
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:936
+#: Src/wptKeyManagerDlg.cpp:941
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:943
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:944
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:945
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:947
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:948
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
-#: Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:996
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:997
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:993
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
+#: Src/wptKeyManagerDlg.cpp:955 Src/wptKeyManagerDlg.cpp:1575
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:951
+#: Src/wptKeyManagerDlg.cpp:956
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:957
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeysigDlg.cpp:405
+#: Src/wptKeyManagerDlg.cpp:958 Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:957
+#: Src/wptKeyManagerDlg.cpp:962
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:963
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:964
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:965
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:961 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:985
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:988
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:989
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:991
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:999
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:1006
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Revoker..."
msgstr "Widerrufer..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyManagerDlg.cpp:1012
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:1013
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:1014
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1189
+#: Src/wptKeyManagerDlg.cpp:1193
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3303,90 +3305,98 @@
"Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
"Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
-#: Src/wptKeyManagerDlg.cpp:1200
+#: Src/wptKeyManagerDlg.cpp:1204
msgid "Could not set keylist window procedure."
msgstr "Konnte \"keylist window procedure\" nicht setzen."
+#: Src/wptKeyManagerDlg.cpp:1221
+msgid "&Show"
+msgstr "&Anzeigen"
+
+#: Src/wptKeyManagerDlg.cpp:1222
+msgid "&New..."
+msgstr "&Neu..."
+
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1327
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1331
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1335
msgid "Delete key from keyring"
msgstr "Schlüssel aus Keyring löschen"
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1339
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1334
+#: Src/wptKeyManagerDlg.cpp:1343
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1347
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1351
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1346
+#: Src/wptKeyManagerDlg.cpp:1355
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1359
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1486
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1498
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeysignDlg.cpp:258
+#: Src/wptKeyManagerDlg.cpp:1529 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:1536
+#: Src/wptKeyManagerDlg.cpp:1545
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1550 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1559 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:1560
+#: Src/wptKeyManagerDlg.cpp:1569
msgid "It does not make any sense with a key pair!"
msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
-#: Src/wptKeyManagerDlg.cpp:1577
+#: Src/wptKeyManagerDlg.cpp:1586
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyPropsDlg.cpp:289
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1602
+#: Src/wptKeyManagerDlg.cpp:1611
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3395,27 +3405,27 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1632
+#: Src/wptKeyManagerDlg.cpp:1641
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1655 Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1664 Src/wptKeyserverDlg.cpp:568
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
-#: Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1681
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
-#: Src/wptKeyManagerDlg.cpp:1714
+#: Src/wptKeyManagerDlg.cpp:1723
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:1719
+#: Src/wptKeyManagerDlg.cpp:1728
msgid "You can only export one secret key."
msgstr "Sie können nur einen geheimen Schlüssel exportieren."
-#: Src/wptKeyManagerDlg.cpp:1724
+#: Src/wptKeyManagerDlg.cpp:1733
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3433,14 +3443,18 @@
"\n"
"Wirklich den Schlüssel exportieren?"
-#: Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1738
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1790
+#: Src/wptKeyManagerDlg.cpp:1799
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
+#: Src/wptKeyManagerDlg.cpp:1804
+msgid "Keyserver refresh finished."
+msgstr "Erneuerung von Keyserver abgeschlossen."
+
#: Src/wptKeyPropsDlg.cpp:67
msgid "I trust ultimately (implicit)"
msgstr "(Implizites) Absolutes Vertrauen"
@@ -3450,17 +3464,17 @@
msgid "Unknown"
msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:213
+#: Src/wptKeyPropsDlg.cpp:208
#, c-format
msgid "Card-Type: %s\r\n"
msgstr "Karten-Typ: %s\r\n"
# c:\oss\winpt-gpgme\src\wptKeyPropsDlg.cpp:214
-#: Src/wptKeyPropsDlg.cpp:240
+#: Src/wptKeyPropsDlg.cpp:247
#, c-format
msgid ""
"Type: %s\r\n"
-"Key ID: %s\r\n"
+"Key ID: 0x%s\r\n"
"Algorithm: %s\r\n"
"Size: %s bits\r\n"
"Created: %s\r\n"
@@ -3470,7 +3484,7 @@
"%s\r\n"
msgstr ""
"Type: %s\r\n"
-"Key ID: %s\r\n"
+"Key ID: 0x%s\r\n"
"Algorithmus: %s\r\n"
"Größe: %s Bits\r\n"
"Erstellt: %s\r\n"
@@ -3479,25 +3493,25 @@
"Cipher: %s\r\n"
"%s\r\n"
-#: Src/wptKeyPropsDlg.cpp:286
+#: Src/wptKeyPropsDlg.cpp:290
msgid "&Change"
msgstr "&Ändern"
-#: Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyPropsDlg.cpp:291
msgid "&Revokers"
-msgstr "\"&Widerrufer\""
+msgstr "&Widerrufer"
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Change &Password"
msgstr "&Passwort ändern"
-#: Src/wptKeyPropsDlg.cpp:295
+#: Src/wptKeyPropsDlg.cpp:299
msgid "Photo-ID not validated."
msgstr "Foto-ID nicht geprüft."
# msgid "Unknown"
# msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:333
+#: Src/wptKeyPropsDlg.cpp:337
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -3505,11 +3519,11 @@
"Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
"Sie können das Vertrauen in solche Schlüssel nicht ändern."
-#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
+#: Src/wptKeyPropsDlg.cpp:339 Src/wptKeyPropsDlg.cpp:346
msgid "WinPT Warning"
msgstr "WinPT Warnung"
-#: Src/wptKeyPropsDlg.cpp:339
+#: Src/wptKeyPropsDlg.cpp:343
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3520,11 +3534,11 @@
"Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
"Trotzdem fortfahren?"
-#: Src/wptKeyPropsDlg.cpp:356
+#: Src/wptKeyPropsDlg.cpp:360
msgid "Ownertrust successfully changed."
msgstr "Besitzervertrauen erfolgreich geändert."
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyPropsDlg.cpp:373 Src/wptKeyRevokersDlg.cpp:162
msgid "Key Revokers"
msgstr "Schlüsselwiderrufer"
@@ -3568,7 +3582,7 @@
msgid "Revocation certificate generated."
msgstr "Widerrufzertifikat wurde erstellt."
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:59
msgid "Algorithm"
msgstr "Algorithmus"
@@ -3582,31 +3596,42 @@
#: Src/wptKeyRevokersDlg.cpp:176
#, c-format
-msgid "Do you want to retrieve 0x%s via the default keyserver?"
+msgid "Do you want to retrieve %s via the default keyserver?"
msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
-#: Src/wptKeyserver.cpp:346
-msgid "The network subsystem has failed"
-msgstr "Das Netzwerk gab einen Fehler zurück"
+#: Src/wptKeyserver.cpp:363
+msgid "Network unreachable"
+msgstr "Netzwerk unerreichbar"
-#: Src/wptKeyserver.cpp:348
-msgid "Authoritative Answer Host not found"
-msgstr "Authorisierter Rechner wurde nicht gefunden"
+#: Src/wptKeyserver.cpp:366
+msgid "Host unreachable"
+msgstr "Rechner unerreichbar"
-#: Src/wptKeyserver.cpp:350
-msgid "The connection has been dropped because of a network failure"
-msgstr "Die Verbindung wurde aufgrund einen Netzwerkfehlers beendet"
+#: Src/wptKeyserver.cpp:369
+msgid "Could not resolve host name"
+msgstr "Konnte Rechnernamen nicht auflösen"
-#: Src/wptKeyserver.cpp:352
-#, c-format
-msgid "Unknown Winsock error ec=%d"
-msgstr "Unbekannter Winsock-Fehler ec=%d"
+#: Src/wptKeyserver.cpp:372
+msgid "Connection refused"
+msgstr "Verbindung abgelehnt"
-#: Src/wptKeyserver.cpp:540
+#: Src/wptKeyserver.cpp:376
+msgid "Connection timeout"
+msgstr "Verbindung Time-Out"
+
+#: Src/wptKeyserver.cpp:380
+msgid "Connection resetted by peer"
+msgstr "Verbindung wurde zurückgesetzt"
+
+#: Src/wptKeyserver.cpp:383
+msgid "Socket has been shutdown"
+msgstr "Socket wurde runtergefahren"
+
+#: Src/wptKeyserver.cpp:572
msgid "Could not save keyserver.conf file"
msgstr "Konnte keyserver.conf Datei nicht speichern"
-#: Src/wptKeyserver.cpp:585
+#: Src/wptKeyserver.cpp:617
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -3614,11 +3639,11 @@
"Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
"Passwort setzen, um Proxy-Authentifizierung nutzen zu können!"
-#: Src/wptKeyserver.cpp:588
+#: Src/wptKeyserver.cpp:620
msgid "Proxy Error"
msgstr "Proxyfehler"
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:644
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3626,25 +3651,25 @@
"Alle Eintraäge in dieser Datei müssen über einen gültigen Präfix verfügen.\n"
"Aktuell werden HKP/HTTP, LDAP and FINGER unterstützt.\n"
-#: Src/wptKeyserver.cpp:616
+#: Src/wptKeyserver.cpp:646
msgid "Keyserver Error"
msgstr "Schlüsselserver-Fehler"
# c:\oss\winpt-gpgme\src\wptKeyserver.cpp:548
-#: Src/wptKeyserver.cpp:640
+#: Src/wptKeyserver.cpp:670
msgid "The keyserver limit is exceeded"
msgstr "Das Limit der Keyserver wurde erreicht"
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:671
msgid "Keyserver Warning"
msgstr "Keyserver Warnung"
-#: Src/wptKeyserverDlg.cpp:100
+#: Src/wptKeyserverDlg.cpp:101
#, c-format
msgid "Key '%s' successfully sent"
msgstr "Schlüssel '%s' erfolgreich versendet"
-#: Src/wptKeyserverDlg.cpp:134
+#: Src/wptKeyserverDlg.cpp:135
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -3652,19 +3677,19 @@
"WARNUNG: Mehrere Schlüssel wurden gefunden.\n"
"\n"
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:140
msgid "Key(s) successfully received but nothing was changed."
msgstr "Schlüssel erfolgreich empfangen, aber keine Änderungen durchgeführt."
-#: Src/wptKeyserverDlg.cpp:141
+#: Src/wptKeyserverDlg.cpp:142
msgid "Key(s) sucessfully received and imported."
msgstr "Schlüssel erfolgreich empfangen und importiert."
-#: Src/wptKeyserverDlg.cpp:157
+#: Src/wptKeyserverDlg.cpp:158
msgid "Imported Keys"
msgstr "Importierte Schlüssel"
-#: Src/wptKeyserverDlg.cpp:187
+#: Src/wptKeyserverDlg.cpp:184
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3674,110 +3699,110 @@
"Bitte stellen Sie sicher, dass Sie eine Internetverbindung hergestellt haben "
"und gpgkeys_ldap.exe installiert ist."
-#: Src/wptKeyserverDlg.cpp:199
+#: Src/wptKeyserverDlg.cpp:196
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "Finger Schlüsselimport fehlgeschlagen: %s\n"
-#: Src/wptKeyserverDlg.cpp:213
+#: Src/wptKeyserverDlg.cpp:210
msgid "This is not a valid OpenPGP key."
msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
-#: Src/wptKeyserverDlg.cpp:368
+#: Src/wptKeyserverDlg.cpp:352
msgid "Please select one of the servers."
msgstr "Bitte einen der Server auswählen."
-#: Src/wptKeyserverDlg.cpp:373
+#: Src/wptKeyserverDlg.cpp:357
msgid "Only HTTP keyserver can be used."
msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
-#: Src/wptKeyserverDlg.cpp:390
+#: Src/wptKeyserverDlg.cpp:374
msgid "DNS Name"
msgstr "DNS Name"
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:375
msgid "Port"
msgstr "Port"
-#: Src/wptKeyserverDlg.cpp:475
+#: Src/wptKeyserverDlg.cpp:459
msgid "No space for new keyserver entry"
msgstr "Kein Platz für neuen Keserver-Eintrag"
-#: Src/wptKeyserverDlg.cpp:496
+#: Src/wptKeyserverDlg.cpp:480
msgid "HKP Keyserver"
msgstr "HKP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:481
msgid "LDAP Keyserver"
msgstr "LDAP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:482
msgid "Finger Keyserver"
msgstr "Finger-Keyserver"
-#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:737
-#: Src/wptKeyserverDlg.cpp:757
+#: Src/wptKeyserverDlg.cpp:507 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:741
msgid "Edit Keyserver"
msgstr "Editiere Keyserver"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:508 Src/wptKeyserverDlg.cpp:600
msgid "&Add"
msgstr "&Hinzufügen"
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:510
msgid "Type:"
msgstr "Typ:"
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:511
msgid "Port:"
msgstr "Port:"
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:512
msgid "Host name:"
msgstr "Rechnername:"
-#: Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:520
msgid "Please enter a host name"
msgstr "Bitte einen Rechnernamen eingeben."
-#: Src/wptKeyserverDlg.cpp:541
+#: Src/wptKeyserverDlg.cpp:525
msgid "Invalid port, valid numbers are < 65535"
msgstr "Ungültiger Port, gültige Nummern sind < 65535"
-#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:569 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "&Empfangen"
-#: Src/wptKeyserverDlg.cpp:587
+#: Src/wptKeyserverDlg.cpp:571
msgid "Send key (default is receiving)"
msgstr "Schlüssel senden (sonst empfangen)"
-#: Src/wptKeyserverDlg.cpp:589
+#: Src/wptKeyserverDlg.cpp:573
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:590
+#: Src/wptKeyserverDlg.cpp:574
msgid "&Search"
msgstr "&Suchen"
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:575
msgid "C&hange proxy"
msgstr "Proxy Ä&ndern"
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:576
msgid "Set &default"
msgstr "Als &Standard"
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:601
msgid "&Remove"
msgstr "&Entfernen"
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:602
msgid "&Edit"
msgstr "&Edtieren"
-#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:628 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
@@ -3785,27 +3810,27 @@
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:635 Src/wptKeyserverDlg.cpp:666
msgid "Please select one of the keyservers."
msgstr "Bitte einen Keyserver auswählen."
-#: Src/wptKeyserverDlg.cpp:659
+#: Src/wptKeyserverDlg.cpp:643
msgid "This is not implemented yet!"
msgstr "Das ist noch nicht implementiert!"
-#: Src/wptKeyserverDlg.cpp:666 Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:650 Src/wptKeyserverDlg.cpp:682
msgid "Please enter the search pattern."
msgstr "Bitte Suchmuster eingeben."
-#: Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:687
msgid "Only keyids are allowed."
msgstr "Nur Schlüssel-IDs zulässig"
-#: Src/wptKeyserverDlg.cpp:709
+#: Src/wptKeyserverDlg.cpp:693
msgid "Only enter the name of the user."
msgstr "Nur den Namen des Benutzers eingeben."
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:699
msgid "Only email addresses or keyids are allowed."
msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
@@ -3846,21 +3871,21 @@
msgid "%s %s signature"
msgstr "%s %s Signatur"
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:216
msgid "Signature Properties"
msgstr "Signatureigenschaften"
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:212
msgid "Exportable"
msgstr "Exportierbar"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:183
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
+#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:213
msgid "Non-revocably"
msgstr "Nicht widerrufbar"
# c:\oss\winpt-gpgme\src\wptSigList.cpp:49
-#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
+#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:55
msgid "Class"
msgstr "Klasse"
@@ -3884,43 +3909,48 @@
msgid "Non-exportable"
msgstr "Nicht-exportierbar"
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
+#: Src/wptKeysigDlg.cpp:178 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr " Benutzerkennung nicht gefunden"
-#: Src/wptKeysigDlg.cpp:288
+#: Src/wptKeysigDlg.cpp:313
msgid "Really receive all missing keys?"
msgstr "Alle fehlenden Schlüssel empfangen?"
-#: Src/wptKeysigDlg.cpp:322 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:347 Src/wptSigTreeDlg.cpp:111
msgid "Signature &Properties"
msgstr "Signatur-&Eigenschaften"
-#: Src/wptKeysigDlg.cpp:323
+#: Src/wptKeysigDlg.cpp:348
msgid "Signing &Key Properties"
msgstr "Signing Key-Eigenschaften"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:294
-#: Src/wptKeysigDlg.cpp:362
+#: Src/wptKeysigDlg.cpp:387
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:372
+#: Src/wptKeysigDlg.cpp:397
msgid "Key not found in keyring."
msgstr "Schlüssel im Keyring nicht gefunden."
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeysigDlg.cpp:424
#, c-format
msgid "Signature List for \"%s\""
msgstr "Signaturliste für \"%s\""
-#: Src/wptKeysigDlg.cpp:404
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
+#: Src/wptKeysignDlg.cpp:72
+#, c-format
+msgid "%d-bit %s key, ID 0x%s"
+msgstr "%d-bit %s Schlüssel, ID 0x%s"
+
#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
msgid "Choose Signature Class"
msgstr "Signaturklasse auswählen"
@@ -4084,8 +4114,8 @@
#: Src/wptMainProc.cpp:505
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
-"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden. WinPT "
-"beenden?"
+"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
+"WinPT beenden?"
#: Src/wptMainProc.cpp:538
#, c-format
@@ -4469,20 +4499,20 @@
msgid "Could not write to Registry."
msgstr "Konnte Werte in der Registrierung nicht speichern."
-#: Src/wptSigList.cpp:53
+#: Src/wptSigList.cpp:54
msgid "Valid"
msgstr "Gültig"
-#: Src/wptSigList.cpp:57
+#: Src/wptSigList.cpp:58
msgid "Expiration"
msgstr "Ablauf"
-#: Src/wptSigTreeDlg.cpp:164
+#: Src/wptSigTreeDlg.cpp:159
#, c-format
msgid "Signature Tree for \"%s\" (0x%s)"
msgstr "Signaturliste für \"%s\" (0x%s)"
-#: Src/wptSigTreeDlg.cpp:166
+#: Src/wptSigTreeDlg.cpp:161
msgid "Edit..."
msgstr "Edit..."
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Po/fr.po 2006-05-07 12:36:48 UTC (rev 211)
@@ -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-29 19:32+0200\n"
+"POT-Creation-Date: 2006-05-07 13:41+0200\n"
"PO-Revision-Date: 2006-03-04 21:32+0100\n"
"Last-Translator: Pascal Brochart <pbrochart at tuxfamily.org>\n"
"Language-Team: FR <winpt-dev at wald.intevation.org>\n"
@@ -15,66 +15,66 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Src/WinPT.cpp:183
+#: Src/WinPT.cpp:188
msgid "Could not create GPG home directory"
msgstr "Ne peut créer le répertoire personnel GPG"
-#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
-#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
-#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
-#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
+#: Src/WinPT.cpp:189 Src/WinPT.cpp:221 Src/WinPT.cpp:271 Src/WinPT.cpp:275
+#: Src/WinPT.cpp:471 Src/WinPT.cpp:478 Src/WinPT.cpp:519 Src/WinPT.cpp:547
+#: Src/WinPT.cpp:556 Src/WinPT.cpp:560 Src/WinPT.cpp:577 Src/WinPT.cpp:645
+#: Src/WinPT.cpp:658 Src/WinPT.cpp:705 Src/WinPT.cpp:735 Src/WinPT.cpp:753
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
#: Src/wptGPG.cpp:915 Src/wptGPG.cpp:925 Src/wptGPG.cpp:936
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "Erreur WinPT"
-#: Src/WinPT.cpp:215
+#: Src/WinPT.cpp:220
msgid "No useable secret key found."
msgstr "Aucune clé secrète utilisable n'a été trouvée"
-#: Src/WinPT.cpp:265
+#: Src/WinPT.cpp:270
msgid "Could not read GnuPG version."
msgstr "Ne peut lire la version de GNuPG"
-#: Src/WinPT.cpp:271
+#: Src/WinPT.cpp:276
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
"GPG version %d.%d.%d required GPG version "
msgstr ""
-#: Src/WinPT.cpp:299
+#: Src/WinPT.cpp:304
msgid "Failed to create WinPT directory"
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: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: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
+#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptKeyserver.cpp:573
+#: Src/wptKeyserverDlg.cpp:68 Src/wptKeyserverDlg.cpp:70
+#: Src/wptKeyserverDlg.cpp:187 Src/wptKeyserverDlg.cpp:195
+#: Src/wptKeyserverDlg.cpp:211 Src/wptKeyserverDlg.cpp:352
+#: Src/wptKeyserverDlg.cpp:358 Src/wptKeyserverDlg.cpp:460
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:636 Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:700
msgid "Keyserver"
msgstr "Serveur de clé"
-#: Src/WinPT.cpp:316
+#: Src/WinPT.cpp:321
msgid "Failed to copy the keyserver.conf"
msgstr "Impossible de copier keyserver.conf"
-#: Src/WinPT.cpp:463
+#: Src/WinPT.cpp:470
msgid "Cryptographic selftest failed."
msgstr ""
-#: Src/WinPT.cpp:470
+#: Src/WinPT.cpp:477
msgid "A newer GPGME version is needed; at least "
msgstr ""
-#: Src/WinPT.cpp:512
+#: Src/WinPT.cpp:520
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -82,21 +82,21 @@
"%s."
msgstr ""
-#: Src/WinPT.cpp:516
+#: Src/WinPT.cpp:524
msgid "Select GPG Public Keyring"
msgstr ""
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:546
msgid "GPG home directory could not be determited."
msgstr "Le répertoire personnel de GPG ne peut-être déterminé."
-#: Src/WinPT.cpp:546
+#: Src/WinPT.cpp:554
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
msgstr ""
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:569
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
@@ -104,32 +104,32 @@
"Continue if you want that WinPT offers you more choices.\n"
msgstr ""
-#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:814
+#: Src/WinPT.cpp:602 Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:818
msgid "Wipe Free Space"
msgstr ""
-#: Src/WinPT.cpp:636
+#: Src/WinPT.cpp:644
msgid "Could not register window class"
msgstr ""
-#: Src/WinPT.cpp:650
+#: Src/WinPT.cpp:658
msgid "Could not create window"
msgstr "Ne peut créer une fenêtre"
-#: Src/WinPT.cpp:725
+#: Src/WinPT.cpp:733
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
msgstr ""
-#: Src/WinPT.cpp:728
+#: Src/WinPT.cpp:736
msgid ""
"It seems that GPG is not set properly.\n"
"Do you want to start the GPG preferences dialog?"
msgstr ""
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:754
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -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:1741
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1750
#: 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:2156
-#: Src/wptKeyManagerDlg.cpp:962
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2143
+#: Src/wptKeyManagerDlg.cpp:967
msgid "&Help"
msgstr "&Aide"
@@ -270,7 +270,7 @@
"Still proceed?"
msgstr ""
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:515
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:513
msgid "&Name"
msgstr "&Nom"
@@ -286,7 +286,7 @@
msgid "Off-card passphrase"
msgstr ""
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:650 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Jamais"
@@ -302,7 +302,7 @@
msgid "Make off-card backup of encryption key"
msgstr ""
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1637
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1646
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:1397
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1380
msgid "The date you have chosen lies in the past."
msgstr ""
@@ -386,21 +386,21 @@
"Press OK to continue or Cancel"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
-#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
-#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
+#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:187
+#: Src/wptFileManager.cpp:1228 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:1304
-#: Src/wptFileManager.cpp:1351
+#: Src/wptClipDecryptDlg.cpp:116 Src/wptClipDecryptDlg.cpp:129
+#: Src/wptClipDecryptDlg.cpp:137 Src/wptClipDecryptDlg.cpp:144
+#: Src/wptClipDecryptDlg.cpp:146 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
msgid "Decryption"
msgstr "Déchiffrement"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
+#: Src/wptClipDecryptDlg.cpp:130 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -409,16 +409,16 @@
"Chiffré avec la clé %s, ID %s.%s\n"
"Le déchiffrement a échoué: La clé secrète n'est pas disponible."
-#: Src/wptClipDecryptDlg.cpp:140
+#: Src/wptClipDecryptDlg.cpp:137
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "L'algorithme n'est pas supporté: %s"
-#: Src/wptClipDecryptDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:143
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:154
+#: Src/wptClipDecryptDlg.cpp:151
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -427,38 +427,38 @@
"but it might be also possible that this is part of an attack."
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:159
+#: Src/wptClipDecryptDlg.cpp:156
msgid "*** IMPORTANT ***"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipDecryptDlg.cpp:159 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
#: 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:177
+#: Src/wptClipDecryptDlg.cpp:174
msgid "Signature Status: Created with a fully trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:179
+#: Src/wptClipDecryptDlg.cpp:176
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:182
+#: Src/wptClipDecryptDlg.cpp:179
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:185
+#: Src/wptClipDecryptDlg.cpp:182
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:192
+#: Src/wptClipDecryptDlg.cpp:189
msgid "WinPT Verify"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:193
+#: Src/wptClipDecryptDlg.cpp:190
#, c-format
msgid ""
"%s\n"
@@ -470,13 +470,13 @@
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
-#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:211
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
msgstr "Presse papiers"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:568
msgid "File Open"
msgstr ""
@@ -524,8 +524,8 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
-#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2142
+#: Src/wptKeyserverDlg.cpp:577 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fermer"
@@ -546,15 +546,15 @@
msgstr "&Chercher"
#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
-#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
-#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
+#: Src/wptFileManagerDlg.cpp:83 Src/wptFileManagerDlg.cpp:217
+#: Src/wptFileManagerDlg.cpp:286 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:516 Src/wptKeyEditDlgs.cpp:651
#: 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/wptKeygenDlg.cpp:538 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:509 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
@@ -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:1082
-#: Src/wptFileManager.cpp:1098 Src/wptFileManager.cpp:1408
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1080
+#: Src/wptFileManager.cpp:1096 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signer"
@@ -634,8 +634,8 @@
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
#: 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/wptFileManager.cpp:1584 Src/wptFileManager.cpp:1637
+#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -670,75 +670,74 @@
msgid "Save Plaintext"
msgstr ""
-#: Src/wptCommonDlg.cpp:86
+#: Src/wptCommonDlg.cpp:85
msgid "Please enter a valid URL."
msgstr "Entrez une URL valide."
-#: Src/wptCommonDlg.cpp:116
+#: Src/wptCommonDlg.cpp:115
msgid "HTTP Key Import"
msgstr ""
-#: Src/wptCommonDlg.cpp:117
+#: Src/wptCommonDlg.cpp:116
msgid "Enter URL to retrieve the public key"
msgstr ""
-#: 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
+#: Src/wptCommonDlg.cpp:134 Src/wptKeyEditDlgs.cpp:769
+#: Src/wptKeyEditDlgs.cpp:836 Src/wptKeyEditDlgs.cpp:876
+#: Src/wptKeyEditDlgs.cpp:889 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:917 Src/wptKeyEditDlgs.cpp:947
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1030 Src/wptKeyEditDlgs.cpp:1048
+#: Src/wptKeyEditDlgs.cpp:1094 Src/wptKeyEditDlgs.cpp:1181
+#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1309 Src/wptKeyEditDlgs.cpp:1316
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1366 Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1385 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1514
+#: Src/wptKeyEditDlgs.cpp:1517 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1565 Src/wptKeyEditDlgs.cpp:1582
+#: Src/wptKeyEditDlgs.cpp:1602 Src/wptKeyEditDlgs.cpp:1610
+#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1805 Src/wptKeyEditDlgs.cpp:1927
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1945
+#: Src/wptKeyEditDlgs.cpp:1947 Src/wptKeyEditDlgs.cpp:1980
+#: Src/wptKeyEditDlgs.cpp:1985 Src/wptKeyEditDlgs.cpp:1994
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeyEditDlgs.cpp:2012
+#: Src/wptKeyEditDlgs.cpp:2079 Src/wptKeyEditDlgs.cpp:2120
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2147
+#: Src/wptKeyEditDlgs.cpp:2176 Src/wptKeyEditDlgs.cpp:2181
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1774
msgid "Key Edit"
msgstr ""
-#: Src/wptCommonDlg.cpp:136
+#: Src/wptCommonDlg.cpp:135
msgid "Enter preferred keyserver URL"
msgstr ""
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:334
msgid "Choose Locale Directory"
msgstr ""
-#: Src/wptCommonDlg.cpp:220
+#: Src/wptCommonDlg.cpp:219
#, fuzzy
msgid "Could not create winpt.mo file"
msgstr "Ne peut créer une fenêtre"
-#: Src/wptCommonDlg.cpp:251
+#: Src/wptCommonDlg.cpp:250
msgid "Native Language Support"
msgstr ""
-#: Src/wptCommonDlg.cpp:252
+#: Src/wptCommonDlg.cpp:251
#, fuzzy
msgid "Please select a language"
msgstr "Sélectionner un fichier."
-#: Src/wptCommonDlg.cpp:253
+#: Src/wptCommonDlg.cpp:252
msgid "&OK"
msgstr ""
@@ -921,12 +920,13 @@
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: 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
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:662
+#: Src/wptFileManager.cpp:807 Src/wptFileManager.cpp:922
+#: Src/wptFileManager.cpp:1491 Src/wptFileManager.cpp:1518
+#: Src/wptFileManager.cpp:1537 Src/wptFileManager.cpp:1788
+#: Src/wptFileManager.cpp:1850 Src/wptFileManagerDlg.cpp:503
+#: Src/wptFileManagerDlg.cpp:622 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "Gestionnaire de fichier"
@@ -949,12 +949,12 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1085
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1080
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1184
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1172
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
@@ -964,64 +964,64 @@
msgid "Operation"
msgstr "Opération"
-#: Src/wptFileManager.cpp:663
+#: Src/wptFileManager.cpp:661
msgid "Please select a file."
msgstr "Sélectionner un fichier."
-#: Src/wptFileManager.cpp:810
+#: Src/wptFileManager.cpp:808
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
"Do you really want to clearsign it?"
msgstr ""
-#: Src/wptFileManager.cpp:925
+#: Src/wptFileManager.cpp:923
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" n'existe pas"
-#: Src/wptFileManager.cpp:1008 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1006 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Status du fichier"
-#: Src/wptFileManager.cpp:1052
+#: Src/wptFileManager.cpp:1050
msgid "Enter filename for encrypted file"
msgstr ""
-#: Src/wptFileManager.cpp:1081
+#: Src/wptFileManager.cpp:1079
msgid "Could not get default secret key."
msgstr "Ne peut obtenir la clé secrète par défaut."
-#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
-#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1110 Src/wptFileManager.cpp:1442
+#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signer"
-#: Src/wptFileManager.cpp:1125 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1123 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Chiffrer"
-#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
-#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1150 Src/wptFileManager.cpp:1183
+#: Src/wptFileManager.cpp:1188 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symétrique"
-#: Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1188
msgid "Encryption failed."
msgstr "Erreur de chiffrement."
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1218
msgid "Good signature"
msgstr "Bonne signature"
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1218
msgid "BAD signature"
msgstr "MAUVAISE signature"
-#: Src/wptFileManager.cpp:1231
+#: Src/wptFileManager.cpp:1229
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1029,31 +1029,31 @@
"%s"
msgstr ""
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1234
msgid "Decrypt Verify"
msgstr ""
-#: Src/wptFileManager.cpp:1313
+#: Src/wptFileManager.cpp:1311
msgid "Choose Filename for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1322
+#: Src/wptFileManager.cpp:1320
msgid "Please enter filename for plaintext file"
msgstr ""
-#: Src/wptFileManager.cpp:1360 Src/wptFileManager.cpp:1372
-#: Src/wptFileManagerDlg.cpp:555
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "Déchiffrer"
-#: Src/wptFileManager.cpp:1366
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
"%s: does not exist."
msgstr ""
-#: Src/wptFileManager.cpp:1373
+#: Src/wptFileManager.cpp:1371
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1061,40 +1061,40 @@
"Do you want to use this instead of '%s'?"
msgstr ""
-#: Src/wptFileManager.cpp:1421
+#: Src/wptFileManager.cpp:1419
msgid "Enter filename for signed file"
msgstr ""
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1517
msgid "Could not find detached signature in the clipboard."
msgstr ""
-#: Src/wptFileManager.cpp:1539
+#: Src/wptFileManager.cpp:1537
msgid "No files to check."
msgstr "Aucun fichiers à vérifier."
-#: Src/wptFileManager.cpp:1556
+#: Src/wptFileManager.cpp:1554
msgid "Select Data File"
msgstr ""
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1556
msgid "Selected Output File"
msgstr ""
-#: Src/wptFileManager.cpp:1586
+#: Src/wptFileManager.cpp:1584
msgid "Invalid file name. Exit"
msgstr ""
-#: Src/wptFileManager.cpp:1684 Src/wptFileManager.cpp:1695
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
+#: Src/wptFileManager.cpp:1682 Src/wptFileManager.cpp:1693
+#: Src/wptFileManagerDlg.cpp:243 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
+#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:219
msgid "Import"
msgstr "Importer"
-#: Src/wptFileManager.cpp:1692
+#: Src/wptFileManager.cpp:1690
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1102,106 +1102,111 @@
"Cannot import these key(s)!"
msgstr ""
-#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
+#: Src/wptFileManager.cpp:1716 Src/wptKeyManager.cpp:264
#: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
msgid "No key was selected for export."
msgstr ""
-#: Src/wptFileManager.cpp:1718 Src/wptFileManager.cpp:1741
-#: Src/wptKeyserverDlg.cpp:89
+#: Src/wptFileManager.cpp:1716 Src/wptFileManager.cpp:1739
+#: Src/wptKeyserverDlg.cpp:90
msgid "Export"
msgstr "Exporter"
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
-#: Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptFileManager.cpp:1724 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1742
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
-#: Src/wptKeyserverDlg.cpp:101
+#: Src/wptFileManager.cpp:1743 Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1333 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyserverDlg.cpp:102
msgid "GnuPG status"
msgstr "Status de GnuPG"
-#: Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1743
#, c-format
msgid "Finished (Output: %s)"
msgstr ""
-#: Src/wptFileManager.cpp:1791
+#: Src/wptFileManager.cpp:1789
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManager.cpp:1851
+#: Src/wptFileManager.cpp:1849
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr ""
-#: Src/wptFileManager.cpp:1856
+#: Src/wptFileManager.cpp:1854
msgid "Choose File Name for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1926
+#: Src/wptFileManager.cpp:1924
msgid "Choose a Name for the Archive"
msgstr ""
-#: Src/wptFileManager.cpp:1929
+#: Src/wptFileManager.cpp:1927
msgid "Invalid archive name. Exit."
msgstr ""
-#: Src/wptFileManager.cpp:1929 Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1927 Src/wptFileManager.cpp:1934
msgid "Encrypt Directory"
msgstr ""
-#: Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1934
msgid "Could not create zip archive."
msgstr ""
-#: Src/wptFileManagerDlg.cpp:79 Src/wptFileManagerDlg.cpp:146
+#: Src/wptFileManagerDlg.cpp:77 Src/wptFileManagerDlg.cpp:145
msgid "File Encrypt"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:80 Src/wptFileManagerDlg.cpp:281
+#: Src/wptFileManagerDlg.cpp:78 Src/wptFileManagerDlg.cpp:280
msgid "&Text Output"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:81
+#: Src/wptFileManagerDlg.cpp:79
msgid "&Wipe Original"
msgstr "&Algorithme original"
-#: Src/wptFileManagerDlg.cpp:82
+#: Src/wptFileManagerDlg.cpp:80
msgid "Anonymize (throw keyid)"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:83
+#: Src/wptFileManagerDlg.cpp:81
msgid "&Select Key for signing"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:145
+#: Src/wptFileManagerDlg.cpp:82 Src/wptFileManagerDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:959
+msgid "Options"
+msgstr ""
+
+#: Src/wptFileManagerDlg.cpp:144
msgid "Please select at least one recipient."
msgstr ""
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
+#: Src/wptFileManagerDlg.cpp:202 Src/wptFileStatDlg.cpp:281
#: Src/wptKeyManager.cpp:424
msgid "No valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
+#: Src/wptFileManagerDlg.cpp:202 Src/wptFileManagerDlg.cpp:216
#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:208
+#: Src/wptFileManagerDlg.cpp:207
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr ""
-#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:211 Src/wptFileManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:932 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Fichier"
-#: Src/wptFileManagerDlg.cpp:241
+#: Src/wptFileManagerDlg.cpp:240
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1209,174 +1214,174 @@
"set manually via the Key Properties dialog."
msgstr ""
-#: Src/wptFileManagerDlg.cpp:280 Src/wptFileManagerDlg.cpp:332
+#: Src/wptFileManagerDlg.cpp:279 Src/wptFileManagerDlg.cpp:331
msgid "File Sign"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:281
msgid "&Normal Signature"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:282
msgid "&Detached Signature"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Cleartext Signature"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:284
msgid "Signature mode"
msgstr "Mode de signature"
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
-msgid "Options"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
-#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1432
#: 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/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1520
+#: Src/wptKeyManagerDlg.cpp:1536 Src/wptKeyManagerDlg.cpp:1564
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1719
#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "Sélectionner une clé."
-#: Src/wptFileManagerDlg.cpp:392
+#: Src/wptFileManagerDlg.cpp:391
msgid "0 Objects marked"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:396
+#: Src/wptFileManagerDlg.cpp:395
#, c-format
msgid "%d Object(s) marked"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:550
msgid "File Manager (use drag & drop to add files)"
msgstr "Gestionnaire de fichier (utilisez le drag & drop)"
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptFileManagerDlg.cpp:473 Src/wptKeyManagerDlg.cpp:933
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:949
msgid "Edit"
msgstr "Editer"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:934
msgid "View"
msgstr "Voir"
-#: Src/wptFileManagerDlg.cpp:476
+#: Src/wptFileManagerDlg.cpp:475
msgid "&Open..."
msgstr "&Ouvrir"
-#: Src/wptFileManagerDlg.cpp:477
+#: Src/wptFileManagerDlg.cpp:476
msgid "&Encrypt"
msgstr "&Chiffrer"
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManagerDlg.cpp:477 Src/wptFileManagerDlg.cpp:552
msgid "Encrypt into ZIP"
msgstr "Chiffrer dans ZIP"
-#: Src/wptFileManagerDlg.cpp:479
+#: Src/wptFileManagerDlg.cpp:478
msgid "&Decrypt"
msgstr "&Déchiffrer"
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptFileManagerDlg.cpp:479 Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeyManagerDlg.cpp:998
msgid "&Sign"
msgstr "&Signer"
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
+#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:556
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "Signer && Chiffrer"
-#: Src/wptFileManagerDlg.cpp:482
+#: Src/wptFileManagerDlg.cpp:481
msgid "&Verify"
msgstr "&Vérifier"
-#: Src/wptFileManagerDlg.cpp:483
+#: Src/wptFileManagerDlg.cpp:482
msgid "S&ymmetric"
msgstr "S&ymétrique"
-#: Src/wptFileManagerDlg.cpp:484
+#: Src/wptFileManagerDlg.cpp:483
msgid "&Import"
msgstr "&Importer"
-#: Src/wptFileManagerDlg.cpp:485
+#: Src/wptFileManagerDlg.cpp:484
msgid "E&xport"
msgstr "Exporter"
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:419
msgid "Exit"
msgstr "Quitter"
-#: Src/wptFileManagerDlg.cpp:487
+#: Src/wptFileManagerDlg.cpp:486
msgid "&Reset"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:488
+#: Src/wptFileManagerDlg.cpp:487
msgid "Always on Top"
msgstr "Toujours visible"
-#: Src/wptFileManagerDlg.cpp:489
+#: Src/wptFileManagerDlg.cpp:488
msgid "&Paste"
msgstr "&Coller"
-#: Src/wptFileManagerDlg.cpp:490
+#: Src/wptFileManagerDlg.cpp:489
msgid "&Select All"
msgstr "&Sélectionner tout"
-#: Src/wptFileManagerDlg.cpp:491
+#: Src/wptFileManagerDlg.cpp:490
msgid "&Preferences"
msgstr "&Préférences"
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:491 Src/wptFileManagerDlg.cpp:559
msgid "Send as Mail"
msgstr "Envoyer par Mail"
-#: Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:492
msgid "&List Packets"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:495
+#: Src/wptFileManagerDlg.cpp:494
msgid "&Wipe"
msgstr "&Algorithme"
-#: Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:558
msgid "Wipe"
msgstr "Algorithme"
-#: Src/wptFileManagerDlg.cpp:561
+#: Src/wptFileManagerDlg.cpp:560
msgid "List Packets"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:607
+#: Src/wptFileManagerDlg.cpp:606
msgid "&Calc Digest"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:766
+#: Src/wptFileManagerDlg.cpp:621
+msgid "This command requires admin privileges.\n"
+msgstr ""
+
+#: Src/wptFileManagerDlg.cpp:770
msgid "Are you sure you want to secure delete these files?"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:771 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Oui"
-#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:772 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Non"
-#: Src/wptFileManagerDlg.cpp:811
+#: Src/wptFileManagerDlg.cpp:815
msgid "Operation Status: Error"
msgstr "Statut de l'opération : Erreur"
-#: Src/wptFileManagerDlg.cpp:812
+#: Src/wptFileManagerDlg.cpp:816
msgid "Operation Status: Done."
msgstr "Statut de l'opération : Fait"
-#: Src/wptFileManagerDlg.cpp:855
+#: Src/wptFileManagerDlg.cpp:859
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1463,7 +1468,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:1741 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyManagerDlg.cpp:960
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1531,35 +1536,35 @@
msgid "No GPG error description available."
msgstr ""
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:313
msgid "Error during verification process."
msgstr ""
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:314
msgid "The signature is good."
msgstr "La signature est bonne."
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:315
msgid "The signature is BAD!"
msgstr "La signature est MAUVAISE!"
-#: Src/wptGPGME.cpp:321
+#: Src/wptGPGME.cpp:316
msgid "The signature could not be checked due to a missing key."
msgstr ""
-#: Src/wptGPGME.cpp:322
+#: Src/wptGPGME.cpp:317
msgid "No valid OpenPGP signature."
msgstr ""
-#: Src/wptGPGME.cpp:323
+#: Src/wptGPGME.cpp:318
msgid "Signature Error"
msgstr ""
-#: Src/wptGPGME.cpp:324
+#: Src/wptGPGME.cpp:319
msgid "Good Signature (Expired Key)"
msgstr ""
-#: Src/wptGPGME.cpp:325
+#: Src/wptGPGME.cpp:320
msgid "Good Signature (Revoked Key)"
msgstr ""
@@ -1598,7 +1603,7 @@
"Are you sure?"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1663
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1672
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr ""
@@ -1678,7 +1683,7 @@
msgid "Choose GPG Binary"
msgstr ""
-#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
+#: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
#: 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
@@ -1697,23 +1702,24 @@
#: 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
+#: Src/wptKeyManagerDlg.cpp:1182 Src/wptKeyManagerDlg.cpp:1195
+#: Src/wptKeyManagerDlg.cpp:1205 Src/wptKeyManagerDlg.cpp:1499
+#: Src/wptKeyManagerDlg.cpp:1521 Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1546 Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1564 Src/wptKeyManagerDlg.cpp:1570
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1610 Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1701 Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyManagerDlg.cpp:1724 Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1800 Src/wptKeyManagerDlg.cpp:1805
+#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:314 Src/wptKeysigDlg.cpp:388
+#: Src/wptKeysigDlg.cpp:397 Src/wptKeysigDlg.cpp:442 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Gestionnaire de clés"
-#: Src/wptGroupManager.cpp:208
+#: Src/wptGroupManager.cpp:245
#, fuzzy, c-format
msgid ""
"Do you really want to delete this group?\n"
@@ -1721,7 +1727,7 @@
"%s"
msgstr "Voulez-vous effacer le contenu du presse papiers?"
-#: Src/wptGroupManager.cpp:236
+#: Src/wptGroupManager.cpp:272
#, fuzzy, c-format
msgid ""
"Do you really want to delete this entry?\n"
@@ -1777,20 +1783,20 @@
msgid "Unknown Hotkey"
msgstr ""
-#: 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
+#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:256
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeyEditDlgs.cpp:1197
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptKeyEditDlgs.cpp:1505 Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeylist.cpp:421 Src/wptKeylist.cpp:455
+#: Src/wptKeyPropsDlg.cpp:159 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:214
msgid "Revoked"
msgstr ""
-#: 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
+#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
+#: Src/wptKeyEditDlgs.cpp:1143 Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeylist.cpp:423 Src/wptKeylist.cpp:453 Src/wptKeyPropsDlg.cpp:157
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:215
msgid "Expired"
msgstr ""
@@ -1798,43 +1804,43 @@
msgid "secret key"
msgstr "clé secrète"
-#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
+#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:459
msgid "public key"
msgstr "clé publique"
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1205
msgid "Invalid user ID"
msgstr ""
-#: 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/wptImportList.cpp:345 Src/wptKeylist.cpp:576 Src/wptKeylist.cpp:584
+#: Src/wptKeyManagerDlg.cpp:877 Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr ""
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587
+#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Taille"
-#: 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/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1077
+#: Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:585 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr ""
-#: 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
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1078
+#: Src/wptKeyEditDlgs.cpp:1174 Src/wptKeylist.cpp:591
+#: Src/wptKeyManagerDlg.cpp:884 Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Création"
-#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
-#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:586
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:971
msgid "Type"
msgstr ""
@@ -1844,7 +1850,7 @@
"and thus a CRC error occurs."
msgstr ""
-#: Src/wptKeyCache.cpp:747
+#: Src/wptKeyCache.cpp:748
msgid "Load GPG Keyrings..."
msgstr ""
@@ -1860,270 +1866,266 @@
msgid "Key Cache"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:228 Src/wptKeylist.cpp:388
msgid "Ultimate"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1140
#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
msgid "Never"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1158
+#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1147
msgid "OK"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:281
+#: Src/wptKeyEditDlgs.cpp:282
msgid "user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:283
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
"%s"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:355
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:355
+#: Src/wptKeyEditDlgs.cpp:356
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:358
+#: Src/wptKeyEditDlgs.cpp:359
msgid "Add Photo ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:373
+#: Src/wptKeyEditDlgs.cpp:374
msgid "Select Image File"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:377 Src/wptKeyEditDlgs.cpp:387
-#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:378 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:406
+#: Src/wptKeyEditDlgs.cpp:911
msgid "Add Photo"
msgstr "Ajouter une photo"
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:379
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyEditDlgs.cpp:388 Src/wptKeyRevokeDlg.cpp:173
msgid "Please enter a file name."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:391
+#: Src/wptKeyEditDlgs.cpp:392
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:410
+#: Src/wptKeyEditDlgs.cpp:411
msgid "Photo successfully added."
msgstr "Photo ajoutée avec succès."
-#: 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/wptKeyEditDlgs.cpp:412 Src/wptKeyEditDlgs.cpp:479
+#: Src/wptKeyEditDlgs.cpp:562 Src/wptKeyEditDlgs.cpp:736
+#: Src/wptKeyEditDlgs.cpp:1468 Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1824
+#: Src/wptKeygenDlg.cpp:488 Src/wptKeygenDlg.cpp:604
+#: Src/wptKeyPropsDlg.cpp:361 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "Etat de GnuPG"
-#: Src/wptKeyEditDlgs.cpp:442
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:443
+#: Src/wptKeyEditDlgs.cpp:444
msgid "Public key"
msgstr "Clé publique"
-#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
-#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:447 Src/wptKeyEditDlgs.cpp:460
+#: Src/wptKeyEditDlgs.cpp:473 Src/wptKeyEditDlgs.cpp:942
msgid "Add Revoker"
msgstr ""
-#: 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
+#: Src/wptKeyEditDlgs.cpp:460 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1557 Src/wptKeyEditDlgs.cpp:1602
+#: Src/wptKeyEditDlgs.cpp:1756 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1980
msgid "Please select a user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:478
msgid "Revoker successfully addded."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:512
msgid "Add new User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:514
msgid "&Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:515
msgid "&Comment"
msgstr "&Commentaire"
-#: Src/wptKeyEditDlgs.cpp:533
+#: Src/wptKeyEditDlgs.cpp:531
msgid "Please enter a name (min. 5 chars.)"
msgstr "Entrer un nom (min. 5 caractères)"
-#: Src/wptKeyEditDlgs.cpp:534 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:562
+#: Src/wptKeyEditDlgs.cpp:532 Src/wptKeyEditDlgs.cpp:538
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:560
msgid "UserID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:537
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:545
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter an email address."
msgstr "Entrer une adresse email"
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:547
msgid "Invalid email address."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:564
+#: Src/wptKeyEditDlgs.cpp:562
msgid "user ID successfully added."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:853
+#: Src/wptKeyEditDlgs.cpp:646 Src/wptKeyEditDlgs.cpp:849
msgid "Add new Subkey"
msgstr "Ajouter la nouvelle clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:647
msgid "Key type"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:648
msgid "Size in bits"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:649
msgid "Key expiration"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:695
msgid "Please select one entry."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
-#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
+#: Src/wptKeyEditDlgs.cpp:696 Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:733 Src/wptKeyEditDlgs.cpp:832
msgid "Add Subkey"
msgstr "Ajouter la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:704
+#: Src/wptKeyEditDlgs.cpp:701
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:739
+#: Src/wptKeyEditDlgs.cpp:735
msgid "Subkey successfully added."
msgstr "Clé secondaire ajoutée avec succès."
-#: 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
+#: Src/wptKeyEditDlgs.cpp:763 Src/wptKeyEditDlgs.cpp:831
+#: Src/wptKeyEditDlgs.cpp:910 Src/wptKeyEditDlgs.cpp:942
+#: Src/wptKeyEditDlgs.cpp:1022 Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1427 Src/wptKeyEditDlgs.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1553
msgid "There is no secret key available!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:786
+#: Src/wptKeyEditDlgs.cpp:764 Src/wptKeyEditDlgs.cpp:782
msgid "Add user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:893
+#: Src/wptKeyEditDlgs.cpp:889
msgid "Preferred keyserver successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:349
+#: Src/wptKeyEditDlgs.cpp:976 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:353
msgid "Change Ownertrust"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyManager.cpp:220
msgid "Key status changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1032
+#: Src/wptKeyEditDlgs.cpp:1028
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1035
msgid "Current (old) Passphrase"
msgstr "Actuel (ancienne) Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "New Passphrase"
msgstr "Nouvelle Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1050 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1046 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:1062
+#: Src/wptKeyEditDlgs.cpp:1058
msgid "Change Passwd"
msgstr "Changement de mot de passe"
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1060
msgid "Passphrase successfully changed."
msgstr "Passphrase modifiée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyEditDlgs.cpp:1076 Src/wptKeyManagerDlg.cpp:885
msgid "Description"
msgstr "Déscription"
-#: Src/wptKeyEditDlgs.cpp:1084
+#: Src/wptKeyEditDlgs.cpp:1079
msgid "Expires"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
-msgid "Could not find key."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1105
+#: Src/wptKeyEditDlgs.cpp:1094
msgid "No subkey(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
-#: Src/wptKeyManagerDlg.cpp:877
+#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:589
+#: Src/wptKeyManagerDlg.cpp:882
msgid "Validity"
msgstr "Validité"
-#: Src/wptKeyEditDlgs.cpp:1185
+#: Src/wptKeyEditDlgs.cpp:1173
msgid "Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1181
msgid "No user ID(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1280
+#: Src/wptKeyEditDlgs.cpp:1263
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2148,19 +2150,19 @@
"MINIMIZE \t\tremove all signatures from key\r\n"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1285
msgid "Key Edit Help"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1301
msgid "Primary key can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1326
+#: Src/wptKeyEditDlgs.cpp:1309
msgid "Primary subkey can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1334
+#: Src/wptKeyEditDlgs.cpp:1317
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2171,34 +2173,34 @@
"Do you really want to delete this subkey?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1329
msgid "Delete Subkey"
msgstr "Effacer la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1333
msgid "Subkey successfully deleted."
msgstr "Clé secondaire effacée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1364
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:1390 Src/wptKeyEditDlgs.cpp:1393
+#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1376
msgid "Key Expiration Date"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1399
msgid "Expire Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1405
msgid "Subkey expire date successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1453
+#: Src/wptKeyEditDlgs.cpp:1436
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2206,31 +2208,31 @@
"This command is only available to revoke single subkeys"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1462
+#: Src/wptKeyEditDlgs.cpp:1445
msgid "Key already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1464
msgid "Revoke Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1485
+#: Src/wptKeyEditDlgs.cpp:1468
msgid "Subkey successfully revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "Revoke user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1512
+#: Src/wptKeyEditDlgs.cpp:1495
msgid "Key has only one user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:1506
msgid "This user ID has been already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1512
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2238,47 +2240,47 @@
"Do you really want to revoke this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1553
+#: Src/wptKeyEditDlgs.cpp:1536
msgid "Revoke User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1540
msgid "User ID successfully revoked"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1599
+#: Src/wptKeyEditDlgs.cpp:1582
msgid "Could not set user ID preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1639
+#: Src/wptKeyEditDlgs.cpp:1622
msgid "Primary"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1642
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "User ID successfully flagged"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1736
+#: Src/wptKeyEditDlgs.cpp:1719
msgid "No preferences available."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1723
msgid "MDC feature"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1742
+#: Src/wptKeyEditDlgs.cpp:1725
msgid "user ID:"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1726 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1789
msgid "Primary user ID can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1813
+#: Src/wptKeyEditDlgs.cpp:1800
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2288,27 +2290,27 @@
"Do you really want to delete this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1833
+#: Src/wptKeyEditDlgs.cpp:1820
msgid "Delete user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1824
msgid "User ID successfully deleted"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
msgid "Finished to compact key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1997
+#: Src/wptKeyEditDlgs.cpp:1984
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2084
+#: Src/wptKeyEditDlgs.cpp:2071
#, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
@@ -2319,28 +2321,28 @@
"which allow to revoke the key listed above?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2119
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2145
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2154
+#: Src/wptKeyEditDlgs.cpp:2141
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2157
+#: Src/wptKeyEditDlgs.cpp:2144
#, fuzzy
msgid "&Revoke..."
msgstr "&Enregistrer..."
-#: Src/wptKeyEditDlgs.cpp:2189
+#: Src/wptKeyEditDlgs.cpp:2176
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2193
+#: Src/wptKeyEditDlgs.cpp:2180
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2376,8 +2378,8 @@
msgstr ""
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:935
-#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:1766 Src/wptKeyPropsDlg.cpp:293
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2399,8 +2401,8 @@
#: 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
+#: Src/wptKeygenDlg.cpp:485 Src/wptKeygenDlg.cpp:581
+#: Src/wptKeyManagerDlg.cpp:1633 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr ""
@@ -2489,15 +2491,15 @@
msgid "Do you really need such a large key?"
msgstr ""
-#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:418 Src/wptKeygenDlg.cpp:558
msgid "Please enter the name."
msgstr ""
-#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:563
msgid "Please do not enter the email address in the name field."
msgstr ""
-#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:570
msgid "Please enter a valid email address."
msgstr ""
@@ -2509,51 +2511,51 @@
msgid "Please enter the passphrase."
msgstr "Entrer la passphrase."
-#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:606
+#: Src/wptKeygenDlg.cpp:488 Src/wptKeygenDlg.cpp:604
msgid "Key Generation completed"
msgstr "Génération des clés terminée"
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:531
msgid "&Prefer RSA keys"
msgstr ""
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:532
msgid "Real name:"
msgstr "Nom réel:"
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:533
msgid "Email address:"
msgstr "Adresse email:"
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:534
msgid "Name and E-Mail Assignment"
msgstr ""
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:535
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:537
+#: Src/wptKeygenDlg.cpp:536
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: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
+#: Src/wptKeygenDlg.cpp:537 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:600
+#: Src/wptKeyManagerDlg.cpp:1656
msgid "Key Generation Wizard"
msgstr ""
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:539
msgid "E&xpert"
msgstr ""
-#: Src/wptKeygenDlg.cpp:577
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr ""
@@ -2625,24 +2627,24 @@
msgid "Marginal"
msgstr ""
-#: Src/wptKeylist.cpp:387
+#: Src/wptKeylist.cpp:386
msgid "Full"
msgstr ""
-#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:451 Src/wptKeyPropsDlg.cpp:161
msgid "Disabled"
msgstr ""
-#: Src/wptKeylist.cpp:460
+#: Src/wptKeylist.cpp:461
msgid "key pair"
msgstr ""
-#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyManagerDlg.cpp:970
msgid "Cipher"
msgstr ""
-#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeylist.cpp:590 Src/wptKeyManagerDlg.cpp:883
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Confiance"
@@ -2829,312 +2831,322 @@
msgid "3. Key is no longer used"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:449 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:454 Src/wptKeyManagerDlg.cpp:990
msgid "Paste Key from Clipboard"
msgstr "Coller la clé du presse papiers"
-#: Src/wptKeyManagerDlg.cpp:470
+#: Src/wptKeyManagerDlg.cpp:475
#, c-format
msgid "Default Key: %s"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:477
#, c-format
msgid "Default Key: 0x%s"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:493
+#: Src/wptKeyManagerDlg.cpp:498
#, c-format
msgid "%d secret keys"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:494
+#: Src/wptKeyManagerDlg.cpp:499
#, c-format
msgid "%d keys"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:935
msgid "Key"
msgstr "Clé"
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
+#: Src/wptKeyManagerDlg.cpp:936 Src/wptKeyManagerDlg.cpp:1220
msgid "Groups"
msgstr "Groupes"
-#: Src/wptKeyManagerDlg.cpp:934
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Send Mail..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:936
+#: Src/wptKeyManagerDlg.cpp:941
msgid "&Copy\tCtrl+C"
msgstr "&Copier\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Paste\tCtrl+V"
msgstr "&Coller\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:943
msgid "Search...\tCtrl+F"
msgstr "Chercher...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:944
msgid "Select All\tCtrl+A"
msgstr "Sélectionner tout\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:945
msgid "&Quit"
msgstr "&Quitter"
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:947
msgid "&Expert"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:948
msgid "&Normal"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
-#: Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:951 Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:996
msgid "&Delete"
msgstr "&Effacer"
-#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:997
msgid "&Revoke Cert"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:993
msgid "&List Signatures"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
+#: Src/wptKeyManagerDlg.cpp:955 Src/wptKeyManagerDlg.cpp:1575
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:951
+#: Src/wptKeyManagerDlg.cpp:956
msgid "&Export..."
msgstr "&Exporter..."
-#: Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:957
msgid "&Import..."
msgstr "&Importer..."
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeysigDlg.cpp:405
+#: Src/wptKeyManagerDlg.cpp:958 Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "&Propriétés"
-#: Src/wptKeyManagerDlg.cpp:957
+#: Src/wptKeyManagerDlg.cpp:962
msgid "E&xport Secret Key"
msgstr "E&xporter la clé privée"
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:963
msgid "Re&load Key Cache"
msgstr "Re&charger le cache"
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:964
msgid "R&everify Signatures"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:965
msgid "Refresh &Keys (Keyserver)"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:961 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:985
msgid "Copy User ID to Clipboard"
msgstr "Copier l'ID de l'utilisateur dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Copy Key ID to Clipboard"
msgstr "Copier l'ID de la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Copy Fingerprint to Clipboard"
msgstr "Copier l'empreinte dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:988
msgid "Copy Key Info to Clipboard"
msgstr "Copier l'info de la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:989
msgid "Copy Key to Clipboard"
msgstr "Copier la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:991
msgid "Refresh from Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Set Implicit &Trust"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:999
msgid "&Enable"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Disable"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "Re&fresh from Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "Set preferred Keyserver URL"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Send Key to Mail Recipient"
msgstr "Envoyer la clé au destinataire de courrier"
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Set as Default Key"
msgstr "Clé par défaut"
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:1006
msgid "Key..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "User ID..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Photo ID..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Revoker..."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyManagerDlg.cpp:1012
msgid "Key Attributes"
msgstr "Attributs de clé"
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:1013
msgid "Add"
msgstr "Ajouter"
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:1014
msgid "Send to Keyserver"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1189
+#: Src/wptKeyManagerDlg.cpp:1193
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1200
+#: Src/wptKeyManagerDlg.cpp:1204
msgid "Could not set keylist window procedure."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1221
+#, fuzzy
+msgid "&Show"
+msgstr "&Montrer la photo"
+
+#: Src/wptKeyManagerDlg.cpp:1222
+#, fuzzy
+msgid "&New..."
+msgstr "&Ouvrir"
+
+#: Src/wptKeyManagerDlg.cpp:1327
msgid "Generate new key pair"
msgstr "Générer une nouvelle paire de clés"
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1331
msgid "Search for a specific key"
msgstr "Chercher pour une clé spécifique"
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1335
msgid "Delete key from keyring"
msgstr "Effacer une clé du porte-clés"
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1339
msgid "Show key properties"
msgstr "Voir les propriétés de la clé"
-#: Src/wptKeyManagerDlg.cpp:1334
+#: Src/wptKeyManagerDlg.cpp:1343
msgid "Sign key"
msgstr "Signer la clé"
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1347
msgid "Copy key to clipboard"
msgstr "Copier la clé dans le presse papiers"
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1351
msgid "Paste key from clipboard"
msgstr "Coller la clé du presse papiers"
-#: Src/wptKeyManagerDlg.cpp:1346
+#: Src/wptKeyManagerDlg.cpp:1355
msgid "Import key to keyring"
msgstr "Importer la clé dans le porte-clés"
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1359
msgid "Export key to a file"
msgstr "Exporter la clé dans un fichier"
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1486
msgid "New"
msgstr "Nouveau"
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1498
msgid "Could not access public keyring"
msgstr "Ne peut accéder au porte-clés publique"
-#: Src/wptKeyManagerDlg.cpp:1520 Src/wptKeysignDlg.cpp:258
+#: Src/wptKeyManagerDlg.cpp:1529 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:1536
+#: Src/wptKeyManagerDlg.cpp:1545
msgid "Key already revoked!"
msgstr "Clé déjà révoquée!"
-#: Src/wptKeyManagerDlg.cpp:1550 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1559 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:1560
+#: Src/wptKeyManagerDlg.cpp:1569
msgid "It does not make any sense with a key pair!"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1577
+#: Src/wptKeyManagerDlg.cpp:1586
msgid "Key Signature List"
msgstr "Liste de signature de clé"
-#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyPropsDlg.cpp:289
msgid "Key Properties"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1602
+#: Src/wptKeyManagerDlg.cpp:1611
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:1632
+#: Src/wptKeyManagerDlg.cpp:1641
msgid "Smart Card support is not available."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1655 Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1664 Src/wptKeyserverDlg.cpp:568
msgid "Keyserver Access"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1681
msgid "GnuPG Options"
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1714
+#: Src/wptKeyManagerDlg.cpp:1723
msgid "There is no corresponding secret key for this key."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyManagerDlg.cpp:1728
msgid "You can only export one secret key."
msgstr "Vous pouvez exporter seulement une clé secrète."
-#: Src/wptKeyManagerDlg.cpp:1724
+#: Src/wptKeyManagerDlg.cpp:1733
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3152,14 +3164,18 @@
"\n"
"Voulez-vous vraiment exporter cette clé?"
-#: Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1738
msgid "WARNING"
msgstr "ATTENTION"
-#: Src/wptKeyManagerDlg.cpp:1790
+#: Src/wptKeyManagerDlg.cpp:1799
msgid "No key was selected, select all by default."
msgstr ""
+#: Src/wptKeyManagerDlg.cpp:1804
+msgid "Keyserver refresh finished."
+msgstr ""
+
#: Src/wptKeyPropsDlg.cpp:67
msgid "I trust ultimately (implicit)"
msgstr ""
@@ -3169,16 +3185,16 @@
msgid "Unknown"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:213
+#: Src/wptKeyPropsDlg.cpp:208
#, c-format
msgid "Card-Type: %s\r\n"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:240
+#: Src/wptKeyPropsDlg.cpp:247
#, c-format
msgid ""
"Type: %s\r\n"
-"Key ID: %s\r\n"
+"Key ID: 0x%s\r\n"
"Algorithm: %s\r\n"
"Size: %s bits\r\n"
"Created: %s\r\n"
@@ -3188,33 +3204,33 @@
"%s\r\n"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:286
+#: Src/wptKeyPropsDlg.cpp:290
msgid "&Change"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyPropsDlg.cpp:291
msgid "&Revokers"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Change &Password"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:295
+#: Src/wptKeyPropsDlg.cpp:299
msgid "Photo-ID not validated."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:333
+#: Src/wptKeyPropsDlg.cpp:337
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
+#: Src/wptKeyPropsDlg.cpp:339 Src/wptKeyPropsDlg.cpp:346
msgid "WinPT Warning"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:339
+#: Src/wptKeyPropsDlg.cpp:343
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3222,11 +3238,11 @@
"Do you really want to continue?"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:356
+#: Src/wptKeyPropsDlg.cpp:360
msgid "Ownertrust successfully changed."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyPropsDlg.cpp:373 Src/wptKeyRevokersDlg.cpp:162
msgid "Key Revokers"
msgstr ""
@@ -3266,7 +3282,7 @@
msgid "Revocation certificate generated."
msgstr ""
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:59
msgid "Algorithm"
msgstr ""
@@ -3279,192 +3295,204 @@
msgstr ""
#: Src/wptKeyRevokersDlg.cpp:176
-#, c-format
-msgid "Do you want to retrieve 0x%s via the default keyserver?"
+#, fuzzy, c-format
+msgid "Do you want to retrieve %s via the default keyserver?"
+msgstr "Voulez-vous effacer le contenu du presse papiers?"
+
+#: Src/wptKeyserver.cpp:363
+msgid "Network unreachable"
msgstr ""
-#: Src/wptKeyserver.cpp:346
-msgid "The network subsystem has failed"
+#: Src/wptKeyserver.cpp:366
+msgid "Host unreachable"
msgstr ""
-#: Src/wptKeyserver.cpp:348
-msgid "Authoritative Answer Host not found"
+#: Src/wptKeyserver.cpp:369
+#, fuzzy
+msgid "Could not resolve host name"
+msgstr "Ne peut pas résoudre le nom d'hôte"
+
+#: Src/wptKeyserver.cpp:372
+msgid "Connection refused"
msgstr ""
-#: Src/wptKeyserver.cpp:350
-msgid "The connection has been dropped because of a network failure"
+#: Src/wptKeyserver.cpp:376
+msgid "Connection timeout"
msgstr ""
-#: Src/wptKeyserver.cpp:352
-#, c-format
-msgid "Unknown Winsock error ec=%d"
+#: Src/wptKeyserver.cpp:380
+msgid "Connection resetted by peer"
msgstr ""
-#: Src/wptKeyserver.cpp:540
+#: Src/wptKeyserver.cpp:383
+msgid "Socket has been shutdown"
+msgstr ""
+
+#: Src/wptKeyserver.cpp:572
msgid "Could not save keyserver.conf file"
msgstr ""
-#: Src/wptKeyserver.cpp:585
+#: Src/wptKeyserver.cpp:617
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
msgstr ""
-#: Src/wptKeyserver.cpp:588
+#: Src/wptKeyserver.cpp:620
msgid "Proxy Error"
msgstr ""
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:644
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
msgstr ""
-#: Src/wptKeyserver.cpp:616
+#: Src/wptKeyserver.cpp:646
msgid "Keyserver Error"
msgstr ""
-#: Src/wptKeyserver.cpp:640
+#: Src/wptKeyserver.cpp:670
msgid "The keyserver limit is exceeded"
msgstr ""
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:671
msgid "Keyserver Warning"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:100
+#: Src/wptKeyserverDlg.cpp:101
#, c-format
msgid "Key '%s' successfully sent"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:134
+#: Src/wptKeyserverDlg.cpp:135
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:140
msgid "Key(s) successfully received but nothing was changed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:141
+#: Src/wptKeyserverDlg.cpp:142
msgid "Key(s) sucessfully received and imported."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:157
+#: Src/wptKeyserverDlg.cpp:158
msgid "Imported Keys"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:187
+#: Src/wptKeyserverDlg.cpp:184
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
"installed"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:199
+#: Src/wptKeyserverDlg.cpp:196
#, c-format
msgid "Finger key import failed: %s\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:213
+#: Src/wptKeyserverDlg.cpp:210
msgid "This is not a valid OpenPGP key."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:368
+#: Src/wptKeyserverDlg.cpp:352
msgid "Please select one of the servers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:373
+#: Src/wptKeyserverDlg.cpp:357
msgid "Only HTTP keyserver can be used."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:390
+#: Src/wptKeyserverDlg.cpp:374
msgid "DNS Name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:375
msgid "Port"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:475
+#: Src/wptKeyserverDlg.cpp:459
msgid "No space for new keyserver entry"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:496
+#: Src/wptKeyserverDlg.cpp:480
msgid "HKP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:481
msgid "LDAP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:482
msgid "Finger Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:737
-#: Src/wptKeyserverDlg.cpp:757
+#: Src/wptKeyserverDlg.cpp:507 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:741
msgid "Edit Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:508 Src/wptKeyserverDlg.cpp:600
msgid "&Add"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:510
msgid "Type:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:511
msgid "Port:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:512
msgid "Host name:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:520
msgid "Please enter a host name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:541
+#: Src/wptKeyserverDlg.cpp:525
msgid "Invalid port, valid numbers are < 65535"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:569 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:587
+#: Src/wptKeyserverDlg.cpp:571
msgid "Send key (default is receiving)"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:589
+#: Src/wptKeyserverDlg.cpp:573
msgid "Please enter the key ID or email address you search for"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:574
msgid "&Search"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:575
msgid "C&hange proxy"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:576
msgid "Set &default"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:601
msgid "&Remove"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:602
msgid "&Edit"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:628 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
@@ -3472,27 +3500,27 @@
msgid "Proxy Settings"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:635 Src/wptKeyserverDlg.cpp:666
msgid "Please select one of the keyservers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:659
+#: Src/wptKeyserverDlg.cpp:643
msgid "This is not implemented yet!"
msgstr "Ceci n'est pas encore implémenté!"
-#: Src/wptKeyserverDlg.cpp:666 Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:650 Src/wptKeyserverDlg.cpp:682
msgid "Please enter the search pattern."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:687
msgid "Only keyids are allowed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:709
+#: Src/wptKeyserverDlg.cpp:693
msgid "Only enter the name of the user."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:699
msgid "Only email addresses or keyids are allowed."
msgstr ""
@@ -3530,19 +3558,19 @@
msgid "%s %s signature"
msgstr ""
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:216
msgid "Signature Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:212
msgid "Exportable"
msgstr ""
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
+#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:213
msgid "Non-revocably"
msgstr ""
-#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
+#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:55
msgid "Class"
msgstr ""
@@ -3566,39 +3594,44 @@
msgid "Non-exportable"
msgstr ""
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
+#: Src/wptKeysigDlg.cpp:178 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr ""
-#: Src/wptKeysigDlg.cpp:288
+#: Src/wptKeysigDlg.cpp:313
msgid "Really receive all missing keys?"
msgstr ""
-#: Src/wptKeysigDlg.cpp:322 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:347 Src/wptSigTreeDlg.cpp:111
msgid "Signature &Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:323
+#: Src/wptKeysigDlg.cpp:348
msgid "Signing &Key Properties"
msgstr ""
-#: Src/wptKeysigDlg.cpp:362
+#: Src/wptKeysigDlg.cpp:387
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr ""
-#: Src/wptKeysigDlg.cpp:372
+#: Src/wptKeysigDlg.cpp:397
msgid "Key not found in keyring."
msgstr "Clé non trouvée dans le porte-clés."
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeysigDlg.cpp:424
#, c-format
msgid "Signature List for \"%s\""
msgstr ""
-#: Src/wptKeysigDlg.cpp:404
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr ""
+#: Src/wptKeysignDlg.cpp:72
+#, c-format
+msgid "%d-bit %s key, ID 0x%s"
+msgstr ""
+
#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
msgid "Choose Signature Class"
msgstr ""
@@ -4098,20 +4131,20 @@
msgid "Could not write to Registry."
msgstr ""
-#: Src/wptSigList.cpp:53
+#: Src/wptSigList.cpp:54
msgid "Valid"
msgstr ""
-#: Src/wptSigList.cpp:57
+#: Src/wptSigList.cpp:58
msgid "Expiration"
msgstr ""
-#: Src/wptSigTreeDlg.cpp:164
+#: Src/wptSigTreeDlg.cpp:159
#, c-format
msgid "Signature Tree for \"%s\" (0x%s)"
msgstr ""
-#: Src/wptSigTreeDlg.cpp:166
+#: Src/wptSigTreeDlg.cpp:161
msgid "Edit..."
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Po/jp.po 2006-05-07 12:36:48 UTC (rev 211)
@@ -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-05-07 13:41+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -14,7 +14,7 @@
"Content-Transfer-Encoding: 8bit\n"
# c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:183
+#: Src/WinPT.cpp:188
msgid "Could not create GPG home directory"
msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -29,28 +29,28 @@
# c:\oss\winpt\src\wptGPG.cpp:886 c:\oss\winpt\src\wptGPG.cpp:896
# c:\oss\winpt\src\wptGPGME.cpp:175 c:\oss\winpt\src\wptMainProc.cpp:337
# c:\oss\winpt\src\wptMainProc.cpp:509
-#: Src/WinPT.cpp:184 Src/WinPT.cpp:216 Src/WinPT.cpp:266 Src/WinPT.cpp:270
-#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
-#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
-#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
+#: Src/WinPT.cpp:189 Src/WinPT.cpp:221 Src/WinPT.cpp:271 Src/WinPT.cpp:275
+#: Src/WinPT.cpp:471 Src/WinPT.cpp:478 Src/WinPT.cpp:519 Src/WinPT.cpp:547
+#: Src/WinPT.cpp:556 Src/WinPT.cpp:560 Src/WinPT.cpp:577 Src/WinPT.cpp:645
+#: Src/WinPT.cpp:658 Src/WinPT.cpp:705 Src/WinPT.cpp:735 Src/WinPT.cpp:753
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:903
#: Src/wptGPG.cpp:915 Src/wptGPG.cpp:925 Src/wptGPG.cpp:936
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/WinPT.cpp:215
+#: Src/WinPT.cpp:220
msgid "No useable secret key found."
msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:155
-#: Src/WinPT.cpp:265
+#: Src/WinPT.cpp:270
msgid "Could not read GnuPG version."
msgstr "GnuPGƒo[ƒWƒ‡ƒ“î•ñ‚ð“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:161
-#: Src/WinPT.cpp:271
+#: Src/WinPT.cpp:276
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
@@ -60,7 +60,7 @@
"•K—v‚Æ‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ª %d.%d.%d ‚Å‚·B"
# c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:299
+#: Src/WinPT.cpp:304
msgid "Failed to create WinPT directory"
msgstr "WinPTƒfƒBƒŒƒNƒgƒŠ‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -79,37 +79,37 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# 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/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/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
+#: Src/wptKeyManagerDlg.cpp:961 Src/wptKeyserver.cpp:573
+#: Src/wptKeyserverDlg.cpp:68 Src/wptKeyserverDlg.cpp:70
+#: Src/wptKeyserverDlg.cpp:187 Src/wptKeyserverDlg.cpp:195
+#: Src/wptKeyserverDlg.cpp:211 Src/wptKeyserverDlg.cpp:352
+#: Src/wptKeyserverDlg.cpp:358 Src/wptKeyserverDlg.cpp:460
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:636 Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:667
+#: Src/wptKeyserverDlg.cpp:683 Src/wptKeyserverDlg.cpp:688
+#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:700
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/WinPT.cpp:316
+#: Src/WinPT.cpp:321
msgid "Failed to copy the keyserver.conf"
msgstr "keyserver.conf‚̃tƒ@ƒCƒ‹ƒRƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:223
-#: Src/WinPT.cpp:463
+#: Src/WinPT.cpp:470
msgid "Cryptographic selftest failed."
msgstr "ˆÃ†–@ƒZƒ‹ƒtƒeƒXƒg‚ªŽ¸”s‚µ‚Ü‚µ‚½B"
-#: Src/WinPT.cpp:470
+#: Src/WinPT.cpp:477
msgid "A newer GPGME version is needed; at least "
msgstr "‚È‚‚Ä‚àGPME‚ÌV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B"
# c:\oss\winpt\src\WinPT.cpp:242
-#: Src/WinPT.cpp:512
+#: Src/WinPT.cpp:520
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -121,17 +121,17 @@
"%s."
# c:\oss\winpt\src\WinPT.cpp:246
-#: Src/WinPT.cpp:516
+#: Src/WinPT.cpp:524
msgid "Select GPG Public Keyring"
msgstr "GPGŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:268
-#: Src/WinPT.cpp:538
+#: Src/WinPT.cpp:546
msgid "GPG home directory could not be determited."
msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:276
-#: Src/WinPT.cpp:546
+#: Src/WinPT.cpp:554
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -139,7 +139,7 @@
"GPGƒoƒCƒiƒŠ(gpg.exe)‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
"GPG ƒJƒXƒ^ƒ€Ý’è‚ð‹N“®‚µ‚Ä‚±‚Ì–â‘è‚ð‰ðŒˆ‚µ‚Ü‚·‚©H"
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:569
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
@@ -152,23 +152,23 @@
"‚±‚Ì‚Ü‚Ü‘±‚¯‚éꇂÍAWinPT‚ª‚¢‚ë‚¢‚ë‚È‘I‘ð‚ð’ño‚µ‚Ü‚·B\n"
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
-#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:810
+#: Src/WinPT.cpp:602 Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:818
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
# c:\oss\winpt\src\WinPT.cpp:382
-#: Src/WinPT.cpp:636
+#: Src/WinPT.cpp:644
msgid "Could not register window class"
msgstr "ƒEƒBƒ“ƒh‚̃Nƒ‰ƒX‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:395
-#: Src/WinPT.cpp:650
+#: Src/WinPT.cpp:658
msgid "Could not create window"
msgstr "ƒEƒBƒ“ƒh‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:461
-#: Src/WinPT.cpp:725
+#: Src/WinPT.cpp:733
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -177,7 +177,7 @@
"GPG‚±‚¤‚¹‚¢ (ƒL[ƒŠƒ“ƒO, ƒpƒX‚È‚Ç...) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:464
-#: Src/WinPT.cpp:728
+#: Src/WinPT.cpp:736
msgid ""
"It seems that GPG is not set properly.\n"
"Do you want to start the GPG preferences dialog?"
@@ -186,7 +186,7 @@
"GPGƒJƒXƒ^ƒ€Ý’è‚ðŽÀs‚µ‚Ü‚·H"
# c:\oss\winpt\src\WinPT.cpp:480
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:754
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -195,7 +195,8 @@
"%s: public key not found."
msgstr ""
"GPGƒIƒvƒVƒ‡ƒ“ƒtƒ@ƒCƒ‹‚æ‚è‹K’èƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
-"‚±‚ê‚𒼂·‚Ì‚Égpg.conf (ƒIƒvƒVƒ‡ƒ“) ‚ðƒ`ƒFƒbƒN‚·‚é‚©V‚µ‚¢‹K’èƒL[‚ðƒZƒbƒg‚µ‚Ä‚‚¾‚³‚¢:\n"
+"‚±‚ê‚𒼂·‚Ì‚Égpg.conf (ƒIƒvƒVƒ‡ƒ“) ‚ðƒ`ƒFƒbƒN‚·‚é‚©V‚µ‚¢‹K’èƒL[‚ðƒZƒbƒg‚µ"
+"‚Ä‚‚¾‚³‚¢:\n"
"\n"
"%s: ŒöŠJŒ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -216,7 +217,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:1750
#: Src/wptMainProc.cpp:586
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -239,8 +240,7 @@
#: Src/wptAboutDlgs.cpp:103
msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
msgstr ""
-"WinPT‚É‚æ‚éƒoƒO‚âƒRƒƒ“ƒg‚ðŽŸ‚ÌƒAƒhƒŒƒX‚Ü‚Å<winpt at freakmail.de>‚¨Šè‚¢‚µ‚Ü"
-"‚·B"
+"WinPT‚É‚æ‚éƒoƒO‚âƒRƒƒ“ƒg‚ðŽŸ‚ÌƒAƒhƒŒƒX‚Ü‚Å<winpt at freakmail.de>‚¨Šè‚¢‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptAboutDlgs.cpp:86
#: Src/wptAboutDlgs.cpp:105
@@ -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:2143
+#: Src/wptKeyManagerDlg.cpp:967
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:513
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:650 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:1646
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:1380
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -545,10 +545,10 @@
"Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"
# 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:54 Src/wptClipDecryptDlg.cpp:187
+#: Src/wptFileManager.cpp:1228 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"
@@ -558,16 +558,16 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:138
# c:\oss\winpt\src\wptFileManager.cpp:952
# c:\oss\winpt\src\wptFileManager.cpp:996
-#: Src/wptClipDecryptDlg.cpp: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:116 Src/wptClipDecryptDlg.cpp:129
+#: Src/wptClipDecryptDlg.cpp:137 Src/wptClipDecryptDlg.cpp:144
+#: Src/wptClipDecryptDlg.cpp:146 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
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:130 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -576,17 +576,17 @@
" %s‚ňƉ»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
"•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
-#: Src/wptClipDecryptDlg.cpp:140
+#: Src/wptClipDecryptDlg.cpp:137
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
-#: Src/wptClipDecryptDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:143
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr "•s–¾‚ÈOpenPGPƒƒbƒZ[ƒW"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
-#: Src/wptClipDecryptDlg.cpp:154
+#: Src/wptClipDecryptDlg.cpp:151
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -601,7 +601,7 @@
"‚Ü‚½‚Í‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:159
+#: Src/wptClipDecryptDlg.cpp:156
msgid "*** IMPORTANT ***"
msgstr "*** d—v ***"
@@ -613,40 +613,40 @@
# c:\oss\winpt\src\wptKeyManager.cpp:274
# c:\oss\winpt\src\wptKeyManager.cpp:610
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipDecryptDlg.cpp:159 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:174
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:176
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:179
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:182
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:189
msgid "WinPT Verify"
msgstr "WinPT Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:190
#, c-format
msgid ""
"%s\n"
@@ -672,7 +672,7 @@
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
-#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:211
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
@@ -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:568
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:2142
+#: Src/wptKeyserverDlg.cpp:577 Src/wptMDSumDlg.cpp:122
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -778,16 +778,16 @@
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
-#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
-#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
+#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
+#: Src/wptFileManagerDlg.cpp:83 Src/wptFileManagerDlg.cpp:217
+#: Src/wptFileManagerDlg.cpp:286 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:358 Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:516 Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:538 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeyserverDlg.cpp:509 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:1080
+#: Src/wptFileManager.cpp:1096 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
@@ -881,7 +881,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"
@@ -911,10 +911,10 @@
# 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/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:209
+#: Src/wptClipVerifyDlg.cpp:241 Src/wptClipVerifyDlg.cpp:252
+#: Src/wptFileManager.cpp:1584 Src/wptFileManager.cpp:1637
+#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -922,7 +922,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"
@@ -936,17 +936,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"
@@ -958,7 +958,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
@@ -966,17 +966,17 @@
msgstr "ƒvƒŒ[ƒ“ƒeƒLƒXƒg‚ð•Û‘¶‚·‚é"
# c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptCommonDlg.cpp:86
+#: Src/wptCommonDlg.cpp:85
msgid "Please enter a valid URL."
msgstr "—LŒø‚ÈURL‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptClipImportDlg.cpp:180
# c:\oss\winpt\src\wptKeyManager.cpp:427
-#: Src/wptCommonDlg.cpp:116
+#: Src/wptCommonDlg.cpp:115
msgid "HTTP Key Import"
msgstr "HTTPƒL[‚̃Cƒ“ƒ|[ƒg"
-#: Src/wptCommonDlg.cpp:117
+#: Src/wptCommonDlg.cpp:116
msgid "Enter URL to retrieve the public key"
msgstr "ŒöŠJŒ®‚ðŽæ“¾‚·‚é‚Ì‚ÉURL‚ð“ü—Í‚·‚é"
@@ -1020,66 +1020,66 @@
# 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:134 Src/wptKeyEditDlgs.cpp:769
+#: Src/wptKeyEditDlgs.cpp:836 Src/wptKeyEditDlgs.cpp:876
+#: Src/wptKeyEditDlgs.cpp:889 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:917 Src/wptKeyEditDlgs.cpp:947
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1030 Src/wptKeyEditDlgs.cpp:1048
+#: Src/wptKeyEditDlgs.cpp:1094 Src/wptKeyEditDlgs.cpp:1181
+#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1309 Src/wptKeyEditDlgs.cpp:1316
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1366 Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1385 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1514
+#: Src/wptKeyEditDlgs.cpp:1517 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1565 Src/wptKeyEditDlgs.cpp:1582
+#: Src/wptKeyEditDlgs.cpp:1602 Src/wptKeyEditDlgs.cpp:1610
+#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1805 Src/wptKeyEditDlgs.cpp:1927
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1945
+#: Src/wptKeyEditDlgs.cpp:1947 Src/wptKeyEditDlgs.cpp:1980
+#: Src/wptKeyEditDlgs.cpp:1985 Src/wptKeyEditDlgs.cpp:1994
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeyEditDlgs.cpp:2012
+#: Src/wptKeyEditDlgs.cpp:2079 Src/wptKeyEditDlgs.cpp:2120
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2147
+#: Src/wptKeyEditDlgs.cpp:2176 Src/wptKeyEditDlgs.cpp:2181
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1774
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
-#: Src/wptCommonDlg.cpp:136
+#: Src/wptCommonDlg.cpp:135
msgid "Enter preferred keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:334
msgid "Choose Locale Directory"
msgstr "'Locale'ÃÞ¨Ú¸ÄØ‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢"
# c:\oss\winpt\src\wptErrors.cpp:67
-#: Src/wptCommonDlg.cpp:220
+#: Src/wptCommonDlg.cpp:219
msgid "Could not create winpt.mo file"
msgstr "winpt.moƒtƒ@ƒCƒ‹‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptCommonDlg.cpp:251
+#: Src/wptCommonDlg.cpp:250
msgid "Native Language Support"
msgstr "ƒlƒCƒeƒBƒuŒ¾Œê‘Ήž"
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:60
-#: Src/wptCommonDlg.cpp:252
+#: Src/wptCommonDlg.cpp:251
msgid "Please select a language"
msgstr "Œ¾Œê‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptCommonDlg.cpp:253
+#: Src/wptCommonDlg.cpp:252
msgid "&OK"
msgstr "&OK"
@@ -1318,12 +1318,13 @@
# 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:662
+#: Src/wptFileManager.cpp:807 Src/wptFileManager.cpp:922
+#: Src/wptFileManager.cpp:1491 Src/wptFileManager.cpp:1518
+#: Src/wptFileManager.cpp:1537 Src/wptFileManager.cpp:1788
+#: Src/wptFileManager.cpp:1850 Src/wptFileManagerDlg.cpp:503
+#: Src/wptFileManagerDlg.cpp:622 Src/wptFileStatDlg.cpp:152
+#: Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:181
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1359,7 +1360,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:1080
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1368,8 +1369,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:1172
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "–¼‘O"
@@ -1380,12 +1381,12 @@
msgstr "‘€ì"
# c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:666
+#: Src/wptFileManager.cpp:661
msgid "Please select a file."
msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:813
+#: Src/wptFileManager.cpp:808
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1395,25 +1396,25 @@
"‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:928
+#: Src/wptFileManager.cpp:923
#, 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:1006 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:1050
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:1079
msgid "Could not get default secret key."
msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1422,8 +1423,8 @@
# 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/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1110 Src/wptFileManager.cpp:1442
+#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "–¼"
@@ -1431,7 +1432,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:1123 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1440,28 +1441,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:1150 Src/wptFileManager.cpp:1183
+#: Src/wptFileManager.cpp:1188 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
# c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1193
+#: Src/wptFileManager.cpp:1188
msgid "Encryption failed."
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1218
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1223
+#: Src/wptFileManager.cpp:1218
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1229
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1473,30 +1474,30 @@
"%s"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1241
+#: Src/wptFileManager.cpp:1234
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1319
+#: Src/wptFileManager.cpp:1311
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:1320
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/wptFileManagerDlg.cpp:555
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1372
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1505,7 +1506,7 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
-#: Src/wptFileManager.cpp:1379
+#: Src/wptFileManager.cpp:1371
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1517,32 +1518,32 @@
"‚±‚ê‚ð '%s' ‚Ì‘ã‚í‚è‚É–{“–‚ÉŽg—p‚µ‚Ü‚·‚©?"
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1427
+#: Src/wptFileManager.cpp:1419
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:1517
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:1537
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:1554
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1570
+#: Src/wptFileManager.cpp:1556
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1598
+#: Src/wptFileManager.cpp:1584
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1557,18 +1558,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:1682 Src/wptFileManager.cpp:1693
+#: Src/wptFileManagerDlg.cpp:243 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:219
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:1690
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1584,24 +1585,24 @@
# 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:1716 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/wptKeyserverDlg.cpp:89
+#: Src/wptFileManager.cpp:1716 Src/wptFileManager.cpp:1739
+#: Src/wptKeyserverDlg.cpp:90
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
# 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:1724 Src/wptKeyManagerDlg.cpp:1710
+#: Src/wptKeyManagerDlg.cpp:1742
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1610,112 +1611,121 @@
# 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/wptKeyserverDlg.cpp:101
+#: Src/wptFileManager.cpp:1743 Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:1333 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeyserverDlg.cpp:102
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1757
+#: Src/wptFileManager.cpp:1743
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1803
+#: Src/wptFileManager.cpp:1789
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1863
+#: Src/wptFileManager.cpp:1849
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:1854
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:1924
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:1927
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:1927 Src/wptFileManager.cpp:1934
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1948
+#: Src/wptFileManager.cpp:1934
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:69
# c:\oss\winpt\src\wptFileManagerDlg.cpp:129
-#: Src/wptFileManagerDlg.cpp:79 Src/wptFileManagerDlg.cpp:146
+#: Src/wptFileManagerDlg.cpp:77 Src/wptFileManagerDlg.cpp:145
msgid "File Encrypt"
msgstr "ƒtƒ@ƒCƒ‹‚̈Ɖ»"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:70
# c:\oss\winpt\src\wptFileManagerDlg.cpp:247
-#: Src/wptFileManagerDlg.cpp:80 Src/wptFileManagerDlg.cpp:281
+#: Src/wptFileManagerDlg.cpp:78 Src/wptFileManagerDlg.cpp:280
msgid "&Text Output"
msgstr "ƒeƒLƒXƒgo—Í(&T)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:71
-#: Src/wptFileManagerDlg.cpp:81
+#: Src/wptFileManagerDlg.cpp:79
msgid "&Wipe Original"
msgstr "Œ´–{‚ð휂·‚é(&W)"
-#: Src/wptFileManagerDlg.cpp:82
+#: Src/wptFileManagerDlg.cpp:80
msgid "Anonymize (throw keyid)"
msgstr "“½–¼‚É‚·‚é(ƒL[ID‚𖳌ø‰»‚É‚·‚é)"
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:71
-#: Src/wptFileManagerDlg.cpp:83
+#: Src/wptFileManagerDlg.cpp:81
msgid "&Select Key for signing"
msgstr "–¼—p‚̃L[‚ð‘I‘ð‚·‚é(&S)"
+# c:\oss\winpt\src\wptGPGOptDlg.cpp:68 c:\oss\winpt\src\wptGPGOptDlg.cpp:74
+# 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:82 Src/wptFileManagerDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:959
+msgid "Options"
+msgstr "ƒIƒvƒVƒ‡ƒ“"
+
# c:\oss\winpt\src\wptFileManagerDlg.cpp:128
-#: Src/wptFileManagerDlg.cpp:145
+#: Src/wptFileManagerDlg.cpp:144
msgid "Please select at least one recipient."
msgstr "‚È‚‚Ä‚àˆêl‚ÌŽóMŽÒ‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:190
# c:\oss\winpt\src\wptKeyManager.cpp:408
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:412
+#: Src/wptFileManagerDlg.cpp:202 Src/wptFileStatDlg.cpp:281
+#: 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/wptFileManagerDlg.cpp:202 Src/wptFileManagerDlg.cpp:216
+#: Src/wptKeyManager.cpp:449
msgid "Key Import"
msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
-#: Src/wptFileManagerDlg.cpp:208
+#: Src/wptFileManagerDlg.cpp:207
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr "%s ‚É‚Í %d ƒL[‚ª‚ ‚è‚Ü‚·B"
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
-#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:211 Src/wptFileManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:932 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptClipImportDlg.cpp:219
-#: Src/wptFileManagerDlg.cpp:241
+#: Src/wptFileManagerDlg.cpp:240
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1728,38 +1738,30 @@
"ƒL[‘®«ƒ_ƒCƒ„ƒƒO‚ð—˜—p‚µ‚ÄÝ’è‚·‚é‚ׂ«‚Å‚·B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:246
-#: Src/wptFileManagerDlg.cpp:280 Src/wptFileManagerDlg.cpp:332
+#: Src/wptFileManagerDlg.cpp:279 Src/wptFileManagerDlg.cpp:331
msgid "File Sign"
msgstr "–¼ƒtƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:248
-#: Src/wptFileManagerDlg.cpp:282
+#: Src/wptFileManagerDlg.cpp:281
msgid "&Normal Signature"
msgstr "•’Ê‚È–¼(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:249
-#: Src/wptFileManagerDlg.cpp:283
+#: Src/wptFileManagerDlg.cpp:282
msgid "&Detached Signature"
msgstr "ƒfƒ^ƒbƒ`ƒh–¼(&D)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:250
-#: Src/wptFileManagerDlg.cpp:284
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Cleartext Signature"
msgstr "•½•ª–¼(&C)"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:136
-#: Src/wptFileManagerDlg.cpp:285
+#: Src/wptFileManagerDlg.cpp:284
msgid "Signature mode"
msgstr "–¼‚̃‚[ƒh"
-# c:\oss\winpt\src\wptGPGOptDlg.cpp:68 c:\oss\winpt\src\wptGPGOptDlg.cpp:74
-# 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
-msgid "Options"
-msgstr "ƒIƒvƒVƒ‡ƒ“"
-
# c:\oss\winpt\src\wptFileManagerDlg.cpp:296
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1082
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1136
@@ -1776,48 +1778,48 @@
# 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:331 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1432
+#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:787
+#: Src/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1520
+#: Src/wptKeyManagerDlg.cpp:1536 Src/wptKeyManagerDlg.cpp:1564
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyserverSearchDlg.cpp:117
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
-#: Src/wptFileManagerDlg.cpp:392
+#: Src/wptFileManagerDlg.cpp:391
msgid "0 Objects marked"
msgstr "ƒ[ƒƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
-#: Src/wptFileManagerDlg.cpp:396
+#: Src/wptFileManagerDlg.cpp:395
#, c-format
msgid "%d Object(s) marked"
msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:550
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:550
msgid "File Manager (use drag & drop to add files)"
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:473 Src/wptKeyManagerDlg.cpp:933
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:949
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:934
msgid "View"
msgstr "ƒrƒ…["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptFileManagerDlg.cpp:476
+#: Src/wptFileManagerDlg.cpp:475
msgid "&Open..."
msgstr "ŠJ‚(&O)..."
# c:\oss\winpt\src\wptFileManagerDlg.cpp:355
-#: Src/wptFileManagerDlg.cpp:477
+#: Src/wptFileManagerDlg.cpp:476
msgid "&Encrypt"
msgstr "ˆÃ†‰»(&E)"
@@ -1827,71 +1829,71 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
# c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManagerDlg.cpp:477 Src/wptFileManagerDlg.cpp:552
msgid "Encrypt into ZIP"
msgstr "ZIP‚ɈƉ»‚·‚é"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:356
-#: Src/wptFileManagerDlg.cpp:479
+#: Src/wptFileManagerDlg.cpp:478
msgid "&Decrypt"
msgstr "•œ†(&D)"
# 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:479 Src/wptKeyManagerDlg.cpp:950
+#: Src/wptKeyManagerDlg.cpp:998
msgid "&Sign"
msgstr "–¼(&S)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:358
# c:\oss\winpt\src\wptFileManagerDlg.cpp:404
# c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
+#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:556
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:359
-#: Src/wptFileManagerDlg.cpp:482
+#: Src/wptFileManagerDlg.cpp:481
msgid "&Verify"
msgstr "Šm”F‚·‚é(&V)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:361
-#: Src/wptFileManagerDlg.cpp:483
+#: Src/wptFileManagerDlg.cpp:482
msgid "S&ymmetric"
msgstr "‹¤’ʈƉ»(&Y)"
# c:\oss\winpt\src\wptClipImportDlg.cpp:181
# c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptFileManagerDlg.cpp:484
+#: Src/wptFileManagerDlg.cpp:483
msgid "&Import"
msgstr "ƒCƒ“ƒ|[ƒg(&I)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:363
-#: Src/wptFileManagerDlg.cpp:485
+#: Src/wptFileManagerDlg.cpp:484
msgid "E&xport"
msgstr "ƒGƒNƒXƒ|[ƒg(&X)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:486 Src/wptMainProc.cpp:419
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:419
msgid "Exit"
msgstr "I—¹"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptFileManagerDlg.cpp:487
+#: Src/wptFileManagerDlg.cpp:486
msgid "&Reset"
msgstr "‰Šú‰»(&R)"
-#: Src/wptFileManagerDlg.cpp:488
+#: Src/wptFileManagerDlg.cpp:487
msgid "Always on Top"
msgstr "‚¢‚‚àÅ‘O–Ê"
-#: Src/wptFileManagerDlg.cpp:489
+#: Src/wptFileManagerDlg.cpp:488
msgid "&Paste"
msgstr "‚Í‚è•t‚¯(&P)"
-#: Src/wptFileManagerDlg.cpp:490
+#: Src/wptFileManagerDlg.cpp:489
msgid "&Select All"
msgstr "‘S‚Ä‚ð‘I‘ð‚·‚é(&S)"
@@ -1915,63 +1917,67 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptFileManagerDlg.cpp:491
+#: Src/wptFileManagerDlg.cpp:490
msgid "&Preferences"
msgstr "ƒJƒXƒ^ƒ€Ý’è(&P)"
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:491 Src/wptFileManagerDlg.cpp:559
msgid "Send as Mail"
msgstr "ƒ[ƒ‹‚Æ‚µ‚Ä‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptFileManagerDlg.cpp:493
+#: Src/wptFileManagerDlg.cpp:492
msgid "&List Packets"
msgstr "ƒpƒPƒbƒg‚̈ꗗ‚Ђ傤(&L)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:360
-#: Src/wptFileManagerDlg.cpp:495
+#: Src/wptFileManagerDlg.cpp:494
msgid "&Wipe"
msgstr "íœ(&W)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:406
-#: Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:558
msgid "Wipe"
msgstr "Žæ‚èÁ‚µ"
-#: Src/wptFileManagerDlg.cpp:561
+#: Src/wptFileManagerDlg.cpp:560
msgid "List Packets"
msgstr "ƒpƒPƒbƒg‚ðƒŠƒXƒg‚·‚é"
# c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptFileManagerDlg.cpp:607
+#: Src/wptFileManagerDlg.cpp:606
msgid "&Calc Digest"
msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
+#: Src/wptFileManagerDlg.cpp:621
+msgid "This command requires admin privileges.\n"
+msgstr ""
+
# c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:762
+#: Src/wptFileManagerDlg.cpp:770
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:771 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:772 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:815
msgid "Operation Status: Error"
msgstr "‘€ìó‹µFƒGƒ‰["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:808
+#: Src/wptFileManagerDlg.cpp:816
msgid "Operation Status: Done."
msgstr "‘€ìó‹µFŠ®—¹B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:851
+#: Src/wptFileManagerDlg.cpp:859
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -2106,7 +2112,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:1724 Src/wptKeyManagerDlg.cpp:960
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -2272,7 +2278,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:1672
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2435,43 +2441,44 @@
# c:\oss\winpt\src\wptKeysigDlg.cpp:302 c:\oss\winpt\src\wptKeysigDlg.cpp:349
# 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/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
+#: Src/wptGroupManager.cpp:244 Src/wptGroupManager.cpp:274
+#: 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:1182 Src/wptKeyManagerDlg.cpp:1195
+#: Src/wptKeyManagerDlg.cpp:1205 Src/wptKeyManagerDlg.cpp:1499
+#: Src/wptKeyManagerDlg.cpp:1521 Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1546 Src/wptKeyManagerDlg.cpp:1554
+#: Src/wptKeyManagerDlg.cpp:1564 Src/wptKeyManagerDlg.cpp:1570
+#: Src/wptKeyManagerDlg.cpp:1580 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptKeyManagerDlg.cpp:1610 Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1701 Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyManagerDlg.cpp:1724 Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1800 Src/wptKeyManagerDlg.cpp:1805
+#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:314 Src/wptKeysigDlg.cpp:388
+#: Src/wptKeysigDlg.cpp:397 Src/wptKeysigDlg.cpp:442 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptGroupManager.cpp:208
+#: Src/wptGroupManager.cpp:245
#, c-format
msgid ""
"Do you really want to delete this group?\n"
@@ -2483,7 +2490,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptGroupManager.cpp:236
+#: Src/wptGroupManager.cpp:272
#, c-format
msgid ""
"Do you really want to delete this entry?\n"
@@ -2564,12 +2571,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:256
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeyEditDlgs.cpp:1197
+#: Src/wptKeyEditDlgs.cpp:1444 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptKeyEditDlgs.cpp:1505 Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1767 Src/wptKeylist.cpp:421 Src/wptKeylist.cpp:455
+#: Src/wptKeyPropsDlg.cpp:159 Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:214
msgid "Revoked"
msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2578,26 +2586,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:258
+#: Src/wptKeyEditDlgs.cpp:1143 Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeylist.cpp:423 Src/wptKeylist.cpp:453 Src/wptKeyPropsDlg.cpp:157
+#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:215
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:459
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:1205
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2607,9 +2615,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:576 Src/wptKeylist.cpp:584
+#: Src/wptKeyManagerDlg.cpp:877 Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr "ƒ†[ƒU[ID"
@@ -2618,8 +2626,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:578 Src/wptKeylist.cpp:587
+#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2629,10 +2637,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:1077
+#: Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:585 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "ƒL[‚ÌID"
@@ -2642,21 +2650,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:1078
+#: Src/wptKeyEditDlgs.cpp:1174 Src/wptKeylist.cpp:591
+#: Src/wptKeyManagerDlg.cpp:884 Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:56
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:586
+#: Src/wptKeyManagerDlg.cpp:879 Src/wptKeyManagerDlg.cpp:971
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."
@@ -2666,52 +2674,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:748
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 Src/wptKeylist.cpp:388
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:1140
+#: 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:260 Src/wptKeyEditDlgs.cpp:1147
msgid "OK"
msgstr "OK"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:288
+#: Src/wptKeyEditDlgs.cpp:282
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:289
+#: Src/wptKeyEditDlgs.cpp:283
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2719,7 +2727,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:364
+#: Src/wptKeyEditDlgs.cpp:355
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 "
@@ -2730,7 +2738,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:356
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2740,8 +2748,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:357 Src/wptKeyEditDlgs.cpp:445
+#: Src/wptKeysignDlg.cpp:283
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2750,12 +2758,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:359
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:383
+#: Src/wptKeyEditDlgs.cpp:374
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2764,25 +2772,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:378 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:406
+#: Src/wptKeyEditDlgs.cpp:911
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:379
#, 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:388 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:392
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2791,7 +2799,7 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:420
+#: Src/wptKeyEditDlgs.cpp:411
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2810,23 +2818,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/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
+#: Src/wptKeyEditDlgs.cpp:412 Src/wptKeyEditDlgs.cpp:479
+#: Src/wptKeyEditDlgs.cpp:562 Src/wptKeyEditDlgs.cpp:736
+#: Src/wptKeyEditDlgs.cpp:1468 Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1625 Src/wptKeyEditDlgs.cpp:1824
+#: Src/wptKeygenDlg.cpp:488 Src/wptKeygenDlg.cpp:604
+#: Src/wptKeyPropsDlg.cpp:361 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:443
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:444
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2834,8 +2842,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:447 Src/wptKeyEditDlgs.cpp:460
+#: Src/wptKeyEditDlgs.cpp:473 Src/wptKeyEditDlgs.cpp:942
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2844,35 +2852,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:460 Src/wptKeyEditDlgs.cpp:1500
+#: Src/wptKeyEditDlgs.cpp:1557 Src/wptKeyEditDlgs.cpp:1602
+#: Src/wptKeyEditDlgs.cpp:1756 Src/wptKeyEditDlgs.cpp:1794
+#: Src/wptKeyEditDlgs.cpp:1980
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:478
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:524
+#: Src/wptKeyEditDlgs.cpp:512
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:526
+#: Src/wptKeyEditDlgs.cpp:514
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:527
+#: Src/wptKeyEditDlgs.cpp:515
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:531
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2880,14 +2888,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:532 Src/wptKeyEditDlgs.cpp:538
#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
-#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
-#: Src/wptKeyEditDlgs.cpp:573
+#: Src/wptKeyEditDlgs.cpp:560
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:537
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2895,43 +2903,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:552
+#: Src/wptKeyEditDlgs.cpp:543
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:547
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:575
+#: Src/wptKeyEditDlgs.cpp:562
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:646 Src/wptKeyEditDlgs.cpp:849
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:661
+#: Src/wptKeyEditDlgs.cpp:647
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:662
+#: Src/wptKeyEditDlgs.cpp:648
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:663
+#: Src/wptKeyEditDlgs.cpp:649
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:709
+#: Src/wptKeyEditDlgs.cpp:695
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2944,18 +2952,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:696 Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:733 Src/wptKeyEditDlgs.cpp:832
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:715
+#: Src/wptKeyEditDlgs.cpp:701
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:735
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2968,40 +2976,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:763 Src/wptKeyEditDlgs.cpp:831
+#: Src/wptKeyEditDlgs.cpp:910 Src/wptKeyEditDlgs.cpp:942
+#: Src/wptKeyEditDlgs.cpp:1022 Src/wptKeyEditDlgs.cpp:1352
+#: Src/wptKeyEditDlgs.cpp:1427 Src/wptKeyEditDlgs.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1553
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:764 Src/wptKeyEditDlgs.cpp:782
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:904
+#: Src/wptKeyEditDlgs.cpp:889
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/wptKeyPropsDlg.cpp:349
+#: Src/wptKeyEditDlgs.cpp:976 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:353
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:979 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:1028
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -3010,19 +3018,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:1050
+#: Src/wptKeyEditDlgs.cpp:1035
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:1039
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:1046 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3031,57 +3039,52 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1073
+#: Src/wptKeyEditDlgs.cpp:1058
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1060
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:1076 Src/wptKeyManagerDlg.cpp:885
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1095
+#: Src/wptKeyEditDlgs.cpp:1079
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
-msgid "Could not find key."
-msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
-#: Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1094
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:1171 Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:589
+#: Src/wptKeyManagerDlg.cpp:882
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1200
+#: Src/wptKeyEditDlgs.cpp:1173
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1181
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1263
+#, fuzzy
msgid ""
-"ADDUID \t\tadd a user ID\r\n"
+"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
"DELUID \t\tdelete a user ID\r\n"
"ADDKEY \t\tadd a secondard key\r\n"
@@ -3093,14 +3096,15 @@
"UPDPREF \t\tupdated preferences\r\n"
"PASSWD \t\tchange the passphrase\r\n"
"PRIMARY \t\tflag user ID as primary\r\n"
-"TRUST\t \t\tchange the ownertrust\r\n"
+"TRUST\t \t\tchange the ownertrust\r\n"
"REVUID \t\trevoke a user ID\r\n"
"REVKEY \t\trevoke a secondary key\r\n"
"DISABLE \t\tdisable a key\r\n"
"ENABLE \t\tenable a key\r\n"
"SIGN\t \t\tsign a user-id (exportable)\r\n"
-"LSIGN\t \t\tsign a user-id (non-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"
@@ -3124,22 +3128,22 @@
"CLEAN \t\t•sˆÀ’è‚Ì–¼‚ðƒL[‚©‚çŠO‚·\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1328
+#: Src/wptKeyEditDlgs.cpp:1285
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1301
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:1309
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:1317
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3157,16 +3161,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1329
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1376
+#: Src/wptKeyEditDlgs.cpp:1333
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1407
+#: Src/wptKeyEditDlgs.cpp:1364
msgid ""
"Key already expired.\n"
"\n"
@@ -3179,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:1373 Src/wptKeyEditDlgs.cpp:1376
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1399
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1405
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:1436
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3207,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:1445
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1464
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1511
+#: Src/wptKeyEditDlgs.cpp:1468
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1533
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1538
+#: Src/wptKeyEditDlgs.cpp:1495
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:1506
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:1512
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3249,55 +3253,55 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1579
+#: Src/wptKeyEditDlgs.cpp:1536
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1540
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1582
msgid "Could not set user ID preferences"
msgstr "ƒ†[ƒU[IDƒIƒvƒVƒ‡ƒ“‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1665
+#: Src/wptKeyEditDlgs.cpp:1622
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1668
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1719
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1723
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1763
+#: Src/wptKeyEditDlgs.cpp:1725
msgid "user ID:"
msgstr "ƒ†[ƒU[IDF"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1726 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:1789
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:1800
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3313,52 +3317,68 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1846
+#: Src/wptKeyEditDlgs.cpp:1820
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeyEditDlgs.cpp:1824
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1955
+#: Src/wptKeyEditDlgs.cpp:1929 Src/wptKeyEditDlgs.cpp:1947
msgid "Finished to compact key."
msgstr "ƒL[‚ðƒRƒ“ƒpƒNƒg‚·‚邱‚Æ‚ªŠ®¬‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:1984
msgid "Do you really want to make this sig exportable?"
msgstr "‚±‚Ì–¼‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
-
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2008 Src/wptKeysignDlg.cpp:392
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
+#: Src/wptKeyEditDlgs.cpp:2071
+#, 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:2119
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:2132
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:2141
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
+# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
+#: Src/wptKeyEditDlgs.cpp:2144
+#, fuzzy
+msgid "&Revoke..."
+msgstr "–³Œø‰»‚«‚Ì‚¤"
+
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2176
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2180
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3418,8 +3438,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:940
+#: Src/wptKeyManagerDlg.cpp:1766 Src/wptKeyPropsDlg.cpp:293
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -3453,11 +3473,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:485 Src/wptKeygenDlg.cpp:581
+#: Src/wptKeyManagerDlg.cpp:1633 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
@@ -3531,7 +3551,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."
@@ -3540,84 +3560,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:558
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:563
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:570
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:488 Src/wptKeygenDlg.cpp:604
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:531
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:532
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:533
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:534
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:535
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"
@@ -3628,7 +3648,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:536
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3641,19 +3661,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:537 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:600
+#: Src/wptKeyManagerDlg.cpp:1656
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:539
msgid "E&xpert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3719,51 +3739,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:386
msgid "Full"
msgstr "ƒtƒ‹"
-#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:425 Src/wptKeylist.cpp:451 Src/wptKeyPropsDlg.cpp:161
msgid "Disabled"
msgstr "–³Œø‰»‚È‚Á‚½"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:433
+#: Src/wptKeylist.cpp:461
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:579 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyManagerDlg.cpp:970
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:590 Src/wptKeyManagerDlg.cpp:883
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "M—p"
@@ -3772,12 +3792,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"
@@ -3793,12 +3813,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"
@@ -3808,12 +3828,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."
@@ -3822,7 +3842,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."
@@ -3831,29 +3851,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?"
@@ -3862,13 +3882,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"
@@ -3879,51 +3899,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
#, c-format
msgid "Could not fetch key from URL: %s"
msgstr "URL'%s'‚æ‚èƒL[‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1082
-#: Src/wptKeyManager.cpp: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"
@@ -3935,7 +3955,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"
@@ -3953,7 +3973,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"
@@ -3964,86 +3984,86 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:781
+#: Src/wptKeyManager.cpp:793
#, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "'0x%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp: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:454 Src/wptKeyManagerDlg.cpp:990
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:475
#, c-format
msgid "Default Key: %s"
msgstr "‹K’èƒL[‚Í: %s"
# c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:458
+#: Src/wptKeyManagerDlg.cpp:477
#, 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:498
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:480
+#: Src/wptKeyManagerDlg.cpp:499
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4054,71 +4074,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:935
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:936 Src/wptKeyManagerDlg.cpp:1220
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:919
+#: Src/wptKeyManagerDlg.cpp:939
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyManagerDlg.cpp:941
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:922
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:923
+#: Src/wptKeyManagerDlg.cpp:943
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:924
+#: Src/wptKeyManagerDlg.cpp:944
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:945
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:927
+#: Src/wptKeyManagerDlg.cpp:947
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:948
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:951 Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:996
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:997
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:993
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:955 Src/wptKeyManagerDlg.cpp:1575
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4126,112 +4146,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:956
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:957
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:958 Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "‘®«(&P)"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:962
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:963
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:964
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:945
+#: Src/wptKeyManagerDlg.cpp:965
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:966 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:985
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:986
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:987
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:988
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:989
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:991
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:999
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:1001
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:1002
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1006
msgid "Key..."
msgstr "ƒL[..."
@@ -4241,24 +4261,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:1007
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:1008
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1009
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:1012
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:1013
msgid "Add"
msgstr "’ljÁ"
@@ -4277,11 +4297,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:1014
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1173
+#: Src/wptKeyManagerDlg.cpp:1193
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -4291,61 +4311,73 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
# c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1184
+#: Src/wptKeyManagerDlg.cpp:1204
msgid "Could not set keylist window procedure."
msgstr "ƒL[ƒŠƒXƒgƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
+#: Src/wptKeyManagerDlg.cpp:1221
+#, fuzzy
+msgid "&Show"
+msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
+
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
+#: Src/wptKeyManagerDlg.cpp:1222
+#, fuzzy
+msgid "&New..."
+msgstr "ŠJ‚(&O)..."
+
# c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1301
+#: Src/wptKeyManagerDlg.cpp:1327
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1305
+#: Src/wptKeyManagerDlg.cpp:1331
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1309
+#: Src/wptKeyManagerDlg.cpp:1335
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1313
+#: Src/wptKeyManagerDlg.cpp:1339
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1317
+#: Src/wptKeyManagerDlg.cpp:1343
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1321
+#: Src/wptKeyManagerDlg.cpp:1347
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:1351
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:1355
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:1359
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1460
+#: Src/wptKeyManagerDlg.cpp:1486
msgid "New"
msgstr "V‹Kì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1498
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4357,15 +4389,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:1529 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:1545
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4376,31 +4408,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:1559 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:1569
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:1586
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:1601 Src/wptKeyPropsDlg.cpp:289
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1585
+#: Src/wptKeyManagerDlg.cpp:1611
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4409,34 +4441,34 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1615
+#: Src/wptKeyManagerDlg.cpp:1641
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:1664 Src/wptKeyserverDlg.cpp:568
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:1681
msgid "GnuPG Options"
msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1723
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:1728
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:1733
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -4455,15 +4487,21 @@
"‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1712
+#: Src/wptKeyManagerDlg.cpp:1738
msgid "WARNING"
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1775
+#: Src/wptKeyManagerDlg.cpp:1799
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
+# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
+#: Src/wptKeyManagerDlg.cpp:1804
+#, fuzzy
+msgid "Keyserver refresh finished."
+msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
+
# c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:65
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:83
#: Src/wptKeyPropsDlg.cpp:67
@@ -4471,21 +4509,21 @@
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 "–³–¼"
-#: Src/wptKeyPropsDlg.cpp:213
+#: Src/wptKeyPropsDlg.cpp:208
#, c-format
msgid "Card-Type: %s\r\n"
msgstr "ƒJ[ƒhƒ^ƒCƒv: %s\r\n"
-#: Src/wptKeyPropsDlg.cpp:240
-#, c-format
+#: Src/wptKeyPropsDlg.cpp:247
+#, fuzzy, c-format
msgid ""
"Type: %s\r\n"
-"Key ID: %s\r\n"
+"Key ID: 0x%s\r\n"
"Algorithm: %s\r\n"
"Size: %s bits\r\n"
"Created: %s\r\n"
@@ -4505,26 +4543,26 @@
"%s\r\n"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyPropsDlg.cpp:286
+#: Src/wptKeyPropsDlg.cpp:290
msgid "&Change"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyPropsDlg.cpp:291
msgid "&Revokers"
msgstr "–³Œø‰»‚«‚Ì‚¤(&R)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Change &Password"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX(&P)"
-#: Src/wptKeyPropsDlg.cpp:295
+#: Src/wptKeyPropsDlg.cpp:299
msgid "Photo-ID not validated."
msgstr "ƒtƒHƒgID—LŒø‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:171
-#: Src/wptKeyPropsDlg.cpp:333
+#: Src/wptKeyPropsDlg.cpp:337
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -4534,12 +4572,12 @@
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:173
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:180
-#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
+#: Src/wptKeyPropsDlg.cpp:339 Src/wptKeyPropsDlg.cpp:346
msgid "WinPT Warning"
msgstr "WinPT Œx"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:177
-#: Src/wptKeyPropsDlg.cpp:339
+#: Src/wptKeyPropsDlg.cpp:343
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -4551,35 +4589,35 @@
"–{“–‚ÉŒp‘±‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:208
-#: Src/wptKeyPropsDlg.cpp:356
+#: Src/wptKeyPropsDlg.cpp:360
msgid "Ownertrust successfully changed."
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚ͳ‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
+#: Src/wptKeyPropsDlg.cpp:373 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"
@@ -4591,69 +4629,79 @@
"‚ª‚Å‚«‚Ü‚·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:59
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
-#, c-format
-msgid "Do you want to retrieve 0x%s via the default keyserver?"
+#: Src/wptKeyRevokersDlg.cpp:176
+#, fuzzy, c-format
+msgid "Do you want to retrieve %s via the default keyserver?"
msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å 0x%s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
-# c:\oss\winpt\src\wptKeyserver.cpp:271
-#: Src/wptKeyserver.cpp:346
-msgid "The network subsystem has failed"
-msgstr "ƒlƒbƒgƒ[ƒNƒTƒuƒVƒXƒeƒ€‚ªáŠQ‚µ‚Ä‚¢‚Ü‚·B"
+#: Src/wptKeyserver.cpp:363
+msgid "Network unreachable"
+msgstr ""
-# c:\oss\winpt\src\wptKeyserver.cpp:272
-#: Src/wptKeyserver.cpp:348
-msgid "Authoritative Answer Host not found"
-msgstr "M—Š‚Å‚«‚éƒAƒ“ƒT[ƒzƒXƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
+#: Src/wptKeyserver.cpp:366
+#, fuzzy
+msgid "Host unreachable"
+msgstr "ƒzƒXƒg"
-# c:\oss\winpt\src\wptKeyserver.cpp:273
-#: Src/wptKeyserver.cpp:350
-msgid "The connection has been dropped because of a network failure"
-msgstr "ƒlƒbƒgƒ[ƒNáŠQ‚Ì‚½‚ßÚ‘±‚ªØ’f‚³‚ê‚Ä‚¢‚Ü‚·B"
+# c:\oss\winpt\src\wptErrors.cpp:84
+#: Src/wptKeyserver.cpp:369
+#, fuzzy
+msgid "Could not resolve host name"
+msgstr "ƒzƒXƒg–¼‚ð‘ÅŠJ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-# c:\oss\winpt\src\wptKeyserver.cpp:274
-#: Src/wptKeyserver.cpp:352
-#, c-format
-msgid "Unknown Winsock error ec=%d"
-msgstr "–¢’m‚ÌWinsockƒGƒ‰[ ec=%d"
+#: Src/wptKeyserver.cpp:372
+msgid "Connection refused"
+msgstr ""
+#: Src/wptKeyserver.cpp:376
+msgid "Connection timeout"
+msgstr ""
+
+#: Src/wptKeyserver.cpp:380
+msgid "Connection resetted by peer"
+msgstr ""
+
+#: Src/wptKeyserver.cpp:383
+msgid "Socket has been shutdown"
+msgstr ""
+
# c:\oss\winpt\src\wptPreferencesDlg.cpp:221
-#: Src/wptKeyserver.cpp:540
+#: Src/wptKeyserver.cpp:572
msgid "Could not save keyserver.conf file"
msgstr "keyserver.confƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyserver.cpp:436
-#: Src/wptKeyserver.cpp:585
+#: Src/wptKeyserver.cpp:617
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -4662,12 +4710,12 @@
"ƒvƒƒNƒV[‚Ì”FØI"
# c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserver.cpp:588
+#: Src/wptKeyserver.cpp:620
msgid "Proxy Error"
msgstr "ƒvƒƒNƒV[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:462
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:644
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -4690,27 +4738,27 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserver.cpp:616
+#: Src/wptKeyserver.cpp:646
msgid "Keyserver Error"
msgstr "ƒL[ƒT[ƒo[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:473
-#: Src/wptKeyserver.cpp:640
+#: Src/wptKeyserver.cpp:670
msgid "The keyserver limit is exceeded"
msgstr "ƒL[ƒT[ƒo[‚̧ŒÀ‚ª’´‚¦‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserver.cpp:641
+#: Src/wptKeyserver.cpp:671
msgid "Keyserver Warning"
msgstr "ƒL[ƒT[ƒo[Œx"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:89
-#: Src/wptKeyserverDlg.cpp:100
+#: Src/wptKeyserverDlg.cpp:101
#, c-format
msgid "Key '%s' successfully sent"
msgstr "'%s' ƒL[‚Ì‘—M‚ª¬Œ÷‚µ‚Ü‚µ‚½B"
-#: Src/wptKeyserverDlg.cpp:134
+#: Src/wptKeyserverDlg.cpp:135
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -4719,12 +4767,12 @@
"\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:161
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:140
msgid "Key(s) successfully received but nothing was changed."
msgstr "ƒL[‚ÌŽóM‚ɬŒ÷‚µ‚Ü‚µ‚½‚ªA‚Å‚à‰½‚à•Ï‚í‚Á‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:166
-#: Src/wptKeyserverDlg.cpp:141
+#: Src/wptKeyserverDlg.cpp:142
msgid "Key(s) sucessfully received and imported."
msgstr "ƒL[‚ÌŽóM‚ª¬Œ÷‚µAƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
@@ -4739,12 +4787,12 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptKeyserverDlg.cpp:157
+#: Src/wptKeyserverDlg.cpp:158
msgid "Imported Keys"
msgstr "ƒCƒ“ƒ|[ƒg‚µ‚½ƒL["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:116
-#: Src/wptKeyserverDlg.cpp:187
+#: Src/wptKeyserverDlg.cpp:184
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -4755,36 +4803,36 @@
"”F‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:127
-#: Src/wptKeyserverDlg.cpp:199
+#: Src/wptKeyserverDlg.cpp:196
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "FINGERƒL[‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %s\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyserverDlg.cpp:213
+#: Src/wptKeyserverDlg.cpp:210
msgid "This is not a valid OpenPGP key."
msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:368
+#: Src/wptKeyserverDlg.cpp:352
msgid "Please select one of the servers."
msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:373
+#: Src/wptKeyserverDlg.cpp:357
msgid "Only HTTP keyserver can be used."
msgstr "HTTPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:390
+#: Src/wptKeyserverDlg.cpp:374
msgid "DNS Name"
msgstr "DNS–¼"
-#: Src/wptKeyserverDlg.cpp:391
+#: Src/wptKeyserverDlg.cpp:375
msgid "Port"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:476
+#: Src/wptKeyserverDlg.cpp:459
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4803,12 +4851,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:480
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:498
+#: Src/wptKeyserverDlg.cpp:481
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4827,7 +4875,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:482
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4846,74 +4894,74 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:758
+#: Src/wptKeyserverDlg.cpp:507 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:741
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:508 Src/wptKeyserverDlg.cpp:600
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:510
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:511
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:512
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:520
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:542
+#: Src/wptKeyserverDlg.cpp:525
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:569 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "ŽóM(&R)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:571
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:573
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:574
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:575
msgid "C&hange proxy"
msgstr "ƒvƒƒNƒV[•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:593
+#: Src/wptKeyserverDlg.cpp:576
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:601
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:602
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4921,7 +4969,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:628 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
@@ -4931,33 +4979,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:635 Src/wptKeyserverDlg.cpp:666
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:643
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:650 Src/wptKeyserverDlg.cpp:682
msgid "Please enter the search pattern."
msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:687
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:693
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:699
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
@@ -4973,7 +5021,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[ŒŸõ"
@@ -5006,22 +5054,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:216
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:212
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:213
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:55
msgid "Class"
msgstr "ƒNƒ‰ƒX"
@@ -5030,70 +5078,82 @@
# 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:178 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysigDlg.cpp:396
-#: Src/wptKeysigDlg.cpp:283
+#: Src/wptKeysigDlg.cpp:313
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:347 Src/wptSigTreeDlg.cpp:111
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:348
msgid "Signing &Key Properties"
msgstr "ƒL[‚Ì‘®«‚𖼂·‚é(&K)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:357
+#: Src/wptKeysigDlg.cpp:387
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:397
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:424
#, c-format
msgid "Signature List for \"%s\""
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeysigDlg.cpp:333
-#: Src/wptKeysigDlg.cpp:399
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
+# c:\oss\winpt\src\wptFileManager.cpp:1026
+#: Src/wptKeysignDlg.cpp:72
+#, fuzzy, c-format
+msgid "%d-bit %s key, ID 0x%s"
+msgstr "%s ƒL[ID‚ðŽg—p 0x%s"
+
# 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‘ð‚·‚é"
@@ -5134,7 +5194,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"
@@ -5156,52 +5216,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 "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
# 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"
@@ -5304,35 +5364,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"
@@ -5368,27 +5428,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"
@@ -5398,7 +5458,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"
@@ -5410,7 +5470,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"
@@ -5422,7 +5482,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"
@@ -5735,23 +5795,23 @@
msgstr "ƒŒƒMƒXƒgƒŠ‚É‘‚‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptSigList.cpp:42
-#: Src/wptSigList.cpp:52
+#: Src/wptSigList.cpp:54
msgid "Valid"
msgstr "—LŒø"
# c:\oss\winpt\src\wptSigList.cpp:46
-#: Src/wptSigList.cpp:56
+#: Src/wptSigList.cpp:58
msgid "Expiration"
msgstr "ŠúŒÀ"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptSigTreeDlg.cpp:164
+#: Src/wptSigTreeDlg.cpp:159
#, c-format
msgid "Signature Tree for \"%s\" (0x%s)"
msgstr "ˆÈ‰º—p‚Ì–¼ƒcƒŠ[\"%s\" (0x%s)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptSigTreeDlg.cpp:167
+#: Src/wptSigTreeDlg.cpp:161
msgid "Edit..."
msgstr "•ÒW..."
@@ -5780,6 +5840,27 @@
msgid "Signed"
msgstr "–¼‚µ‚Ü‚µ‚½"
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
+#~ msgid "Could not find key."
+#~ msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
+# c:\oss\winpt\src\wptKeyserver.cpp:271
+#~ msgid "The network subsystem has failed"
+#~ msgstr "ƒlƒbƒgƒ[ƒNƒTƒuƒVƒXƒeƒ€‚ªáŠQ‚µ‚Ä‚¢‚Ü‚·B"
+
+# c:\oss\winpt\src\wptKeyserver.cpp:272
+#~ msgid "Authoritative Answer Host not found"
+#~ msgstr "M—Š‚Å‚«‚éƒAƒ“ƒT[ƒzƒXƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
+# c:\oss\winpt\src\wptKeyserver.cpp:273
+#~ msgid "The connection has been dropped because of a network failure"
+#~ msgstr "ƒlƒbƒgƒ[ƒNáŠQ‚Ì‚½‚ßÚ‘±‚ªØ’f‚³‚ê‚Ä‚¢‚Ü‚·B"
+
+# c:\oss\winpt\src\wptKeyserver.cpp:274
+#~ msgid "Unknown Winsock error ec=%d"
+#~ msgstr "–¢’m‚ÌWinsockƒGƒ‰[ ec=%d"
+
# c:\oss\winpt\src\wptMAPI.cpp:89
#~ msgid "GPG Public Key of %s"
#~ msgstr "GPGŒöŠJŒ®‚Ì %s"
@@ -5874,10 +5955,6 @@
#~ msgid "%s (%s/0x%s)"
#~ msgstr "%s i%s/0x%sj"
-# c:\oss\winpt\src\wptFileManager.cpp:1026
-#~ msgid "%s using keyID 0x%s"
-#~ msgstr "%s ƒL[ID‚ðŽg—p 0x%s"
-
# c:\oss\winpt\src\wptFirstRunDlg.cpp:44
#~ msgid "&Specify a directory from which to access existing GPG keyrings"
#~ msgstr "Šù‘¶GPGƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚éƒfƒBƒŒƒNƒgƒŠ[‚ðŽw’è‚·‚éB(&S)"
@@ -6110,10 +6187,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-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/ChangeLog 2006-05-07 12:36:48 UTC (rev 211)
@@ -1,3 +1,20 @@
+2006-05-07 Timo Schulz <ts at g10code.de>
+
+ * wptKeyserverDlg.cpp (hkp_err_box): Improved.
+ * wptKeyserver.cpp (wsock_strerror): Likewise.
+ * wptKeygenCBDlg.cpp (keygen_cb_dlg_destroy): New param.
+ Change all callers.
+
+2006-05-06 Timo Schulz <ts at g10code.de>
+
+ * wptKeyManagerDlg.cpp (reload_keycache): Use pre-defined
+ sorting order if available.
+ * wptKeyPropsDlg.cpp (key_props_dlg_proc): Use 0x prefix
+ for the key ID.
+ (get_pref_cipher): Differ between the AES algorithm IDs.
+ (key_is_valid): New.
+ * wptKeyserverDlg.cpp (check_pattern): Simplified.
+
2006-05-03 Timo Schulz <ts at g10code.de>
* wptKeyCache.cpp (keycache_prepare2): Fix possible segv.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/WinPT-en.rc 2006-05-07 12:36:48 UTC (rev 211)
@@ -2124,7 +2124,9 @@
POPUP "Groups", GRAYED
BEGIN
MENUITEM "New...", ID_GROUP_NEW
- MENUITEM "Import...", ID_GROUP_IMPORT
+ MENUITEM "Delete...", ID_GROUP_DELETE
+ MENUITEM SEPARATOR
+ MENUITEM "Show", ID_GROUP_SHOW
END
MENUITEM "Key&server", ID_KEYMISC_SENDRECV
POPUP "&GPG"
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/resource.h 2006-05-07 12:36:48 UTC (rev 211)
@@ -824,13 +824,14 @@
#define ID_KSERVCTX_DEL 40183
#define ID_KSERVCTX_EDIT 40184
#define ID_KEYMISC_VIEWDESC 40185
+#define ID_GROUP_SHOW 40186
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 246
-#define _APS_NEXT_COMMAND_VALUE 40186
+#define _APS_NEXT_COMMAND_VALUE 40187
#define _APS_NEXT_CONTROL_VALUE 1530
#define _APS_NEXT_SYMED_VALUE 101
#endif
Modified: trunk/Src/wptCommonDlg.cpp
===================================================================
--- trunk/Src/wptCommonDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptCommonDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -20,9 +20,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
-#include <windows.h>
#include <ctype.h>
+#include <windows.h>
#include "resource.h"
#include "wptTypes.h"
@@ -39,7 +38,7 @@
check_URL (const char *buf)
{
size_t i;
- const char *allowed = "-./#_:";
+ const char *allowed = "-./#_:~&?=";
if (!strchr (buf, ':'))
return -1;
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptFileManager.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -407,15 +407,13 @@
int
fm_state_new (fm_state_t * ctx)
{
- gpgme_error_t rc;
fm_state_s *c;
c = new fm_state_s;
if (!c)
BUG (0);
memset (c, 0, sizeof *c);
- rc = gpgme_new (&c->ctx);
- if (rc)
+ if (gpgme_new (&c->ctx))
BUG (0);
*ctx = c;
return 0;
Modified: trunk/Src/wptGPGME.cpp
===================================================================
--- trunk/Src/wptGPGME.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptGPGME.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -41,6 +41,7 @@
BOOL CALLBACK keycache_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam);
void progress_cleanup (progress_filter_s * pfx);
+/* Global GPG key cache contexts. */
static gpg_keycache_t pub = NULL;
static gpg_keycache_t sec = NULL;
static char *gpg_secring = NULL;
@@ -80,11 +81,8 @@
gpg_keycache_release (sec);
sec = NULL;
}
- if (cleanup) {
- if (gpg_secring)
- free (gpg_secring);
- gpg_secring = NULL;
- }
+ if (cleanup)
+ safe_free (gpg_secring);
}
@@ -168,7 +166,7 @@
/* Get the GPG key with keyid @keyid from the cache. Return it
in @r_key on success. */
-static int
+static gpgme_error_t
get_key_from_cache (const char *keyid, gpgme_key_t *r_key,
struct keycache_s **c, int secret)
{
@@ -177,23 +175,21 @@
int mode = secret? KEYCACHE_PRV : KEYCACHE_PUB;
if (!keyid)
- return WPTERR_GENERAL;
+ return gpg_error (GPG_ERR_INV_VALUE);
if (r_key)
*r_key = NULL;
cache = keycache_get_ctx (mode);
- if (!cache)
- BUG (0);
if (!c)
err = gpg_keycache_find_key (cache, keyid, 0, r_key);
else
err = gpg_keycache_find_key2 (cache, keyid, 0, r_key, c);
- return err? WPTERR_GENERAL : 0;
+ return err;
}
/* Get GPG key with keyid @keyid directly from GPG and return
it in @r_key on success. */
-static int
+static gpgme_error_t
get_key_directly (const char *keyid, gpgme_key_t *r_key, int secret)
{
gpgme_ctx_t ctx;
@@ -201,52 +197,53 @@
err = gpgme_new (&ctx);
if (err)
- return WPTERR_GENERAL;
+ return err;
err = gpgme_get_key (ctx, keyid, r_key, secret);
gpgme_release (ctx);
- return err? WPTERR_GENERAL : 0;
+ return err;
}
/* Search the public key with @keyid as the keyid in the cache and
return the item in @k. */
-int
+gpgme_error_t
winpt_get_pubkey (const char *keyid, winpt_key_s *k)
{
- int rc;
+ gpgme_error_t err;
- rc = get_key_from_cache (keyid, &k->ctx, &k->ext, 0);
- if (rc)
- return rc;
+ err = get_key_from_cache (keyid, &k->ctx, &k->ext, 0);
+ if (err)
+ return err;
k->is_v3 = k->ctx->subkeys->pubkey_algo == GPGME_PK_RSA &&
strlen (k->ctx->subkeys->fpr) == 32;
k->is_protected = k->ext->gloflags.is_protected;
k->keyid = k->ctx->subkeys->keyid;
k->uid = k->ctx->uids->uid;
- return rc;
+ return 0;
}
-int
+gpgme_error_t
winpt_get_seckey (const char *keyid, winpt_key_s *k)
{
- int rc;
- rc = get_key_from_cache (keyid, &k->ctx, &k->ext, 1);
- if (rc)
- return rc;
+ gpgme_error_t err;
+
+ err = get_key_from_cache (keyid, &k->ctx, &k->ext, 1);
+ if (err)
+ return err;
k->is_v3 = k->ctx->subkeys->pubkey_algo == GPGME_PK_RSA &&
strlen (k->ctx->subkeys->fpr) == 32;
k->is_protected = k->ext->gloflags.is_protected;
k->keyid = k->ctx->subkeys->keyid;
k->uid = k->ctx->uids->uid;
- return rc;
+ return 0;
}
-int
+gpgme_error_t
get_pubkey (const char *keyid, gpgme_key_t *ret_key)
{
- int rc;
+ gpgme_error_t rc;
if (pub && sec)
rc = get_key_from_cache (keyid, ret_key, NULL, 0);
@@ -256,10 +253,10 @@
}
-int
+gpgme_error_t
get_seckey (const char *keyid, gpgme_key_t *ret_skey)
{
- int rc;
+ gpgme_error_t rc;
if (pub && sec)
rc = get_key_from_cache (keyid, ret_skey, NULL, 1);
@@ -279,8 +276,6 @@
int n=0;
pc = keycache_get_ctx (1);
- if (!pc)
- BUG (0);
while (!gpg_keycache_next_key (pc, 0, &key)) {
if (key->subkeys->pubkey_algo == GPGME_PK_ELG)
n++;
Modified: trunk/Src/wptGPGParser.cpp
===================================================================
--- trunk/Src/wptGPGParser.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptGPGParser.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -1,5 +1,5 @@
/* wptGPGParser.cpp - GPG config file parser
- * Copyright (C) 2002, 2003, 2004 Timo Schulz
+ * Copyright (C) 2002, 2003, 2004, 2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -23,7 +23,6 @@
#endif
#include <stdio.h>
-#include <stdio.h>
#include <string.h>
#include <windows.h>
@@ -33,213 +32,206 @@
#include "wptErrors.h"
static void
-add_opaque_option (gpg_optfile_t opt, const char * line, int used)
+add_option (gpg_option_t *list, gpg_option_t n)
{
- gpg_option_t e, t;
+ gpg_option_t t;
+ if (!*list)
+ *list = n;
+ else {
+ for (t = *list; t->next; t = t->next)
+ ;
+ t->next = n;
+ }
+}
+
+static gpg_option_t
+new_option (void)
+{
+ gpg_option_t e;
+
e = new gpg_option_s;
if (!e)
- BUG (0);
- memset (e, 0, sizeof *e);
+ BUG (0);
+ memset (e, 0, sizeof (e));
+ return e;
+}
+
+
+static void
+add_opaque_option (gpg_optfile_t opt, const char *line, int used)
+{
+ gpg_option_t e;
+
+ e = new_option ();
e->used = used > 0? 1 : 0;
e->name = m_strdup (line);
e->type = ENTRY_OPAQUE;
- if (!opt->list)
- opt->list = e;
- else {
- for (t = opt->list; t->next; t = t->next)
- ;
- t->next = e;
- }
-} /* add_opaque_option */
+ add_option (&opt->list, e);
+}
static void
-add_single_option (gpg_optfile_t opt, const char * name, int used)
+add_single_option (gpg_optfile_t opt, const char *name, int used)
{
- gpg_option_t e, t;
+ gpg_option_t e;
- e = new gpg_option_s;
- if (!e)
- BUG (0);
- memset (e, 0, sizeof *e);
+ e = new_option ();
e->used = used > 0? 1 : 0;
e->name = m_strdup (name);
e->type = ENTRY_SINGLE;
- if (!opt->list)
- opt->list = e;
- else {
- for (t = opt->list; t->next; t = t->next)
- ;
- t->next = e;
- }
-} /* add_single_option */
+ add_option (&opt->list, e);
+}
static int
-add_group_option( gpg_optfile_t opt, const char *name, int used )
+add_group_option (gpg_optfile_t opt, const char *name, int used)
{
- gpg_option_t e, t;
+ gpg_option_t e;
- e = new gpg_option_s;
- if( !e )
- BUG( NULL );
- memset( e, 0, sizeof *e );
+ e = new_option ();
e->used = used > 0? 1 : 0;
- e->name = m_strdup( name );
- e->type = ENTRY_GROUP;
- if( !opt->list )
- opt->list = e;
- else {
- for( t = opt->list; t->next; t = t->next )
- ;
- t->next = e;
- }
+ e->name = m_strdup (name);
+ e->type = ENTRY_GROUP;
+ add_option (&opt->list, e);
return 0;
-} /* add_group_option */
+}
static size_t
-count_whitespaces( char *line )
+count_whitespaces (char *line)
{
- size_t i = 0, ncount = 0;
+ size_t i;
+ size_t ncount = 0;
- if( !strchr( line, ' ' ) )
+ if (!strchr (line, ' '))
return 0;
- for( i = 0; i < strlen( line ); i++ ) {
- if( line[i] == ' ' )
+ for( i = 0; i < strlen (line); i++) {
+ if (line[i] == ' ')
ncount++;
}
-
return ncount;
-} /* count_whitespaces */
+}
static int
-add_multi_option( gpg_optfile_t opt, char *line, int used )
+add_multi_option (gpg_optfile_t opt, char *line, int used)
{
- gpg_option_t e ,t;
+ gpg_option_t e;
char *p;
int state = 0;
- e = new gpg_option_s;
- if( !e )
- BUG( NULL );
- memset( e, 0, sizeof *e );
- if( count_whitespaces( line ) == 1 ) {
- while( (p = strsep( &line, " " )) && state != 2 ) {
- switch( state ) {
- case 0: e->name = m_strdup( p ); break;
- case 1: e->val = m_strdup( p ); break;
+ e = new_option ();
+ if (count_whitespaces (line) == 1) {
+ while ((p = strsep (&line, " ")) && state != 2) {
+ switch (state) {
+ case 0: e->name = m_strdup (p); break;
+ case 1: e->val = m_strdup (p); break;
}
state++;
}
}
else {
- p = strchr( line, ' ' );
+ p = strchr (line, ' ');
+ if (!p)
+ return -1;
state = p - line;
e->name = new char[state + 1];
- if( !e->name )
- BUG( NULL );
- memcpy( e->name, line, state );
+ if (!e->name)
+ BUG (NULL);
+ memcpy (e->name, line, state);
e->name[state] = '\0';
- strncpy( e->name, line, state );
- e->val = m_strdup( line + state + 1 );
+ strncpy (e->name, line, state);
+ e->val = m_strdup (line + state + 1);
}
e->used = used;
e->type = ENTRY_MULTI;
- if( !opt->list )
- opt->list = e;
- else {
- for( t=opt->list; t->next; t = t->next )
- ;
- t->next = e;
- }
+ add_option (&opt->list, e);
+
return 0;
-} /* add_multi_option */
+}
static gpg_group_t
-new_group (gpg_group_t * grp, const char * name)
+new_group (gpg_group_t *grp, const char *name)
{
gpg_group_t g, t;
g = new gpg_group_s;
- if( !g )
- BUG( NULL );
- memset( g, 0, sizeof *g );
+ if (!g)
+ BUG (NULL);
+ memset (g, 0, sizeof *g);
g->used = 1;
- g->name = m_strdup( name );
- if( !*grp )
+ g->name = m_strdup (name);
+ if (!*grp)
*grp = g;
else {
- for( t = *grp; t->next; t = t->next )
+ for (t = *grp; t->next; t = t->next)
;
t->next = g;
}
return g;
-} /* new_group */
+}
static const char*
-_add_group( gpg_optfile_t opt, const char *line )
+group_from_cfgfile (gpg_optfile_t opt, const char *line)
{
char *p, *buf, *buf2, *name = NULL;
gpg_group_t g;
gpg_member_t m = NULL, t;
- p = strchr( line, '=' );
- if( p == NULL || strncmp( line, "group ", 6 ) )
+ p = strchr (line, '=');
+ if (!p || strncmp (line, "group ", 6))
return NULL;
- buf = m_strdup( line + (p - line + 1) );
- if( !buf )
- BUG( NULL );
+ buf = m_strdup (line + (p - line + 1));
line += 6;
- p = strchr( line, '=' );
- if( p ) {
+ p = strchr (line, '=');
+ if (p) {
size_t pos = p - line;
name = new char[pos + 1];
- if( !name )
+ if (!name)
BUG( NULL );
- memset( name, 0, pos+1 );
- strncpy( name, line, pos );
+ memset (name, 0, pos+1);
+ strncpy (name, line, pos);
}
- g = new_group( &opt->grp, name );
+ g = new_group (&opt->grp, name);
buf2 = buf;
- while( (p = strsep( &buf2, " " )) && *p ) {
- m = new gpg_member_s;
- if( !m )
- BUG( NULL );
- memset( m, 0, sizeof *m );
+ while ((p = strsep (&buf2, " ")) && *p) {
+ m = new gpg_member_s;
+ if (!m)
+ BUG (0);
+ memset (m, 0, sizeof *m);
m->used = 1;
- m->name = m_strdup( p );
- if( !g->list )
+ m->name = m_strdup (p);
+ if (!g->list)
g->list = m;
else {
- for( t=g->list; t->next; t = t->next )
+ for (t=g->list; t->next; t = t->next)
;
t->next = m;
}
}
- free_if_alloc( buf );
- if( !m )
+ free_if_alloc (buf);
+ if (!m)
return NULL;
return g->name;
-} /* _add_group */
+}
+
void
-release_group( gpg_group_t grp )
+release_group (gpg_group_t grp)
{
gpg_member_t m, m2;
m = grp->list;
- while( m ) {
+ while (m) {
m2 = m->next;
- free_if_alloc( m->name );
- free_if_alloc( m );
+ free_if_alloc (m->name);
+ free_if_alloc (m);
m = m2;
}
-} /* release_group */
+}
void
@@ -247,36 +239,36 @@
{
if (!opt)
return;
- free_if_alloc( opt->name );
- free_if_alloc( opt->val );
- free_if_alloc( opt );
+ free_if_alloc (opt->name);
+ free_if_alloc (opt->val);
+ free_if_alloc (opt );
}
void
-release_gpg_options( gpg_optfile_t opt )
+release_gpg_options (gpg_optfile_t opt)
{
gpg_option_t e, e2;
gpg_group_t g, g2;
e = opt->list;
- while( e ) {
+ while (e) {
e2 = e->next;
release_option (e);
e = e2;
}
g = opt->grp;
- while( g ) {
+ while (g) {
g2 = g->next;
- release_group( g );
+ release_group (g);
g = g2;
}
- free_if_alloc( opt );
-} /* release_gpg_options */
+ free_if_alloc (opt);
+}
int
-commit_gpg_options (const char * file, gpg_optfile_t opt)
+commit_gpg_options (const char *file, gpg_optfile_t opt)
{
FILE *inp;
gpg_option_t e;
@@ -284,50 +276,50 @@
gpg_member_t m;
inp = fopen (file, "w+b");
- if( !inp )
- return -1;
- for( e = opt->list; e; e = e->next ) {
- if( !e->used )
+ if (!inp)
+ return WPTERR_FILE_OPEN;
+ for (e = opt->list; e; e = e->next) {
+ if (!e->used)
continue;
- switch( e->type ) {
+ switch (e->type) {
case ENTRY_OPAQUE:
- fprintf( inp, "%s", e->name );
+ fprintf (inp, "%s", e->name);
break;
case ENTRY_MULTI:
- fprintf( inp, "%s %s\r\n", e->name, e->val );
+ fprintf (inp, "%s %s\r\n", e->name, e->val);
break;
case ENTRY_SINGLE:
- fprintf( inp, "%s\r\n", e->name );
+ fprintf (inp, "%s\r\n", e->name);
break;
case ENTRY_GROUP:
- g = find_group( opt, e->name );
- if( g && g->used ) {
- fprintf( inp, "group %s=", g->name );
- for( m = g->list; m; m = m->next ) {
- if( m->used )
- fprintf( inp, "%s ", m->name );
+ g = find_group (opt, e->name);
+ if (g && g->used) {
+ fprintf (inp, "group %s=", g->name);
+ for (m = g->list; m; m = m->next) {
+ if (m->used)
+ fprintf (inp, "%s ", m->name);
}
- fprintf( inp, "\r\n" );
+ fprintf (inp, "\r\n");
}
break;
}
}
fclose (inp);
return 0;
-} /* commit_gpg_options */
+}
int
-parse_gpg_options( const char *file, gpg_optfile_t *r_opt )
+parse_gpg_options (const char *file, gpg_optfile_t *r_opt )
{
FILE *inp;
char buf[1024], *p;
gpg_optfile_t opt = NULL;
- inp = fopen( file, "rb" );
+ inp = fopen( file, "rb");
if( inp == NULL ) {
inp = fopen( file, "wb" );
if( inp == NULL )
@@ -352,22 +344,22 @@
if( !strchr( p, ' ' ) )
add_single_option( opt, p, 1 );
else if( !strncmp( p, "group", 5 ) ) {
- const char *s = _add_group( opt, p );
- if( s )
- add_group_option( opt, s, 1 );
+ const char *s = group_from_cfgfile (opt, p);
+ if (s)
+ add_group_option (opt, s, 1);
}
else
- add_multi_option( opt, p, 1 );
+ add_multi_option (opt, p, 1);
}
- fclose( inp );
- if( r_opt )
+ fclose (inp);
+ if (r_opt)
*r_opt = opt;
return 0;
-} /* parse_gpg_options */
+}
gpg_option_t
-find_option (gpg_optfile_t opt, const char * str)
+find_option (gpg_optfile_t opt, const char *str)
{
gpg_option_t e;
@@ -379,170 +371,154 @@
}
return e;
-} /* find_option */
+}
gpg_group_t
-find_group( gpg_optfile_t opt, const char *str )
+find_group (gpg_optfile_t opt, const char *str)
{
gpg_group_t g;
- for( g = opt->grp; g; g = g->next ) {
- if( !stricmp( g->name, str ) )
+ for (g = opt->grp; g; g = g->next) {
+ if (!stricmp( g->name, str))
break;
}
return g;
-} /* find_group */
+}
gpg_member_t
-find_member( gpg_optfile_t opt, const char *grp, const char *str )
+find_member (gpg_optfile_t opt, const char *grp, const char *str)
{
- gpg_group_t g = find_group( opt, grp );
- gpg_member_t m = NULL;
- if( g ) {
- for( m = g->list; m; m = m->next ) {
- if( !stricmp( m->name, str ) )
- break;
- }
+ gpg_group_t g = find_group (opt, grp);
+ gpg_member_t m;
+
+ if (!g)
+ return NULL;
+
+ for (m = g->list; m; m = m->next) {
+ if (!stricmp (m->name, str))
+ return m;
}
+ return NULL;
+}
- return m;
-} /* find_member */
-
int
-delete_group( gpg_optfile_t opt, const char *str )
+delete_group (gpg_optfile_t opt, const char *str)
{
- gpg_group_t g = find_group( opt, str );
- if( g ) {
+ gpg_group_t g = find_group (opt, str);
+
+ if (g)
g->used = 0;
- return 0;
- }
+ return g? 0 : -1;
+}
- return -1;
-} /* delete_group */
-
int
-delete_member( gpg_optfile_t opt, const char *grp, const char *str )
+delete_member (gpg_optfile_t opt, const char *grp, const char *str)
{
- gpg_member_t m = find_member( opt, grp, str );
- if( m ) {
- m->used = 0;
- return 0;
- }
+ gpg_member_t m = find_member (opt, grp, str);
- return -1;
-} /* delete_member */
+ if (m)
+ m->used = 0;
+ return m? 0 : -1;
+}
int
delete_option (gpg_optfile_t opt, const char * str)
{
gpg_option_t e = find_option (opt, str);
- if (e) {
+
+ if (e)
e->used = 0;
- return 0;
- }
+ return e? 0 : -1;
+}
- return -1;
-} /* delete_option */
-
int
-add_entry( gpg_optfile_t opt, int type, const char *name, const char *val )
+add_entry (gpg_optfile_t opt, int type, const char *name, const char *val)
{
- gpg_option_t e, t;
+ gpg_option_t e;
- e = new gpg_option_s;
- if( !e )
- BUG( NULL );
- memset( e, 0, sizeof *e );
+ e = new_option ();
e->used = 1;
e->type = type;
- e->name = m_strdup( name );
- e->val = val? m_strdup( val ) : NULL;
- if( !opt->list )
- opt->list = e;
- else {
- for( t = opt->list; t->next; t = t->next )
- ;
- t->next = e;
- }
+ e->name = m_strdup (name);
+ e->val = val? m_strdup (val) : NULL;
+ add_option (&opt->list, e);
return 0;
-} /* add_entry */
+}
int
-modify_entry( gpg_optfile_t opt, int type, const char *name, const char *val )
+modify_entry (gpg_optfile_t opt, int type, const char *name, const char *val)
{
gpg_option_t e;
int rc = 0;
- e = find_option( opt, name );
- if( !e )
- rc = add_entry( opt, type, name, val );
- else if( type != ENTRY_SINGLE ) {
- free_if_alloc( e->val );
- e->val = m_strdup( val );
+ e = find_option (opt, name);
+ if (!e)
+ rc = add_entry (opt, type, name, val);
+ else if (type != ENTRY_SINGLE) {
+ free_if_alloc (e->val);
+ e->val = m_strdup (val);
}
return rc;
-} /* modify_entry */
+}
int
-add_member( gpg_optfile_t opt, const char *grp, const char *str )
+add_member (gpg_optfile_t opt, const char *grp, const char *str)
{
- gpg_group_t g = find_group( opt, grp );
+ gpg_group_t g = find_group (opt, grp);
gpg_member_t m, t;
- if( g ) {
- m = new gpg_member_s;
- if( !m )
- BUG( NULL );
- memset( m, 0, sizeof *m );
- m->used = 1;
- m->name = m_strdup( str );
- if( !m->name )
- BUG( NULL );
- if( !g->list )
- g->list = m;
- else {
- for( t = g->list; t->next; t = t->next )
- ;
- t->next = m;
- }
- return 0;
- }
- return -1;
-} /* add_member */
+ if (!g)
+ return -1;
+
+ m = new gpg_member_s;
+ if (!m)
+ BUG (NULL);
+ memset (m, 0, sizeof *m);
+ m->used = 1;
+ m->name = m_strdup (str);
+ if( !g->list )
+ g->list = m;
+ else {
+ for( t = g->list; t->next; t = t->next )
+ ;
+ t->next = m;
+ }
+ return 0;
+}
+
int
-add_group( gpg_optfile_t opt, const char *str )
+add_group (gpg_optfile_t opt, const char *str)
{
gpg_group_t g, t;
g = new gpg_group_s;
- if( !g )
- BUG( NULL );
- memset( g, 0, sizeof *g );
+ if (!g)
+ BUG (NULL);
+ memset (g, 0, sizeof *g);
g->used = 1;
- g->name = m_strdup( str );
+ g->name = m_strdup (str);
- if( !opt->grp )
+ if (!opt->grp)
opt->grp = g;
else {
- for( t = opt->grp; t->next; t = t->next )
+ for (t = opt->grp; t->next; t = t->next)
;
t->next = g;
}
- add_entry( opt, ENTRY_GROUP, str, NULL );
-
+ add_entry (opt, ENTRY_GROUP, str, NULL);
return 0;
-} /* add_group */
+}
#if 0
Modified: trunk/Src/wptGroupManager.cpp
===================================================================
--- trunk/Src/wptGroupManager.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptGroupManager.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -1,25 +1,71 @@
-/* XXX: Re-implement the code. */
+/* wptGroupManager.cpp
+ * Copyright (C) 2006 Timo Schulz
+ *
+ * This file is part of WinPT.
+ *
+ * WinPT is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * WinPT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WinPT; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#if 0 /* XXX: not yet finished. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#if 0
-gpg_optfile_t
-km_groupdb_open (void)
+#include <windows.h>
+#include "wptTypes.h"
+#include "wptCommonCtl.h"
+#include "wptGPG.h"
+#include "wptKeyManager.h"
+#include "wptKeylist.h"
+#include "wptErrors.h"
+
+
+static void
+get_selection (HWND tree, char *text, DWORD tlen)
+{
+ TVITEM tvi;
+
+ memset (&tvi, 0, sizeof tvi);
+ tvi.hItem = TreeView_GetSelection (tree);
+ tvi.pszText = text;
+ tvi.cchTextMax = tlen;
+ tvi.mask = TVIF_TEXT;
+ TreeView_GetItem (tree, &tvi);
+}
+
+
+static gpg_optfile_t
+groupdb_open (char **r_cfgfile)
{
gpg_optfile_t opt;
- char * optfile;
+ char *optfile;
int err = 0;
- optfile = get_gnupg_cfgfile();
- if( !optfile )
- BUG( NULL );
- if( parse_gpg_options( optfile, &opt ) )
+ optfile = get_gnupg_cfgfile ();
+ if (parse_gpg_options (optfile, &opt))
err = 1;
- free_if_alloc( optfile );
+ if (r_cfgfile)
+ *r_cfgfile = optfile;
+ else
+ free_if_alloc (optfile);
return err? NULL : opt;
-} /* km_groupdb_open */
+}
+#if 0
int
-km_groupdb_expand_recipients( const char *name, gpgme_recipients_t rset )
+km_groupdb_expand_recipients (const char *name, gpgme_recipients_t rset)
{
gpg_keycache_t kc;
gpgme_key_t pk;
@@ -61,115 +107,106 @@
return no_trust;
} /* km_groupdb_expand_recipients */
+#endif
static HTREEITEM
-km_tv_insert_item( HWND tree, HTREEITEM parent, const char *text )
+km_tv_insert_item (HWND tree, HTREEITEM parent, const char *text)
{
TVINSERTSTRUCT tvis;
HTREEITEM node;
- memset( &tvis, 0, sizeof tvis );
+ memset (&tvis, 0, sizeof tvis);
tvis.hParent = parent;
tvis.hInsertAfter = TVI_LAST;
tvis.item.mask = TVIF_TEXT;
tvis.item.pszText = (char *)text;
- node = TreeView_InsertItem( tree, &tvis );
+ node = TreeView_InsertItem (tree, &tvis);
return node;
-} /* km_tv_insert_item */
+}
int
-km_groups_new( km_group_t *r_gc, HWND ctrl )
+km_groups_new (km_group_t *r_gc, HWND ctrl)
{
km_group_t gc;
gc = new km_group_s;
if (!gc)
BUG (NULL);
+ memset (gc, 0, sizeof *gc);
gc->tree = ctrl;
- gc->gh = km_groupdb_open ();
+ gc->gh = groupdb_open (&gc->cfgfile);
*r_gc = gc;
return 0;
-} /* km_groups_new */
+}
void
-km_groups_sync( km_group_t gc )
+km_groups_sync (km_group_t gc)
{
- char * optfile;
-
- optfile = get_gnupg_cfgfile ();
- if( !optfile )
- BUG( NULL );
- commit_gpg_options( optfile, gc->gh );
- free_if_alloc( optfile );
+ commit_gpg_options (gc->cfgfile, gc->gh);
gc->need_sync = 0;
-} /* km_groups_sync */
+}
void
km_groups_release (km_group_t gc)
{
- if( gc ) {
- /* xxx: this reset the default key (sync=1) */
- gc->need_sync=0;
- if (gc->need_sync)
- km_groups_sync (gc);
- if (gc->gh)
- release_gpg_options( gc->gh );
- gc->gh = NULL;
- gc->tree = NULL;
- delete gc;
- }
-} /* km_groups_release */
+ if (!gc)
+ return;
+ /* xxx: this reset the default key (sync=1) */
+ gc->need_sync=0;
+ if (gc->need_sync)
+ km_groups_sync (gc);
+ if (gc->gh)
+ release_gpg_options (gc->gh);
+ free_if_alloc (gc->cfgfile);
+ gc->gh = NULL;
+ gc->tree = NULL;
+ gc->need_sync = 0;
+ delete gc;
+}
+
int
-km_groups_load( km_group_t gc )
+km_groups_load (km_group_t gc)
{
HTREEITEM n;
gpg_group_t grp, g;
gpg_member_t mbr;
u32 gid = 0;
- if( !gc->gh )
+ if (!gc->gh)
return 0;
grp = gc->gh->grp;
- if( !grp )
+ if (!grp)
return 0; /* no groups */
- for( g = grp; g; g = g->next ) {
- n = km_tv_insert_item( gc->tree, NULL, g->name );
- for( mbr = g->list; mbr; mbr = mbr->next ) {
- if( mbr->used && mbr->name )
- km_tv_insert_item( gc->tree, n, mbr->name );
+ for (g = grp; g; g = g->next) {
+ n = km_tv_insert_item (gc->tree, NULL, g->name);
+ for (mbr = g->list; mbr; mbr = mbr->next) {
+ if (mbr->used && mbr->name)
+ km_tv_insert_item (gc->tree, n, mbr->name);
}
}
- DragAcceptFiles( gc->tree, TRUE );
+ DragAcceptFiles (gc->tree, TRUE);
gc->need_sync = 0;
return 0;
-} /* km_groups_load */
+}
int
km_groups_add (km_group_t gc, listview_ctrl_t lv, int km_index)
{
- TVITEM tvi;
char uid[128], valid[64], text[128];
int i_valid;
- memset( &tvi, 0, sizeof tvi );
- tvi.hItem = TreeView_GetSelection( gc->tree );
- tvi.pszText = text;
- tvi.cchTextMax = sizeof text -1;
- tvi.mask = TVIF_TEXT;
- TreeView_GetItem( gc->tree, &tvi );
+ get_selection (gc->tree, text, sizeof (text)-1);
+ listview_get_item_text( lv, km_index, KM_COL_UID, uid, sizeof uid -1 );
+ listview_get_item_text( lv, km_index, KM_COL_VALID, valid, sizeof valid -1 );
-
- listview_get_item_text( lv, km_index, 0, uid, sizeof uid -1 );
- listview_get_item_text( lv, km_index, 5, valid, sizeof valid -1 );
-
if( strstr( valid, "Ultimate" ) )
i_valid = 5;
else if( !strstr( valid, "Full" ) )
@@ -191,47 +228,46 @@
static int
-km_groups_del_main( km_group_t gc )
+km_groups_del_main (km_group_t gc)
{
- TVITEM tvi;
char text[128];
int id;
-
- memset( &tvi, 0, sizeof tvi );
- tvi.hItem = TreeView_GetSelection( gc->tree );
+ TVITEM tvi;
+
+ memset (&tvi, 0, sizeof tvi);
+ tvi.hItem = TreeView_GetSelection (gc->tree);
tvi.pszText = text;
- tvi.cchTextMax = sizeof text -1;
+ tvi.cchTextMax = sizeof (text)-1;
tvi.mask = TVIF_TEXT;
- TreeView_GetItem( gc->tree, &tvi );
-
+ TreeView_GetItem (gc->tree, &tvi);
+
id = log_box( _("Key Manager"), MB_INFO_ASK,
_("Do you really want to delete this group?\n\n%s"), text);
- if( id == IDNO )
+ if (id == IDNO)
return 0;
- delete_group( gc->gh, text );
- TreeView_DeleteItem( gc->tree, &tvi );
+ delete_group (gc->gh, text);
+ TreeView_DeleteItem (gc->tree, &tvi);
gc->need_sync = 1;
-
return 0;
-} /* km_groups_del */
+}
static int
-km_groups_del_entry( km_group_t gc )
+km_groups_del_entry (km_group_t gc)
{
TVITEM tvi;
HTREEITEM root;
int id;
char text[128], info[256];
- gpg_group_t grp = NULL;
-
- memset( &tvi, 0, sizeof tvi );
- tvi.hItem = TreeView_GetSelection( gc->tree );
+ gpg_group_t grp = NULL;
+
+ memset (&tvi, 0, sizeof tvi);
+ tvi.hItem = TreeView_GetSelection (gc->tree);
tvi.pszText = text;
- tvi.cchTextMax = sizeof text-1;
+ tvi.cchTextMax = sizeof (text)-1;
tvi.mask = TVIF_TEXT;
- TreeView_GetItem( gc->tree, &tvi );
-
+ TreeView_GetItem (gc->tree, &tvi);
+
_snprintf( info, sizeof info -1,
_("Do you really want to delete this entry?\n\n%s"), text );
@@ -251,11 +287,12 @@
int
-km_groups_del( km_group_t gc )
+km_groups_del (km_group_t gc)
{
- if ( TreeView_GetParent( gc->tree, TreeView_GetSelection( gc->tree ) ) )
+ if (TreeView_GetParent (gc->tree, TreeView_GetSelection (gc->tree)))
return km_groups_del_entry( gc );
else
return km_groups_del_main( gc );
-} /* km_groups_del */
+}
#endif
+
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -193,7 +193,7 @@
ComboBox_AddString_utf8 (GetDlgItem (dlg, IDC_ADDREV_KEYLIST), s);
}
gpg_keycache_rewind (pub);
- n = SendDlgItemMessage( dlg, IDC_ADDREV_KEYLIST, CB_GETCOUNT, 0, 0 );
+ n = SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_GETCOUNT, 0, 0);
for (i = 0; i < n; i++) {
gpg_keycache_next_key (pub, 0, &key);
SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_SETITEMDATA,
@@ -245,19 +245,20 @@
keygen->bits,
get_key_pubalgo ((gpgme_pubkey_algo_t)keygen->algo));
_snprintf (keyid, sizeof keyid-1, "0x%s", keygen->fpr+8);
+ s = get_key_created (time (NULL));
n = listview_count_items (lv, 0);
listview_add_item_pos (lv, n);
- listview_add_sub_item (lv, n, 0, info);
- listview_add_sub_item (lv, n, 1, keyid);
- listview_add_sub_item (lv, n, 2, get_key_created (time (NULL)));
- listview_add_sub_item (lv, n, 3, expdate);
+ listview_add_sub_item (lv, n, SUBK_COL_DESC, info);
+ listview_add_sub_item (lv, n, SUBK_COL_KEYID, keyid);
+ listview_add_sub_item (lv, n, SUBK_COL_CREATION, s);
+ listview_add_sub_item (lv, n, SUBK_COL_EXPIRES, expdate);
if (flags & KM_FLAG_REVOKED)
s = _("Revoked");
else if (flags & KM_FLAG_EXPIRED)
s = _("Expired");
else
s = _("OK");
- listview_add_sub_item (lv, n, 4, s);
+ listview_add_sub_item (lv, n, SUBK_COL_STATUS, s);
}
@@ -447,9 +448,6 @@
SetForegroundWindow (dlg);
break;
- case WM_DESTROY:
- break;
-
case WM_SYSCOMMAND:
if (LOWORD (wparam) == SC_CLOSE)
EndDialog (dlg, FALSE);
@@ -587,8 +585,7 @@
{
const char *sizelist[] = {
"1024", "1536",
- "2048", "2560",
- "3072", "3854",
+ "2048", "3072",
"4096", NULL
};
int i;
@@ -610,7 +607,7 @@
if (pos == CB_ERR)
return -1;
SendDlgItemMessage (dlg, ctlid, CB_GETLBTEXT, pos, (LPARAM)(char*)buf);
- return atol (buf);
+ return atoi (buf);
}
@@ -731,8 +728,7 @@
err = ke->addSubkey ((gpgme_pubkey_algo_t)index, size, valid);
keygen->fpr = get_subkey_keyid (ctx->keyid);
- keygen_cb_dlg_destroy ();
- keygen_cb (NULL, NULL, 0, 0, 0); /* flush */
+ keygen_cb_dlg_destroy (1);
if (err)
msg_box (dlg, gpgme_strerror (err), _("Add Subkey"), MB_ERR);
else {
@@ -1075,7 +1071,6 @@
subkey_list_init (HWND dlg, winpt_key_t k)
{
LV_ITEM lvi;
- gpgme_key_t key;
gpgme_subkey_t sub;
struct listview_column_s cols[] = {
{0, 80, (char *)_("Description")},
@@ -1092,15 +1087,9 @@
listview_ctrl_t lv;
char buf[256], tmp[128];
const char *t;
- int nkeys = 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);
- return NULL;
- }
- if (!k->ctx)
- k->ctx = key;
- nkeys = count_subkeys (key);
+ nkeys = count_subkeys (k->ctx);
if( !nkeys ) {
msg_box (dlg, _("No subkey(s) found."), _("Key Edit"), MB_ERR);
return NULL;
@@ -1115,13 +1104,13 @@
listview_add_sub_item( lv, 0, 1, "" );
memset( &lvi, 0, sizeof lvi );
lvi.mask = LVIF_PARAM;
- lvi.lParam = (LPARAM)key;
+ lvi.lParam = (LPARAM)k->ctx;
if( ListView_SetItem( lv->ctrl, &lvi ) == FALSE )
return NULL;
}
listview_set_ext_style( lv );
- for( i = 0, sub = key->subkeys; i < nkeys; i++, sub = sub->next ) {
+ for( i = 0, sub = k->ctx->subkeys; i < nkeys; i++, sub = sub->next ) {
memset( buf, 0, sizeof buf );
bits = sub->length;
@@ -1175,7 +1164,6 @@
userid_list_init (HWND dlg, winpt_key_t k)
{
listview_ctrl_t lv = NULL;
- gpgme_key_t key;
gpgme_key_sig_t ks;
struct native_uid_s *u;
int nuids = 0, j, u_attr;
@@ -1187,13 +1175,8 @@
{0, 0, 0}
};
const char *attr;
-
- if (get_pubkey (k->keyid, &key)) {
- msg_box (dlg, _("Could not find key."), _("Key Edit"), MB_ERR);
- return NULL;
- }
- nuids = count_userids (key);
+ nuids = count_userids (k->ctx);
if (!nuids) {
msg_box (dlg, _("No user ID(s) found."), _("Key Edit"), MB_ERR);
return NULL;
@@ -1203,7 +1186,7 @@
for( j = 0; cols[j].fieldname != NULL; j++ )
listview_add_column (lv, &cols[j]);
- for( j = 0; j < nuids; j++ ) {
+ for (j = 0; j < nuids; j++) {
listview_add_item (lv, " ");
listview_add_sub_item (lv, 0, 1, " " );
}
@@ -1229,8 +1212,8 @@
get_key_created (ks->timestamp));
}
if( !k->key_pair ) {
- CheckDlgButton( dlg, IDC_KEYUID_ADD, BST_INDETERMINATE );
- CheckDlgButton( dlg, IDC_KEYUID_REVOKE, BST_INDETERMINATE );
+ CheckDlgButton (dlg, IDC_KEYUID_ADD, BST_INDETERMINATE);
+ CheckDlgButton (dlg, IDC_KEYUID_REVOKE, BST_INDETERMINATE);
}
return lv;
}
@@ -1749,6 +1732,10 @@
case IDOK:
EndDialog (dlg, TRUE);
break;
+
+ case IDCANCEL:
+ EndDialog (dlg, FALSE);
+ break;
}
break;
}
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -82,6 +82,8 @@
int lv_idx;
int keylist_sortby;
int magic;
+
+ unsigned int enable_groups:1;
};
/* Toolbar button structure. */
@@ -401,17 +403,18 @@
kmi->ypos_sep - rclient.top, bRepaint);
rclient.top = kmi->ypos_sep + 5 + 8;
-#if 0 /* Disable the code until we support groups again. */
- /* Place the group text and the group box below the separator */
- h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
- MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
- rclient.top += 18;
+ if (kmi->enable_groups != 0) {
+ /* Place the group text and the group box below the separator */
+ h = GetDlgItem (dlg, IDC_KEYMISC_GTEXT);
+ MoveWindow (h, rclient.left, rclient.top, 100, 14, bRepaint);
+ rclient.top += 18;
- h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
- MoveWindow (h, rclient.left, rclient.top, rclient.right - rclient.left,
- (rclient.bottom < rclient.top) ?
- 0 : rclient.bottom - rclient.top, bRepaint);
-#endif
+ h = GetDlgItem (dlg, IDC_KEYMISC_GROUP);
+ MoveWindow (h, rclient.left, rclient.top,
+ rclient.right - rclient.left,
+ (rclient.bottom < rclient.top) ?
+ 0 : rclient.bottom - rclient.top, bRepaint);
+ }
/* Repaint the whole thing */
InvalidateRect (dlg, NULL, TRUE);
@@ -1062,7 +1065,7 @@
keylist_upd_key (kmi->lv, pos, ctx, ctx->key);
}
}
- keylist_sort (kmi->lv, KEY_SORT_USERID);
+ keylist_sort (kmi->lv, kmi->keylist_sortby);
update_status_bar (kmi->statbar, kmi->lv);
keyring_check_last_access ();
}
@@ -1071,9 +1074,11 @@
static void
reload_keylist (struct km_info_s *kmi)
{
+ gpg_keycache_t c;
+
+ c = keycache_get_ctx (1);
keycache_reload (kmi->dlg);
- keylist_reload (kmi->lv, keycache_get_ctx (1),
- KEYLIST_LIST, KEY_SORT_USERID);
+ keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
update_status_bar (kmi->statbar, kmi->lv);
keyring_check_last_access ();
}
@@ -1091,9 +1096,7 @@
DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_KEYCACHE, kmi->dlg,
keycache_dlg_proc, (LPARAM)&rcs);
c = keycache_get_ctx (1);
- if (!c)
- BUG (0);
- keylist_reload (kmi->lv, c, KEYLIST_LIST, KEY_SORT_USERID);
+ keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
update_status_bar (kmi->statbar, kmi->lv);
SetForegroundWindow (kmi->dlg);
}
@@ -1131,7 +1134,6 @@
reload_keylist (kmi);
SetForegroundWindow (kmi->dlg);
- center_window (kmi->dlg, NULL);
}
@@ -1216,6 +1218,8 @@
keylist_sort (kmi->lv, kmi->keylist_sortby);
SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
+ SetDlgItemText (dlg, ID_GROUP_SHOW, _("&Show"));
+ SetDlgItemText (dlg, ID_GROUP_NEW, _("&New..."));
SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst,
(LPCTSTR)IDI_WINPT));
SetForegroundWindow (dlg);
@@ -1242,13 +1246,11 @@
/* XXX: store window size. */
/* Remove runtime information. This should be the last action taken here. */
- delete kmi; kmi = NULL;
+ delete kmi;
+ kmi = NULL;
SetWindowLong (dlg, GWL_USERDATA, 0);
return FALSE;
- case WM_SHOWWINDOW:
- break;
-
case WM_MOVE:
RECT r;
GetWindowRect (dlg, &r);
@@ -1799,6 +1801,8 @@
listview_select_all (kmi->lv);
}
km_refresh_from_keyserver (kmi->lv, dlg);
+ msg_box (dlg, _("Keyserver refresh finished."),
+ _("Key Manager"), MB_OK);
break;
/** Context menu **/
@@ -1879,8 +1883,10 @@
case ID_KEYCTX_KEYID_COPY:
key = km_get_key_ptr (kmi->lv, kmi->lv_idx, NULL);
- set_clip_text (NULL, key->subkeys->keyid+8,
- strlen (key->subkeys->keyid+8));
+ memset (type, 0, sizeof (type));
+ type[0] = '0'; type[1] = 'x';
+ memcpy (type+2, key->subkeys->keyid+8, 8);
+ set_clip_text (NULL, type, strlen (type));
break;
case ID_KEYCTX_FPR_COPY:
@@ -1949,6 +1955,7 @@
case ID_GROUP_NEW:
case ID_GROUP_PASTE:
case ID_GROUP_DELETE:
+ case ID_GROUP_SHOW:
/* XXX: Implement group manager. */
return TRUE;
Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeyPropsDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -83,7 +83,7 @@
char name[64];
_snprintf (name, sizeof (name)-1, "winpt_photo_%08lX.tmp", (DWORD)dlg);
- get_temp_name (buf, DIM (buf), name);
+ get_temp_name (buf, DIM (buf)-1, name);
return buf;
}
@@ -107,7 +107,8 @@
DWORD imglen = 0;
int pos=0;
- winpt_get_pubkey (key->subkeys->keyid, &k);
+ if (winpt_get_pubkey (key->subkeys->keyid, &k))
+ BUG (0);
img = k.ext->attrib.d;
imglen = k.ext->attrib.len;
if (!k.ext->attrib.validity)
@@ -121,8 +122,6 @@
f = fopen (get_photo_tmpname (dlg), "wb");
if (f) {
- //for (pos = 0; img[pos] != 0x10; pos++)
- // ;
pos += 16;
fwrite (img + pos, 1, imglen - pos, f);
fclose (f);
@@ -154,15 +153,11 @@
static const char*
get_validity (gpgme_key_t key)
{
- int val;
- val = key->expired;
- if (val)
+ if (key->expired)
return _("Expired");
- val = key->revoked;
- if (val)
+ if (key->revoked)
return _("Revoked");
- val = key->disabled;
- if (val)
+ if (key->disabled)
return _("Disabled");
return get_key_trust2 (NULL, key->uids->validity, 0, 0);
}
@@ -174,16 +169,16 @@
{
if (k->is_v3)
return "IDEA";
- if (!k->ext->sym_prefs)
+ if (!k->ext || !k->ext->sym_prefs)
return "3DES";
switch (*k->ext->sym_prefs) {
case 1: return "IDEA";
case 2: return "3DES";
case 3: return "CAST5";
case 4: return "Blowfish";
- case 7:
- case 8:
- case 9: return "AES";
+ case 7: return "AES128";
+ case 8: return "AES192";
+ case 9: return "AES256";
case 10:return "Twofish";
}
return "Unknown";
@@ -215,30 +210,42 @@
}
+/* Return 1 if at least one user-ID is valid. */
+static int
+key_is_valid (gpgme_key_t k)
+{
+ gpgme_user_id_t u;
+
+ for (u=k->uids; u; u=u->next) {
+ if (u->validity >= GPGME_VALIDITY_MARGINAL)
+ return 1;
+ }
+ return 0;
+}
+
+
+
/* Display the key information for key @k.
Return value: gpgme key on success. */
static void
-display_key_info (HWND dlg, winpt_key_t k, gpgme_key_t *r_key)
+display_key_info (HWND dlg, winpt_key_t k)
{
gpgme_key_t key;
- struct winpt_key_s pk, sk;
+ struct winpt_key_s sk;
char info[512];
const char *inf;
DWORD created, expires;
- memset (&pk, 0, sizeof (pk));
- if (winpt_get_pubkey (k->keyid, &pk))
- BUG (0);
- gpg_keycache_update_attr (pk.ext, KC_ATTR_PREFSYM, 0);
+ gpg_keycache_update_attr (k->ext, KC_ATTR_PREFSYM, 0);
memset (&sk, 0, sizeof (sk));
if (k->key_pair && !winpt_get_seckey (k->keyid, &sk))
k->is_protected = sk.is_protected;
- key = pk.ext->key;
+ key = k->ext->key;
created = key->subkeys->timestamp;
expires = key->subkeys->expires;
_snprintf (info, DIM (info)-1,
_("Type: %s\r\n"
- "Key ID: %s\r\n"
+ "Key ID: 0x%s\r\n"
"Algorithm: %s\r\n"
"Size: %s bits\r\n"
"Created: %s\r\n"
@@ -253,15 +260,13 @@
get_key_created (created),
get_key_expire_date (expires),
get_validity (key),
- get_pref_cipher (&pk),
+ get_pref_cipher (k),
get_card_type (&sk));
SetDlgItemText (dlg, IDC_KEYPROPS_INFO, info);
SetDlgItemText (dlg, IDC_KEYPROPS_FPR, get_key_fpr (key));
inf = ownertrust_to_string (key->owner_trust, k->key_pair);
SetDlgItemText (dlg, IDC_KEYPROPS_OT, inf);
-
- *r_key = key;
}
@@ -270,7 +275,6 @@
keyprops_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
static winpt_key_t k;
- static gpgme_key_t key;
gpgme_validity_t valid;
const char *inf;
int rc;
@@ -288,17 +292,17 @@
SetDlgItemText (dlg, IDC_KEYPROPS_CHANGE_PWD, _("Change &Password"));
SetDlgItemText (dlg, IDC_KEYPROPS_OTINF, _("Ownertrust"));
- display_key_info (dlg, k, &key);
- if (!keyprops_load_photo (dlg, key, &valid)) {
+ display_key_info (dlg, k);
+ if (!keyprops_load_photo (dlg, k->ctx, &valid)) {
k->has_photo = 1;
if (valid < GPGME_VALIDITY_MARGINAL)
SetDlgItemText (dlg, IDC_KEYPROPS_IMGINF, _("Photo-ID not validated."));
}
if (k->key_pair)
EnableWindow (GetDlgItem (dlg, IDC_KEYPROPS_CHANGE_PWD), TRUE);
- if (check_for_desig_rev (key))
+ if (check_for_desig_rev (k->ctx))
EnableWindow (GetDlgItem (dlg, IDC_KEYPROPS_REVOKERS), TRUE);
- if (key->revoked || key->expired)
+ if (k->ctx->revoked || k->ctx->expired)
EnableWindow (GetDlgItem (dlg, IDC_KEYPROPS_OT_CHANGE), FALSE);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
@@ -329,13 +333,13 @@
return TRUE;
case IDC_KEYPROPS_OT_CHANGE:
- if (do_check_key (key)) {
+ if (do_check_key (k->ctx)) {
msg_box (dlg, _("The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."),
_("WinPT Warning"), MB_ERR);
return TRUE;
}
- if (!k->key_pair && key->uids->validity < 3) {
+ if (!k->key_pair && !key_is_valid (k->ctx)) {
rc = msg_box (dlg, _("This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n\n"
"Do you really want to continue?"),
Modified: trunk/Src/wptKeygenCBDlg.cpp
===================================================================
--- trunk/Src/wptKeygenCBDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeygenCBDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -90,20 +90,9 @@
}
-/* Destroy the progress dialog and cleanup. */
-void
-keygen_cb_dlg_destroy (void)
-{
- if (dlg_hwnd) {
- EndDialog (dlg_hwnd, TRUE);
- dlg_hwnd = NULL;
- }
-}
-
-
/* GPGME progress callback function. */
void
-keygen_cb (void * opaque, const char * what, int type, int curretn, int total)
+keygen_cb (void *opaque, const char *what, int type, int curretn, int total)
{
static char cb[8192] = {0};
static int cb_pos = 0;
@@ -124,3 +113,18 @@
SetDlgItemText (dlg_hwnd, IDC_KEYPROG_CB, cb);
}
+
+
+/* Destroy the progress dialog and cleanup.
+ If flush is 1 reset the callback state. */
+void
+keygen_cb_dlg_destroy (int flush)
+{
+ if (dlg_hwnd) {
+ EndDialog (dlg_hwnd, TRUE);
+ dlg_hwnd = NULL;
+ }
+ if (flush)
+ keygen_cb (NULL, NULL, 0, 0, 0);
+}
+
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeygenDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -479,8 +479,7 @@
wipememory (p, strlen (p)); /* burn the passphrase! */
free_if_alloc (p);
}
- keygen_cb_dlg_destroy ();
- keygen_cb (NULL, NULL, 0, 0, 0); /* flush */
+ keygen_cb_dlg_destroy (1);
if (err) {
free_if_alloc (fpr);
msg_box (dlg, gpgme_strerror (err), _("Key Generation"), MB_ERR);
@@ -591,8 +590,7 @@
free_if_alloc (utf8_name);
keygen_cb_dlg_create();
err = gpg_genkey (p, keygen_cb, &fpr);
- keygen_cb_dlg_destroy();
- keygen_cb (NULL, NULL, 0, 0, 0);
+ keygen_cb_dlg_destroy (1);
if (p) {
wipememory (p, strlen (p));
free_if_alloc (p);
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeyserver.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -353,22 +353,40 @@
/* Return a string representation of a winsock error. */
const char*
wsock_strerror (void)
-{
- static char buf[384];
+{
int ec = WSAGetLastError ();
+ if (!ec)
+ return "";
switch (ec) {
case WSAENETDOWN:
- return _("The network subsystem has failed");
+ return _("Network unreachable");
+
+ case WSAEHOSTUNREACH:
+ return _("Host unreachable");
+
case WSAHOST_NOT_FOUND:
- return _("Authoritative Answer Host not found");
+ return _("Could not resolve host name");
+
+ case WSAECONNREFUSED:
+ return _("Connection refused");
+
case WSAETIMEDOUT:
- return _("The connection has been dropped because of a network failure");
+ case WSAECONNABORTED:
+ return _("Connection timeout");
+
+ case WSAENETRESET:
+ case WSAECONNRESET:
+ return _("Connection resetted by peer");
+
+ case WSAESHUTDOWN:
+ return _("Socket has been shutdown");
+
default:
- _snprintf (buf, sizeof (buf) -1, _("Unknown Winsock error ec=%d"),ec);
- return buf;
+ break;
}
- return NULL;
+
+ return "";
}
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -62,11 +62,13 @@
hkp_err_box (HWND dlg, const char *host, WORD port, int rc)
{
const char *err = kserver_strerror ();
-
- log_box (_("Keyserver"), MB_ERR, "%s:%d: %s",
- host, port, winpt_strerror (rc));
- if (err)
- msg_box (dlg, err, wsock_strerror (), MB_ERR);
+ const char *ws_err = wsock_strerror ();
+
+ if (ws_err && strlen (ws_err) > 0)
+ log_box (_("Keyserver"), MB_ERR, "%s:%d: %s", host, port, ws_err);
+ else
+ log_box (_("Keyserver"), MB_ERR, "%s:%d: %s\n%s",
+ host, port, winpt_strerror (rc), err? err : "");
}
@@ -203,24 +205,23 @@
free_if_alloc (rawkey);
return rc;
}
- else {
- if (!strstr (rawkey, "BEGIN PGP PUBLIC KEY BLOCK")) {
- msg_box (dlg, _("This is not a valid OpenPGP key."),
- _("Keyserver"), MB_ERR);
- goto leave;
- }
- if (gpgme_new (&ctx))
- BUG (NULL);
- gpgme_data_new_from_mem (&keydata, rawkey, strlen (rawkey), 1);
- err = gpgme_op_import (ctx, keydata);
- if (err) {
- msg_box (dlg, gpgme_strerror (err), _("Import"), MB_ERR);
- goto leave;
- }
- import_res = gpgme_op_import_result (ctx);
- if (import_res && r_fpr)
- *r_fpr = m_strdup (import_res->imports->fpr);
+
+ if (!strstr (rawkey, "BEGIN PGP PUBLIC KEY BLOCK")) {
+ msg_box (dlg, _("This is not a valid OpenPGP key."),
+ _("Keyserver"), MB_ERR);
+ goto leave;
}
+ if (gpgme_new (&ctx))
+ BUG (NULL);
+ gpgme_data_new_from_mem (&keydata, rawkey, strlen (rawkey), 1);
+ err = gpgme_op_import (ctx, keydata);
+ if (err) {
+ msg_box (dlg, gpgme_strerror (err), _("Import"), MB_ERR);
+ goto leave;
+ }
+ import_res = gpgme_op_import_result (ctx);
+ if (import_res && r_fpr)
+ *r_fpr = m_strdup (import_res->imports->fpr);
/* if we use the refresh mode, a lot of keys will be fetched and thus only
a summarize at the end is presented and not for each key. */
@@ -265,33 +266,21 @@
static int
check_pattern (const char *pattern)
{
- int rc = 1;
+ int rc = WPTERR_GENERAL;
- /* Whitespace are not allowed! */
- if (strchr (pattern, ' ')) {
- rc = WPTERR_GENERAL;
- goto leave;
- }
-
- if (((strstr (pattern, "0x")) && (strlen (pattern) == 10)) ||
- (strstr(pattern, "0x")) && (strlen (pattern) == 18)) {
- rc = 0; /* Either long or short keyid */
- goto leave;
- }
-
- if( (( my_iskeychar( pattern[0] )) && ( strlen( pattern ) == 8 ) )
- || (my_iskeychar(pattern[0])) && ( strlen( pattern ) == 16) ) {
- rc = 0;
- goto leave;
- }
-
- if ((strchr (pattern, '@')) &&
- (strlen (pattern) >= 3)) {
- rc = 0;
- goto leave;
- }
-
-leave:
+ /* do not allow white spaces. */
+ if (strchr (pattern, ' '))
+ return rc;
+
+ if (strstr (pattern, "0x"))
+ pattern += 2;
+
+ if (((my_iskeychar (pattern[0])) && (strlen (pattern) == 8)) ||
+ (my_iskeychar (pattern[0])) && (strlen (pattern) == 16))
+ rc = 0; /* assume long or short key ID. */
+ else if (strchr (pattern, '@') && strlen (pattern) >= 3)
+ rc = 0; /* assume email address. */
+
return rc;
}
@@ -350,6 +339,7 @@
free_if_alloc (p);
}
+
/* Save the selected keyserver from @lv as the default server. */
static int
save_default_ks (listview_ctrl_t lv)
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/Src/wptKeysignDlg.cpp 2006-05-07 12:36:48 UTC (rev 211)
@@ -69,7 +69,7 @@
memset (&k, 0, sizeof (k));
winpt_get_seckey (key->subkeys->keyid, &k);
- _snprintf (buf, DIM (buf)-1-16, "%d-bit %s key, ID %s",
+ _snprintf (buf, DIM (buf)-1-16, _("%d-bit %s key, ID 0x%s"),
key->subkeys->length,
get_key_pubalgo (key->subkeys->pubkey_algo),
key->subkeys->keyid+8);
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-05-04 08:44:11 UTC (rev 210)
+++ trunk/configure.ac 2006-05-07 12:36:48 UTC (rev 211)
@@ -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.12.0-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.12.0, 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