[Winpt-commits] r209 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 3 16:34:14 CEST 2006
Author: twoaday
Date: 2006-05-03 16:34:08 +0200 (Wed, 03 May 2006)
New Revision: 209
Modified:
trunk/Include/wptKeyserver.h
trunk/NEWS
trunk/Po/ChangeLog
trunk/Po/jp.po
trunk/README-0.11.txt
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptKeyCache.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/TODO-GPGME-PORT.txt
Log:
2006-05-02 Timo Schulz <ts at g10code.de>
* wptFileManagerDlg.cpp (file_encrypt_dlg_proc): Use a
caption for the radio button group.
* wptKeyserverDlg.cpp (keyserver_recv_key): Use new code.
* wptKeyserver.cpp (kserver_recvkey, finger_recvkey,
ldap_recvkey): Avoid fixed buffers.
(do_spawn_ldap_helper): New.
(ldap_recvkey): Factor out code into helper function.
* wptPassphraseCBDlg.cpp (passphrase_callback_proc):
Increase width of the list box to make sure even large
user IDs will be completly displayed.
Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Include/wptKeyserver.h 2006-05-03 14:34:08 UTC (rev 209)
@@ -114,18 +114,17 @@
int kserver_sendkey (const char *hostname, WORD port,
const char *pubkey, int len);
int kserver_recvkey (const char *hostname, WORD port,
- const char *keyid, char *key, int maxkeylen);
-
+ const char *keyid, char **r_key, int *r_keylen);
int kserver_search_begin (const char *hostname, WORD port,
const char *pattern, int *conn_fd);
int kserver_search_next (int conn_fd, keyserver_key *key);
void kserver_search_end (int conn_fd);
/*-- Finger/LDAP Protocol --*/
-int ldap_recvkey (const char *hostname, const char *keyid, char *key,
- int maxkeylen);
-int finger_recvkey (const char * host, const char * user, char * key,
- int maxkeylen);
+int ldap_recvkey (const char *hostname, const char *keyid,
+ char **r_key, int *r_keylen);
+int finger_recvkey (const char *host, const char *user,
+ char **r_key, int *r_keylen);
/*-- Dialog support --*/
int hkp_send_key (HWND dlg, const char *kserver, unsigned short port,
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/NEWS 2006-05-03 14:34:08 UTC (rev 209)
@@ -808,3 +808,7 @@
for a key.
* Rewrote parts of the cache to key list control association system.
* 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.
+
+[Updated languages: de, jp]
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Po/ChangeLog 2006-05-03 14:34:08 UTC (rev 209)
@@ -1,3 +1,7 @@
+2006-05-01 Timo Schulz <ts at g10code.de>
+
+ * jp.po: Updated.
+
2006-04-21 Timo Schulz <ts at g10code.de>
* de.po: Updated.
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Po/jp.po 2006-05-03 14:34:08 UTC (rev 209)
@@ -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-29 19:32+0200\n"
+"POT-Creation-Date: 2006-04-22 20:08+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -80,16 +80,16 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:956 Src/wptKeyserver.cpp:541
+#: 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: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/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
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
@@ -153,7 +153,7 @@
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:814
+#: Src/wptFileManagerDlg.cpp:810
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
@@ -187,7 +187,7 @@
# c:\oss\winpt\src\WinPT.cpp:480
#: Src/WinPT.cpp:746
-#, fuzzy, c-format
+#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
"Please check your gpg.conf or set a new default key to correct it:\n"
@@ -195,7 +195,7 @@
"%s: public key not found."
msgstr ""
"GPGƒIƒvƒVƒ‡ƒ“ƒtƒ@ƒCƒ‹‚æ‚è‹K’èƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
-"‚±‚ê‚𒼂·‚Ì‚Égpg.conf (ƒIƒvƒVƒ‡ƒ“) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢:\n"
+"‚±‚ê‚𒼂·‚Ì‚Égpg.conf (ƒIƒvƒVƒ‡ƒ“) ‚ðƒ`ƒFƒbƒN‚·‚é‚©V‚µ‚¢‹K’èƒL[‚ðƒZƒbƒg‚µ‚Ä‚‚¾‚³‚¢:\n"
"\n"
"%s: ŒöŠJŒ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -211,12 +211,12 @@
#: Src/wptAboutDlgs.cpp:61
msgid "The AUTHORS files contains a list of all contributors and co-authors."
-msgstr ""
+msgstr "’˜ŽÒƒtƒ@ƒCƒ‹‚É‘S‚Ä‚ÌŠñ•tŽÒ‹y‚Ñ‹¤ìŽÒ‚ª‹LÚ‚³‚ê‚Ä‚¢‚Ü‚·B"
# 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:1741
+#: Src/wptAboutDlgs.cpp:96 Src/wptKeyManagerDlg.cpp:1726
#: Src/wptMainProc.cpp:586
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -228,7 +228,7 @@
# c:\oss\winpt\src\wptAboutDlgs.cpp:80
#: Src/wptAboutDlgs.cpp:99
msgid "A free open source privacy tray for Windows based on GnuPG."
-msgstr "GnuPG‚ÉŠî‚¢‚Ä‚¢‚éW32—p–³—¿µ°ÍßÝ¿°½ÌßײÊÞ¼°ÄÚ²"
+msgstr "GnuPG‚ÉŠî‚¢‚Ä‚¢‚éW32—p–³—¿µ°ÌßÝ¿°½ÌßײÊÞ¼°ÄÚ²"
# c:\oss\winpt\src\wptAboutDlgs.cpp:82
#: Src/wptAboutDlgs.cpp:101
@@ -239,7 +239,7 @@
#: Src/wptAboutDlgs.cpp:103
msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
msgstr ""
-"WinPT‚É‚æ‚éƒoƒbƒO‚âƒRƒƒ“ƒg‚ðŽŸ‚ÌƒAƒhƒŒƒX‚Ü‚Å<winpt at freakmail.de>‚¨Šè‚¢‚µ‚Ü"
+"WinPT‚É‚æ‚éƒoƒO‚âƒRƒƒ“ƒg‚ðŽŸ‚ÌƒAƒhƒŒƒX‚Ü‚Å<winpt at freakmail.de>‚¨Šè‚¢‚µ‚Ü"
"‚·B"
# c:\oss\winpt\src\wptAboutDlgs.cpp:86
@@ -269,8 +269,8 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2156
-#: Src/wptKeyManagerDlg.cpp:962
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
+#: Src/wptKeyManagerDlg.cpp:947
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:515
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
msgid "&Name"
msgstr "–¼‘O(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
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:377
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
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:653 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
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:1637
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1620
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:1397
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -546,9 +546,9 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1230
-#: Src/wptKeyRevokersDlg.cpp:128 Src/wptKeyRevokersDlg.cpp:174
-#: Src/wptVerifyList.cpp:176 Src/wptVerifyList.cpp:232
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
+#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -560,14 +560,14 @@
# c:\oss\winpt\src\wptFileManager.cpp:996
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1304
-#: Src/wptFileManager.cpp:1351
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
+#: Src/wptFileManager.cpp:1357
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1352
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -615,38 +615,38 @@
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:286
-#: Src/wptKeyManager.cpp:766 Src/wptKeyManager.cpp:954 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:274
+#: Src/wptKeyManager.cpp:752 Src/wptKeyManager.cpp:951 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:177
+#: Src/wptClipDecryptDlg.cpp:181
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:179
+#: Src/wptClipDecryptDlg.cpp:183
msgid "Signature Status: Created with a marginal trusted key"
msgstr "–¼‚Ìó‘ÔF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:182
+#: Src/wptClipDecryptDlg.cpp:186
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr "–¼‚Ìó‘ÔFM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:185
+#: Src/wptClipDecryptDlg.cpp:189
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:192
+#: Src/wptClipDecryptDlg.cpp:196
msgid "WinPT Verify"
msgstr "WinPT Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:193
+#: Src/wptClipDecryptDlg.cpp:197
#, c-format
msgid ""
"%s\n"
@@ -680,7 +680,7 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:114
# c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:570
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
msgid "File Open"
msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
@@ -747,8 +747,8 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2155
-#: Src/wptKeyserverDlg.cpp:593 Src/wptMDSumDlg.cpp:122
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
+#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -782,12 +782,12 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:518 Src/wptKeyEditDlgs.cpp:654
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
-#: Src/wptKeygenDlg.cpp:539 Src/wptKeyRevokeDlg.cpp:81
-#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeysignDlg.cpp:284 Src/wptPassphraseCB.cpp:93
+#: Src/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/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -837,17 +837,16 @@
#: 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:1085
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
# c:\oss\winpt\src\wptGPG.cpp:178
#: Src/wptClipSignDlg.cpp:164
-#, fuzzy
msgid "No useable signing key found"
-msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
+msgstr "Žg—p‚Å‚«‚é–¼‚·‚éƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipSignDlg.cpp:147
#: Src/wptClipSignDlg.cpp:232
@@ -882,7 +881,7 @@
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1203
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
msgid "No key was selected."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -894,7 +893,7 @@
#: Src/wptClipVerifyDlg.cpp:151
#, c-format
msgid "PKA: Verified signer's address is '%s'"
-msgstr ""
+msgstr "PKA: Šm”F‚µ‚½–¼ŽÒ‚ÌZŠ‚Í '%s' ‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:52
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:66
@@ -912,9 +911,9 @@
# c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
# c:\oss\winpt\src\wptMainProc.cpp:406
#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
-#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:209
-#: Src/wptClipVerifyDlg.cpp:241 Src/wptClipVerifyDlg.cpp:252
-#: Src/wptFileManager.cpp:1586 Src/wptFileManager.cpp:1639
+#: 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/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -923,7 +922,7 @@
msgstr "Šm”F‚·‚é"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:81
-#: Src/wptClipVerifyDlg.cpp:203
+#: Src/wptClipVerifyDlg.cpp:206
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -937,17 +936,17 @@
"ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
-#: Src/wptClipVerifyDlg.cpp:241
+#: Src/wptClipVerifyDlg.cpp:244
msgid "Invalid signature state."
msgstr "–¼‚Ì󋵂͖³Œø‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:118
-#: Src/wptClipVerifyDlg.cpp:251
+#: Src/wptClipVerifyDlg.cpp:254
msgid "Could not extract key or signature information."
msgstr "ƒL[‚Ü‚½‚Í–¼î•ñ‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptClipVerifyDlg.cpp:255
+#: Src/wptClipVerifyDlg.cpp:258
msgid "The signature is expired!"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚ª‰ß‚¬‚Ä‚¢‚Ü‚·I"
@@ -959,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:289 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -1021,37 +1020,36 @@
# 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: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: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
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1061,33 +1059,29 @@
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
-#, fuzzy
msgid "Choose Locale Directory"
-msgstr "'locale'ÃÞ¨Ú¸ÄØ‚Ì‘I‘ð"
+msgstr "'Locale'ÃÞ¨Ú¸ÄØ‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢"
# c:\oss\winpt\src\wptErrors.cpp:67
#: Src/wptCommonDlg.cpp:220
-#, fuzzy
msgid "Could not create winpt.mo file"
-msgstr "ƒtƒ@ƒCƒ‹‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+msgstr "winpt.moƒtƒ@ƒCƒ‹‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
#: Src/wptCommonDlg.cpp:251
msgid "Native Language Support"
-msgstr ""
+msgstr "ƒlƒCƒeƒBƒuŒ¾Œê‘Ήž"
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:60
#: Src/wptCommonDlg.cpp:252
-#, fuzzy
msgid "Please select a language"
-msgstr "ƒtƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
+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
-#, fuzzy
msgid "&OK"
-msgstr "OK"
+msgstr "&OK"
# c:\oss\winpt\src\wptErrors.cpp:43
#: Src/wptErrors.cpp:47
@@ -1324,12 +1318,12 @@
# c:\oss\winpt\src\wptMainProc.cpp:387 c:\oss\winpt\src\wptMainProc.cpp:526
#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp: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: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
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1365,7 +1359,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:1085
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1374,8 +1368,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:1184
-#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:104
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "–¼‘O"
@@ -1386,12 +1380,12 @@
msgstr "‘€ì"
# c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:663
+#: Src/wptFileManager.cpp:666
msgid "Please select a file."
msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:810
+#: Src/wptFileManager.cpp:813
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1401,25 +1395,25 @@
"‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:925
+#: Src/wptFileManager.cpp:928
#, 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:1008 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:825
-#: Src/wptFileManager.cpp:1052
+#: Src/wptFileManager.cpp:1055
msgid "Enter filename for encrypted file"
msgstr "ˆÃ†‰»‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:837
-#: Src/wptFileManager.cpp:1081
+#: Src/wptFileManager.cpp:1084
msgid "Could not get default secret key."
msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1428,7 +1422,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:296
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
-#: Src/wptFileManager.cpp:1112 Src/wptFileManager.cpp:1444
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1437,7 +1431,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:1125 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1446,62 +1440,63 @@
# c:\oss\winpt\src\wptFileManager.cpp:914
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
-#: Src/wptFileManager.cpp:1152 Src/wptFileManager.cpp:1185
-#: Src/wptFileManager.cpp:1190 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
+#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
# c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1193
msgid "Encryption failed."
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1231
-#, fuzzy, c-format
+#: Src/wptFileManager.cpp:1236
+#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
"%s from \"%s\"\n"
"%s"
msgstr ""
"–¼‚ª %s‚ð쬂µ‚Ü‚µ‚½BŽg—p‚µ‚½%s ƒL[ ID %s\n"
-"%s ‚©‚ç \"%s\"‚Å‚·B"
+"%s ‚©‚ç \"%s\"\n"
+"%s"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1236
+#: Src/wptFileManager.cpp:1241
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1313
+#: Src/wptFileManager.cpp:1319
msgid "Choose Filename for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1322
+#: Src/wptFileManager.cpp:1328
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:1360 Src/wptFileManager.cpp:1372
+#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1366
+#: Src/wptFileManager.cpp:1372
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1510,41 +1505,44 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
-#: Src/wptFileManager.cpp:1373
+#: Src/wptFileManager.cpp:1379
#, c-format
msgid ""
"The original file name is '%s'.\n"
"\n"
"Do you want to use this instead of '%s'?"
msgstr ""
+"Œ³‚̃tƒ@ƒCƒ‹–¼‚ª '%s' ‚Å‚·B\n"
+"\n"
+"‚±‚ê‚ð '%s' ‚Ì‘ã‚í‚è‚É–{“–‚ÉŽg—p‚µ‚Ü‚·‚©?"
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1421
+#: Src/wptFileManager.cpp:1427
msgid "Enter filename for signed file"
msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1531
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:1539
+#: Src/wptFileManager.cpp:1551
msgid "No files to check."
msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1556
+#: Src/wptFileManager.cpp:1568
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1570
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1586
+#: Src/wptFileManager.cpp:1598
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1559,18 +1557,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:1684 Src/wptFileManager.cpp:1695
-#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:404
-#: Src/wptImportList.cpp:410 Src/wptImportList.cpp:420
-#: Src/wptImportList.cpp:428 Src/wptImportList.cpp:437
-#: Src/wptKeyManager.cpp:460 Src/wptKeyManager.cpp:471
-#: Src/wptKeyManager.cpp:599 Src/wptKeyserverDlg.cpp:223
+#: 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
msgid "Import"
msgstr "ƒCƒ“ƒ|[ƒg"
# c:\oss\winpt\src\wptFileManager.cpp:1285
# c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptFileManager.cpp:1692
+#: Src/wptFileManager.cpp:1704
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1586,15 +1584,15 @@
# c:\oss\winpt\src\wptKeyManager.cpp:262
# c:\oss\winpt\src\wptKeyManager.cpp:294
# c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1718 Src/wptKeyManager.cpp:264
-#: Src/wptKeyManager.cpp:307 Src/wptKeyManager.cpp:342
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
+#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
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:1718 Src/wptFileManager.cpp:1741
+#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1602,8 +1600,8 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManagerDlg.cpp:1701
-#: Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
+#: Src/wptKeyManagerDlg.cpp:1718
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1612,51 +1610,51 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1745 Src/wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1350 Src/wptKeyEditDlgs.cpp:1423
+#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1757
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1791
+#: Src/wptFileManager.cpp:1803
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1851
+#: Src/wptFileManager.cpp:1863
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:1856
+#: Src/wptFileManager.cpp:1868
msgid "Choose File Name for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1926
+#: Src/wptFileManager.cpp:1938
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:1929
+#: Src/wptFileManager.cpp:1941
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:1929 Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1936
+#: Src/wptFileManager.cpp:1948
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1694,14 +1692,14 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:190
# c:\oss\winpt\src\wptKeyManager.cpp:408
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:424
+#: Src/wptKeyManager.cpp:412
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:449
+#: Src/wptKeyManager.cpp:437
msgid "Key Import"
msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
@@ -1712,7 +1710,7 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
#: Src/wptFileManagerDlg.cpp:212 Src/wptFileManagerDlg.cpp:473
-#: Src/wptKeyManagerDlg.cpp:927 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
@@ -1758,7 +1756,7 @@
# c:\oss\winpt\src\wptGPGOptDlg.cpp:79 c:\oss\winpt\src\wptGPGOptDlg.cpp:83
# c:\oss\winpt\src\wptGPGOptDlg.cpp:90 c:\oss\winpt\src\wptGPGOptDlg.cpp:96
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:580
-#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:954
+#: Src/wptFileManagerDlg.cpp:286 Src/wptKeyManagerDlg.cpp:939
msgid "Options"
msgstr "ƒIƒvƒVƒ‡ƒ“"
@@ -1778,14 +1776,14 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1322
-#: Src/wptKeyEditDlgs.cpp:1373 Src/wptKeyEditDlgs.cpp:1449
-#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:787
-#: Src/wptKeyManager.cpp:821 Src/wptKeyManagerDlg.cpp:1511
-#: Src/wptKeyManagerDlg.cpp:1527 Src/wptKeyManagerDlg.cpp:1555
-#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
-#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1710
-#: Src/wptKeyserverSearchDlg.cpp:117
+#: 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
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1804,12 +1802,12 @@
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:928
-#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptFileManagerDlg.cpp:474 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:929
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:929
+#: Src/wptFileManagerDlg.cpp:475 Src/wptKeyManagerDlg.cpp:914
msgid "View"
msgstr "ƒrƒ…["
@@ -1840,8 +1838,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:357
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:945
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptFileManagerDlg.cpp:480 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Sign"
msgstr "–¼(&S)"
@@ -1950,30 +1948,30 @@
msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:766
+#: Src/wptFileManagerDlg.cpp:762
msgid "Are you sure you want to secure delete these files?"
msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘S휂µ‚Ü‚·‚©Hn"
-#: Src/wptFileManagerDlg.cpp:767 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:768 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:811
+#: Src/wptFileManagerDlg.cpp:807
msgid "Operation Status: Error"
msgstr "‘€ìó‹µFƒGƒ‰["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:812
+#: Src/wptFileManagerDlg.cpp:808
msgid "Operation Status: Done."
msgstr "‘€ìó‹µFŠ®—¹B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:855
+#: Src/wptFileManagerDlg.cpp:851
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -2108,7 +2106,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:1762 Src/wptKeyManagerDlg.cpp:940
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -2128,7 +2126,6 @@
# c:\oss\winpt\src\wptGPG.cpp:863
#: Src/wptGPG.cpp:899
-#, fuzzy
msgid "Please choose your Public Keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2149,7 +2146,6 @@
# c:\oss\winpt\src\wptGPG.cpp:883
#: Src/wptGPG.cpp:921
-#, fuzzy
msgid "Please choose your Secret Keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2189,42 +2185,42 @@
msgid "No GPG error description available."
msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
-#: Src/wptGPGME.cpp:318
+#: Src/wptGPGME.cpp:313
msgid "Error during verification process."
msgstr "Šm”F’iŠK‚ŃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptGPGME.cpp:319
+#: Src/wptGPGME.cpp:314
msgid "The signature is good."
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptGPGME.cpp:320
+#: Src/wptGPGME.cpp:315
msgid "The signature is BAD!"
msgstr "–³Œø‚È–¼"
-#: Src/wptGPGME.cpp:321
+#: Src/wptGPGME.cpp:316
msgid "The signature could not be checked due to a missing key."
msgstr "‚È‚‚È‚Á‚½ƒL[‚Ì‚½‚ß–¼‚ªƒ`ƒFƒbƒN‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:190
# c:\oss\winpt\src\wptKeyManager.cpp:408
-#: Src/wptGPGME.cpp:322
+#: Src/wptGPGME.cpp:317
msgid "No valid OpenPGP signature."
msgstr "—LŒø‚ÈOpenPGP–¼‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptGPGME.cpp:323
+#: Src/wptGPGME.cpp:318
msgid "Signature Error"
msgstr "–¼ƒGƒ‰["
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptGPGME.cpp:324
+#: Src/wptGPGME.cpp:319
msgid "Good Signature (Expired Key)"
msgstr "—LŒø‚È–¼iŠúŒÀØ‚êƒL[j"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptGPGME.cpp:325
+#: Src/wptGPGME.cpp:320
msgid "Good Signature (Revoked Key)"
msgstr "—LŒø‚È–¼i–³Œø‚ȃL[j"
@@ -2276,7 +2272,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:1663
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1646
#: Src/wptMainProc.cpp:598
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2302,7 +2298,7 @@
#: Src/wptGPGPrefsDlg.cpp:149
msgid "Allow to set an expiration date for signatures"
-msgstr ""
+msgstr "–¼‚Ì—LŒøŠúŒÀÝ’è‚ð‹–‰Â‚·‚éB"
# c:\oss\winpt\src\wptErrors.cpp:68
#: Src/wptGPGPrefsDlg.cpp:150
@@ -2364,15 +2360,13 @@
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
#: Src/wptGPGPrefsDlg.cpp:312
-#, fuzzy
msgid "Choose GPG Home Directory"
msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
#: Src/wptGPGPrefsDlg.cpp:340
-#, fuzzy
msgid "Choose GPG Binary"
-msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð"
+msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\WinPT.cpp:332 c:\oss\winpt\src\wptImagelist.cpp:47
# c:\oss\winpt\src\wptKeyManager.cpp:98
@@ -2442,36 +2436,36 @@
# c:\oss\winpt\src\wptKeysigDlg.cpp:397 c:\oss\winpt\src\wptMainProc.cpp:388
# c:\oss\winpt\src\wptMainProc.cpp:536
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:168 Src/wptKeyManager.cpp:173
-#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:265
-#: Src/wptKeyManager.cpp:277 Src/wptKeyManager.cpp:308
-#: Src/wptKeyManager.cpp:313 Src/wptKeyManager.cpp:320
-#: Src/wptKeyManager.cpp:322 Src/wptKeyManager.cpp:343
-#: Src/wptKeyManager.cpp:352 Src/wptKeyManager.cpp:356
-#: Src/wptKeyManager.cpp:376 Src/wptKeyManager.cpp:417
-#: Src/wptKeyManager.cpp:422 Src/wptKeyManager.cpp:425
-#: Src/wptKeyManager.cpp:430 Src/wptKeyManager.cpp:436
-#: Src/wptKeyManager.cpp:441 Src/wptKeyManager.cpp:569
-#: Src/wptKeyManager.cpp:577 Src/wptKeyManager.cpp:683
-#: Src/wptKeyManager.cpp:714 Src/wptKeyManager.cpp:723
-#: Src/wptKeyManager.cpp:734 Src/wptKeyManager.cpp:760
-#: Src/wptKeyManager.cpp:787 Src/wptKeyManager.cpp:792
-#: Src/wptKeyManager.cpp:816 Src/wptKeyManager.cpp:821
-#: Src/wptKeyManager.cpp:838 Src/wptKeyManager.cpp:891
-#: Src/wptKeyManager.cpp:896 Src/wptKeyManager.cpp:952
-#: Src/wptKeyManager.cpp:982 Src/wptKeyManager.cpp:1069
-#: Src/wptKeyManagerDlg.cpp:1178 Src/wptKeyManagerDlg.cpp:1191
-#: Src/wptKeyManagerDlg.cpp:1201 Src/wptKeyManagerDlg.cpp:1490
-#: Src/wptKeyManagerDlg.cpp:1512 Src/wptKeyManagerDlg.cpp:1527
-#: Src/wptKeyManagerDlg.cpp:1537 Src/wptKeyManagerDlg.cpp:1545
-#: Src/wptKeyManagerDlg.cpp:1555 Src/wptKeyManagerDlg.cpp:1561
-#: Src/wptKeyManagerDlg.cpp:1571 Src/wptKeyManagerDlg.cpp:1584
-#: Src/wptKeyManagerDlg.cpp:1601 Src/wptKeyManagerDlg.cpp:1633
-#: Src/wptKeyManagerDlg.cpp:1692 Src/wptKeyManagerDlg.cpp:1710
-#: Src/wptKeyManagerDlg.cpp:1715 Src/wptKeyManagerDlg.cpp:1720
-#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1925
-#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:289
-#: Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:372 Src/wptKeysigDlg.cpp:420
+#: Src/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
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2490,7 +2484,7 @@
# c:\oss\winpt\src\wptKeyManager.cpp:1092
#: Src/wptGroupManager.cpp:236
-#, fuzzy, c-format
+#, c-format
msgid ""
"Do you really want to delete this entry?\n"
"\n"
@@ -2570,13 +2564,12 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp: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: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
msgid "Revoked"
msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2585,26 +2578,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: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: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
msgid "Expired"
msgstr "ŠúŒÀØ‚ê"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptImportList.cpp:272
+#: Src/wptImportList.cpp:268
msgid "secret key"
msgstr "ӎФΨ"
# c:\oss\winpt\src\wptImportList.cpp:57
-#: Src/wptImportList.cpp:274 Src/wptKeylist.cpp:458
+#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
msgid "public key"
msgstr "ŒöŠJŒ®"
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1222
+#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2614,9 +2607,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: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: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/wptVerifyList.cpp:112
msgid "User ID"
msgstr "ƒ†[ƒU[ID"
@@ -2625,8 +2618,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:474 c:\oss\winpt\src\wptKeylist.cpp:40
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
-#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:577 Src/wptKeylist.cpp:586
-#: Src/wptKeyManagerDlg.cpp:875 Src/wptKeyserverSearchDlg.cpp:50
+#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
+#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2636,10 +2629,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: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: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/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "ƒL[‚ÌID"
@@ -2649,21 +2642,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: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: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
msgid "Creation"
msgstr "ì¬"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:585
-#: Src/wptKeyManagerDlg.cpp:874 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
+#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
msgid "Type"
msgstr "Ží—Þ"
# c:\oss\winpt\src\wptImportList.cpp:216
-#: Src/wptImportList.cpp:418
+#: Src/wptImportList.cpp:426
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
"and thus a CRC error occurs."
@@ -2673,52 +2666,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:747
+#: Src/wptKeyCache.cpp:655
msgid "Load GPG Keyrings..."
msgstr "GPGƒL[ƒŠƒ“ƒO‚ðƒ[ƒh‚·‚é..."
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:48
-#: Src/wptKeyCacheDlg.cpp:52
+#: Src/wptKeyCacheDlg.cpp:53
msgid "WinPT Key Caching"
msgstr "WinPT ƒL[ƒLƒƒƒbƒVƒ“ƒO"
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:51
-#: Src/wptKeyCacheDlg.cpp:55
+#: Src/wptKeyCacheDlg.cpp:56
msgid "Caching keyrings, please wait..."
msgstr "ƒL[ƒŠƒ“ƒO‚ªƒLƒƒƒbƒVƒ“ƒO’†‚Å‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢..."
# c:\oss\winpt\src\wptKeyCacheDlg.cpp:65
-#: Src/wptKeyCacheDlg.cpp:70
+#: Src/wptKeyCacheDlg.cpp:69
msgid "Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:234
msgid "Ultimate"
msgstr "ÅI“I"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
# c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1151
-#: Src/wptKeylist.cpp:243 Src/wptKeylist.cpp:382
+#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
+#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
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:259 Src/wptKeyEditDlgs.cpp:1158
+#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
msgid "OK"
msgstr "OK"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:281
+#: Src/wptKeyEditDlgs.cpp:288
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:289
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2726,7 +2719,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:364
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 "
@@ -2737,7 +2730,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:355
+#: Src/wptKeyEditDlgs.cpp:365
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2747,8 +2740,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:356 Src/wptKeyEditDlgs.cpp:444
-#: Src/wptKeysignDlg.cpp:283
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
+#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2757,12 +2750,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:358
+#: Src/wptKeyEditDlgs.cpp:368
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:373
+#: Src/wptKeyEditDlgs.cpp:383
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2771,25 +2764,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:377 Src/wptKeyEditDlgs.cpp:387
-#: Src/wptKeyEditDlgs.cpp:393 Src/wptKeyEditDlgs.cpp:405
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
+#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
+#: Src/wptKeyEditDlgs.cpp:926
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:388
#, 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:387 Src/wptKeyRevokeDlg.cpp:173
+#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
msgid "Please enter a file name."
msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:391
+#: Src/wptKeyEditDlgs.cpp:401
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2798,7 +2791,7 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:410
+#: Src/wptKeyEditDlgs.cpp:420
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2817,23 +2810,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: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/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/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:318
-#: Src/wptKeyEditDlgs.cpp:442
+#: Src/wptKeyEditDlgs.cpp:452
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:443
+#: Src/wptKeyEditDlgs.cpp:453
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2841,8 +2834,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:446 Src/wptKeyEditDlgs.cpp:462
-#: Src/wptKeyEditDlgs.cpp:475 Src/wptKeyEditDlgs.cpp:946
+#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
+#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2851,35 +2844,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: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: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
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:490
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:524
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:526
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:517
+#: Src/wptKeyEditDlgs.cpp:527
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:533
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2887,14 +2880,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:534 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:562
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:573
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:547
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2902,43 +2895,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:545
+#: Src/wptKeyEditDlgs.cpp:552
msgid "Please enter an email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:556
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:564
+#: Src/wptKeyEditDlgs.cpp:575
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:649 Src/wptKeyEditDlgs.cpp:853
+#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:661
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:662
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:663
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:709
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2951,18 +2944,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:699 Src/wptKeyEditDlgs.cpp:705
-#: Src/wptKeyEditDlgs.cpp:737 Src/wptKeyEditDlgs.cpp:836
+#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:704
+#: Src/wptKeyEditDlgs.cpp:715
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:739
+#: Src/wptKeyEditDlgs.cpp:750
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2975,40 +2968,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: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: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
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:768 Src/wptKeyEditDlgs.cpp:786
+#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:893
+#: Src/wptKeyEditDlgs.cpp:904
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:980 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyManager.cpp:156
-#: Src/wptKeyEditDlgs.cpp:983 Src/wptKeyManager.cpp:220
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
msgid "Key status changed."
msgstr "ƒL[‚Ìó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:1032
+#: Src/wptKeyEditDlgs.cpp:1043
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -3017,19 +3010,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptKeyEditDlgs.cpp:1050
msgid "Current (old) Passphrase"
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:1043
+#: Src/wptKeyEditDlgs.cpp:1054
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:1050 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3038,58 +3031,57 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1062
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1075
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1081 Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1084
+#: Src/wptKeyEditDlgs.cpp:1095
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
-#: Src/wptKeyEditDlgs.cpp:1098 Src/wptKeyEditDlgs.cpp:1192
+#: 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:1105
+#: Src/wptKeyEditDlgs.cpp:1116
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:1183 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:588
-#: Src/wptKeyManagerDlg.cpp:877
+#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
+#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1185
+#: Src/wptKeyEditDlgs.cpp:1200
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1213
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1280
-#, fuzzy
+#: Src/wptKeyEditDlgs.cpp:1307
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"
@@ -3101,23 +3093,24 @@
"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"
+"ADDUID \t\tƒ†[ƒU[ID‚ð’ljÁ‚·‚é\r\n"
"ADDPHOTO \t\tƒtƒHƒgID‚ð’ljÁ‚·‚é\r\n"
"DELUID \t\tƒ†[ƒU[ID‚ð휂·‚é\r\n"
"ADDKEY \t\t“ñŽŸƒL[‚ð’ljÁ‚·‚é\r\n"
"DELKEY \t\t“ñŽŸƒL[‚ð휂·‚é\r\n"
"ADDREVOKER\t\t–³Œø‰»ƒL[‚ð’ljÁ‚·‚é\r\n"
"EXPIRE \t\t—LŒøŠúŒÀ‚ð•ÏX‚·‚é\r\n"
+"SHOWPREF \t\tƒIƒvƒVƒ‡ƒ“‚ð‰{——‚·‚é (verbose)\r\n"
+"SETPREF \t\tƒIƒvƒVƒ‡ƒ“‚ðÝ’è‚·‚é\r\n"
"UPDPREF \t\tƒIƒvƒVƒ‡ƒ“Ý’è‚ðXV‚³‚ꂽ\r\n"
"PASSWD \t\tƒpƒXƒtƒŒ[ƒY‚ð•ÏX‚·‚é\r\n"
"PRIMARY \t\tƒ†[ƒU[ID‚ðƒvƒ‰ƒCƒ}ƒŠ‚Æ‚µ‚ătƒ‰ƒO‚·‚é\r\n"
@@ -3126,24 +3119,27 @@
"REVKEY \t\t“ñŽŸƒL[‚𖳌ø‚É‚·‚é\r\n"
"DISABLE \t\tƒL[‚𖳌ø‚É‚·‚é\r\n"
"ENABLE \t\tƒL[‚ð—LŒø‚É‚·‚é\r\n"
+"SIGN\t \t\tƒ†[ƒU[ID‚𖼂·‚é(ƒGƒLƒXƒ|[ƒgo—ˆ‚é‚à‚Ì)\r\n"
+"LSIGN\t \t\tƒ†[ƒU[ID‚𖼂·‚é(ƒGƒLƒXƒ|[ƒgo—ˆ‚È‚¢‚à‚Ì)\r\n"
+"CLEAN \t\t•sˆÀ’è‚Ì–¼‚ðƒL[‚©‚çŠO‚·\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1328
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1344
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1326
+#: Src/wptKeyEditDlgs.cpp:1352
msgid "Primary subkey can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒTƒuƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1334
+#: Src/wptKeyEditDlgs.cpp:1360
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3161,16 +3157,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1372
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1376
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1407
msgid ""
"Key already expired.\n"
"\n"
@@ -3183,22 +3179,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:1390 Src/wptKeyEditDlgs.cpp:1393
+#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1442
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1453
+#: Src/wptKeyEditDlgs.cpp:1479
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3211,37 +3207,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1462
+#: Src/wptKeyEditDlgs.cpp:1488
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1485
+#: Src/wptKeyEditDlgs.cpp:1511
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1507
+#: Src/wptKeyEditDlgs.cpp:1533
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1512
+#: Src/wptKeyEditDlgs.cpp:1538
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:1549
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1555
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3253,58 +3249,56 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1553
+#: Src/wptKeyEditDlgs.cpp:1579
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1583
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1599
-#, fuzzy
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "Could not set user ID preferences"
-msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+msgstr "ƒ†[ƒU[IDƒIƒvƒVƒ‡ƒ“‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1639
+#: Src/wptKeyEditDlgs.cpp:1665
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1642
+#: Src/wptKeyEditDlgs.cpp:1668
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1736
+#: Src/wptKeyEditDlgs.cpp:1755
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1740
+#: Src/wptKeyEditDlgs.cpp:1761
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1742
-#, fuzzy
+#: Src/wptKeyEditDlgs.cpp:1763
msgid "user ID:"
-msgstr "ƒ†[ƒU[ID"
+msgstr "ƒ†[ƒU[IDF"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptKeyEditDlgs.cpp:1815
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1813
-#, fuzzy, c-format
+#: Src/wptKeyEditDlgs.cpp:1826
+#, c-format
msgid ""
"user ID \"%s\".\n"
"\n"
@@ -3314,75 +3308,57 @@
msgstr ""
"ƒ†[ƒU[ID \"%s\".\n"
"\n"
+"‚±‚̃†[ƒU[IDã‚É‚ ‚é‘S‚Ä‚Ì–¼‚ªíœ‚³‚ê‚Ü‚·B\n"
+"\n"
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1833
+#: Src/wptKeyEditDlgs.cpp:1846
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1850
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1942 Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:1955
msgid "Finished to compact key."
-msgstr ""
+msgstr "ƒL[‚ðƒRƒ“ƒpƒNƒg‚·‚邱‚Æ‚ªŠ®¬‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1997
-#, fuzzy
+#: Src/wptKeyEditDlgs.cpp:1992
msgid "Do you really want to make this sig exportable?"
-msgstr ""
-"‚±‚̃Oƒ‹[ƒv‚ð–{“–‚É휂µ‚Ü‚·‚©H\n"
-"\n"
-"%s"
+msgstr "‚±‚Ì–¼‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
+
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeysignDlg.cpp:392
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:2084
-#, c-format
-msgid ""
-"Your keys is listed as a designated revoker for the key\n"
-"\n"
-"%s\n"
-"\n"
-"Are you sure you want to create a revocation certificate\n"
-"which allow to revoke the key listed above?"
-msgstr ""
-
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:2132
+#: Src/wptKeyEditDlgs.cpp:2074
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:2145
+#: Src/wptKeyEditDlgs.cpp:2087
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:2154
+#: Src/wptKeyEditDlgs.cpp:2096
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
-# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyEditDlgs.cpp:2157
-#, fuzzy
-msgid "&Revoke..."
-msgstr "–³Œø‰»‚«‚Ì‚¤"
-
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2189
+#: Src/wptKeyEditDlgs.cpp:2128
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2193
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3442,8 +3418,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:935
-#: Src/wptKeyManagerDlg.cpp:1757 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:920
+#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -3477,11 +3453,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: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: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
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
@@ -3555,7 +3531,7 @@
msgstr "RSA ‹y‚Ñ RSA (PGP)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:144
-#: Src/wptKeygenDlg.cpp:371
+#: Src/wptKeygenDlg.cpp:370
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
@@ -3564,84 +3540,84 @@
"ƒZ[ƒW‚ª‚Ђ傤‚¶‚·‚é‚Ü‚Å‚¨‘Ò‚¿‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:372
msgid "Subkey size in &bits"
msgstr "ƒTƒuƒL[‚̃rƒbƒg’PˆÊ‚Å‚Ì‘å‚«‚³(&B)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:147
-#: Src/wptKeygenDlg.cpp:374
+#: Src/wptKeygenDlg.cpp:373
msgid "&Real name"
msgstr "ŽÀ–¼(&R)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:153
-#: Src/wptKeygenDlg.cpp:378
+#: Src/wptKeygenDlg.cpp:377
msgid "Key &type"
msgstr "ƒL[‚ÌŽí—Þ(&T)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:189
-#: Src/wptKeygenDlg.cpp:407
+#: Src/wptKeygenDlg.cpp:406
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:412
+#: Src/wptKeygenDlg.cpp:411
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:418 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:564
+#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
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:429 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
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:437
+#: Src/wptKeygenDlg.cpp:434
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:460 Src/wptKeyRevokeDlg.cpp:181
+#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
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:489 Src/wptKeygenDlg.cpp:606
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:535
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:536
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:537
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:538
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:539
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"
@@ -3652,7 +3628,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:540
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3665,19 +3641,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: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: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
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:543
msgid "E&xpert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:577
+#: Src/wptKeygenDlg.cpp:578
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3743,51 +3719,51 @@
msgstr "ƒL[‚ªƒAƒbƒvƒf[ƒg‚³‚ê‚Ä‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:260
+#: Src/wptKeylist.cpp:252
msgid "Key Pair"
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:262
+#: Src/wptKeylist.cpp:254
msgid "Key Pair (Card)"
msgstr "ƒL[ƒyƒA(ƒJ[ƒh)"
# c:\oss\winpt\src\wptKeylist.cpp:168
-#: Src/wptKeylist.cpp:263
+#: Src/wptKeylist.cpp:255
msgid "Public Key"
msgstr "ŒöŠJŒ®"
-#: Src/wptKeylist.cpp:380
+#: Src/wptKeylist.cpp:353
msgid "None"
msgstr "‚È‚µ"
# c:\oss\winpt\src\wptMAPI.cpp:396 c:\oss\winpt\src\wptMAPI.cpp:404
-#: Src/wptKeylist.cpp:384
+#: Src/wptKeylist.cpp:357
msgid "Marginal"
msgstr "‚Ù‚ñ‚̂킸‚©‚΂©‚è"
-#: Src/wptKeylist.cpp:387
+#: Src/wptKeylist.cpp:360
msgid "Full"
msgstr "ƒtƒ‹"
-#: Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:450 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr "–³Œø‰»‚È‚Á‚½"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:460
+#: Src/wptKeylist.cpp:433
msgid "key pair"
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:578 Src/wptKeylist.cpp:587 Src/wptKeyManagerDlg.cpp:876
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeyManagerDlg.cpp:950
msgid "Cipher"
msgstr "ˆÃ†"
# c:\oss\winpt\src\wptKeylist.cpp:54 c:\oss\winpt\src\wptVerifyList.cpp:78
# c:\oss\winpt\src\wptVerifyList.cpp:86
-#: Src/wptKeylist.cpp:589 Src/wptKeyManagerDlg.cpp:878
+#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "M—p"
@@ -3796,12 +3772,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:762 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
msgid "Invalid User ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
# c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1030
+#: Src/wptKeylist.cpp:1007
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -3817,12 +3793,12 @@
"‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1038 Src/wptKeylist.cpp:1100
+#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
msgid "Recipients"
msgstr "ŽóMŽÒ"
# c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1101
+#: Src/wptKeylist.cpp:1080
#, c-format
msgid ""
"KeyID %s.\n"
@@ -3832,12 +3808,12 @@
"–{“–‚É–³Œø‚ȃL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1203
+#: Src/wptKeylist.cpp:1182
msgid "Secret Key List"
msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManager.cpp:97
-#: Src/wptKeyManager.cpp:167
+#: Src/wptKeyManager.cpp:153
msgid ""
"This key has expired!\n"
"Key check failed."
@@ -3846,7 +3822,7 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:100
-#: Src/wptKeyManager.cpp:172
+#: Src/wptKeyManager.cpp:158
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
@@ -3855,29 +3831,29 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:298
-#: Src/wptKeyManager.cpp:312
+#: Src/wptKeyManager.cpp:300
msgid "Only one secret key can be exported."
msgstr "ˆêŒÂ‚̔閧Œ®‚Ì‚Ý‚ªƒGƒLƒXƒ|[ƒg‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:323
+#: Src/wptKeyManager.cpp:311
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr "”é–§Œ®‚ð'%s'‚É•Û‘¶‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptKeyManager.cpp:357
+#: Src/wptKeyManager.cpp:345
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr "ƒL[‚𳂵‚'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:412
-#: Src/wptKeyManager.cpp:429
+#: Src/wptKeyManager.cpp:417
msgid "No valid OpenPGP keys found."
msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:416
-#: Src/wptKeyManager.cpp:434
+#: Src/wptKeyManager.cpp:422
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
@@ -3886,13 +3862,13 @@
"ƒL[‚ðˆø‚o‚µ‚½‚¢‚Å‚µ‚傤‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:422
-#: Src/wptKeyManager.cpp:440
+#: Src/wptKeyManager.cpp:428
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:469 Src/wptKeyManager.cpp:597
+#: Src/wptKeyManager.cpp:457 Src/wptKeyManager.cpp:585
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -3903,51 +3879,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:498 Src/wptKeyManager.cpp:505
-#: Src/wptKeyManager.cpp:514
+#: Src/wptKeyManager.cpp:486 Src/wptKeyManager.cpp:493
+#: Src/wptKeyManager.cpp:502
msgid "Key Import HTTP"
msgstr "ƒL[ƒCƒ“ƒ|[ƒg‚ÌHTTP"
# c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:498
+#: Src/wptKeyManager.cpp:486
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr "–³Œø‚ÈHTTP URL: %s"
# c:\oss\winpt\src\wptMAPI.cpp:348
-#: Src/wptKeyManager.cpp:515
-#, fuzzy, c-format
+#: Src/wptKeyManager.cpp:503
+#, c-format
msgid "Could not fetch key from URL: %s"
-msgstr "'%s' ‚ɑ΂µ‚ăL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+msgstr "URL'%s'‚æ‚èƒL[‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1082
-#: Src/wptKeyManager.cpp:544
+#: Src/wptKeyManager.cpp:532
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:557
+#: Src/wptKeyManager.cpp:545
msgid "File Import"
msgstr "ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒ|[ƒg"
# c:\oss\winpt\src\wptKeyManager.cpp:500
-#: Src/wptKeyManager.cpp:568
+#: Src/wptKeyManager.cpp:556
msgid "Could not read key-data from file."
msgstr "ƒL[‚̃f[ƒ^‚ðƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:688
+#: Src/wptKeyManager.cpp:676
msgid "Do you really want to confirm each key?"
msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
-#: Src/wptKeyManager.cpp:689
+#: Src/wptKeyManager.cpp:677
msgid "Delete Confirmation"
msgstr "Šm”F‚ð휂·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:715
+#: Src/wptKeyManager.cpp:701
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -3959,7 +3935,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:724
+#: Src/wptKeyManager.cpp:710
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3977,7 +3953,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:731
+#: Src/wptKeyManager.cpp:717
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3988,86 +3964,86 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:793
-#, fuzzy, c-format
+#: Src/wptKeyManager.cpp:781
+#, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
-msgstr "'%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s? ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
+msgstr "'0x%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:815
+#: Src/wptKeyManager.cpp:803
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:890
+#: Src/wptKeyManager.cpp:883
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:895
+#: Src/wptKeyManager.cpp:888
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:966
+#: Src/wptKeyManager.cpp:963
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:966
+#: Src/wptKeyManager.cpp:963
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:977
+#: Src/wptKeyManager.cpp:974
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:74
-#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1045 Src/wptKeyRevokeDlg.cpp:89
msgid "0. No reason specified"
msgstr "0. ——R‚Í–¾Ž¦‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:75
-#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1046 Src/wptKeyRevokeDlg.cpp:90
msgid "1. Key has been compromised"
msgstr "1. ƒL[‚ÍM—p‚Å‚«‚È‚‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:76
-#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:89
+#: Src/wptKeyManager.cpp:1047 Src/wptKeyRevokeDlg.cpp:91
msgid "2. Key is superseded"
msgstr "2. ƒL[‚Í”pŽ~‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:77
-#: Src/wptKeyManager.cpp:1049 Src/wptKeyRevokeDlg.cpp:90
+#: Src/wptKeyManager.cpp:1048 Src/wptKeyRevokeDlg.cpp:92
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:449 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:435 Src/wptKeyManagerDlg.cpp:970
msgid "Paste Key from Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:470
+#: Src/wptKeyManagerDlg.cpp:456
#, c-format
msgid "Default Key: %s"
msgstr "‹K’èƒL[‚Í: %s"
# c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:472
+#: Src/wptKeyManagerDlg.cpp:458
#, c-format
msgid "Default Key: 0x%s"
msgstr "‹K’èƒL[‚Í: 0x%s"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:493
+#: Src/wptKeyManagerDlg.cpp:479
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:494
+#: Src/wptKeyManagerDlg.cpp:480
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4078,71 +4054,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:930
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Key"
msgstr "ƒL["
# c:\oss\winpt\src\wptGroupsDlg.cpp:49
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:1216
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:1199
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:934
+#: Src/wptKeyManagerDlg.cpp:919
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:936
+#: Src/wptKeyManagerDlg.cpp:921
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:922
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:938
+#: Src/wptKeyManagerDlg.cpp:923
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:939
+#: Src/wptKeyManagerDlg.cpp:924
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:925
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:942
+#: Src/wptKeyManagerDlg.cpp:927
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:943
+#: Src/wptKeyManagerDlg.cpp:928
msgid "&Normal"
msgstr "•’Ê(&N)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyManagerDlg.cpp:947
-#: Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:931 Src/wptKeyManagerDlg.cpp:932
+#: Src/wptKeyManagerDlg.cpp:976
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:948 Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:933 Src/wptKeyManagerDlg.cpp:977
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:934 Src/wptKeyManagerDlg.cpp:973
msgid "&List Signatures"
msgstr "–¼‚̈ꗗ‚Ђ傤(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:578
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:958
# c:\oss\winpt\src\wptKeyTrustPathDlg.cpp:126
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptKeyManagerDlg.cpp:1566
+#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:1549
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4150,112 +4126,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:951
+#: Src/wptKeyManagerDlg.cpp:936
msgid "&Export..."
msgstr "ƒGƒLƒXƒ|[ƒg(&E)..."
# c:\oss\winpt\src\wptClipImportDlg.cpp:181
# c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptKeyManagerDlg.cpp:952
+#: Src/wptKeyManagerDlg.cpp:937
msgid "&Import..."
msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeysigDlg.cpp:405
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeysigDlg.cpp:400
msgid "&Properties"
msgstr "‘®«(&P)"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:957
+#: Src/wptKeyManagerDlg.cpp:942
msgid "E&xport Secret Key"
msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:943
msgid "Re&load Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:959
+#: Src/wptKeyManagerDlg.cpp:944
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:960
+#: Src/wptKeyManagerDlg.cpp:945
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:961 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:965
msgid "Copy User ID to Clipboard"
msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:966
msgid "Copy Key ID to Clipboard"
msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:967
msgid "Copy Fingerprint to Clipboard"
msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:968
msgid "Copy Key Info to Clipboard"
msgstr "ƒL[ƒCƒ“ƒtƒH‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:969
msgid "Copy Key to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:971
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:980
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Re&fresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:982
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:983
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:984
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Key..."
msgstr "ƒL[..."
@@ -4265,24 +4241,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:1002
+#: Src/wptKeyManagerDlg.cpp:987
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeyManagerDlg.cpp:988
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:989
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:993
msgid "Add"
msgstr "’ljÁ"
@@ -4301,73 +4277,75 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:994
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1189
+#: Src/wptKeyManagerDlg.cpp:1173
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
msgstr ""
+"Å‚M—pŽÒƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
+"‚È‚‚Ä‚àˆê‚‚̃L[‚ðÅ‚M—pŽÒƒL[‚Æ‚µ‚Äݒ肵‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
# c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1200
+#: Src/wptKeyManagerDlg.cpp:1184
msgid "Could not set keylist window procedure."
msgstr "ƒL[ƒŠƒXƒgƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1318
+#: Src/wptKeyManagerDlg.cpp:1301
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1322
+#: Src/wptKeyManagerDlg.cpp:1305
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1326
+#: Src/wptKeyManagerDlg.cpp:1309
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1330
+#: Src/wptKeyManagerDlg.cpp:1313
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1334
+#: Src/wptKeyManagerDlg.cpp:1317
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1338
+#: Src/wptKeyManagerDlg.cpp:1321
msgid "Copy key to clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:1342
+#: Src/wptKeyManagerDlg.cpp:1325
msgid "Paste key from clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1346
+#: Src/wptKeyManagerDlg.cpp:1329
msgid "Import key to keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1333
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1460
msgid "New"
msgstr "V‹Kì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1472
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4379,15 +4357,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:1520 Src/wptKeysignDlg.cpp:258
-#: Src/wptKeysignDlg.cpp:273 Src/wptKeysignDlg.cpp:353
-#: Src/wptKeysignDlg.cpp:368 Src/wptKeysignDlg.cpp:385
-#: Src/wptKeysignDlg.cpp:390 Src/wptKeysignDlg.cpp:392
+#: 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
msgid "Key Signing"
msgstr "ƒL[‚𖼂·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1536
+#: Src/wptKeyManagerDlg.cpp:1519
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4398,31 +4376,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:1550 Src/wptKeyRevokeDlg.cpp:70
-#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:169
-#: Src/wptKeyRevokeDlg.cpp:174 Src/wptKeyRevokeDlg.cpp:182
-#: Src/wptKeyRevokeDlg.cpp:191 Src/wptKeyRevokeDlg.cpp:196
+#: 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
msgid "Key Revocation Cert"
msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
-#: Src/wptKeyManagerDlg.cpp:1560
+#: Src/wptKeyManagerDlg.cpp:1543
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:1577
+#: Src/wptKeyManagerDlg.cpp:1560
msgid "Key Signature List"
msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1592 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyManagerDlg.cpp:1575 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1602
+#: Src/wptKeyManagerDlg.cpp:1585
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4431,34 +4409,34 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1632
+#: Src/wptKeyManagerDlg.cpp:1615
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:1655 Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1638 Src/wptKeyserverDlg.cpp:585
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:1672
+#: Src/wptKeyManagerDlg.cpp:1655
msgid "GnuPG Options"
msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1714
+#: Src/wptKeyManagerDlg.cpp:1697
msgid "There is no corresponding secret key for this key."
msgstr "‚±‚̃L[‚ɑ΂µ‚Ă̔閧Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1719
+#: Src/wptKeyManagerDlg.cpp:1702
msgid "You can only export one secret key."
msgstr "ˆêŒÂ‚̔閧Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1724
+#: Src/wptKeyManagerDlg.cpp:1707
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -4477,12 +4455,12 @@
"‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1729
+#: Src/wptKeyManagerDlg.cpp:1712
msgid "WARNING"
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1790
+#: Src/wptKeyManagerDlg.cpp:1775
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
@@ -4493,8 +4471,8 @@
msgstr "‚‚¢‚ÉM—p‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:84 c:\oss\winpt\src\wptKeylist.cpp:701
-#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:165
-#: Src/wptVerifyList.cpp:224
+#: Src/wptKeyPropsDlg.cpp:70 Src/wptVerifyList.cpp:170
+#: Src/wptVerifyList.cpp:245
msgid "Unknown"
msgstr "–³–¼"
@@ -4578,30 +4556,30 @@
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚ͳ‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:162
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:148
msgid "Key Revokers"
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤"
# c:\oss\winpt\src\wptImportList.cpp:187
-#: Src/wptKeyRevokeDlg.cpp:82
+#: Src/wptKeyRevokeDlg.cpp:84
msgid "Reason for revocation"
msgstr "–³Œø‰»‚·‚é——R"
-#: Src/wptKeyRevokeDlg.cpp:83
+#: Src/wptKeyRevokeDlg.cpp:85
msgid "Optional description text"
msgstr "Ú×‚ð‚ ‚ç‚í‚·ƒIƒvƒVƒ‡ƒ“ƒeƒLƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:151
-#: Src/wptKeyRevokeDlg.cpp:84
+#: Src/wptKeyRevokeDlg.cpp:86
msgid "&Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY(&P)"
-#: Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyRevokeDlg.cpp:87
msgid "Output file"
msgstr "o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:69
-#: Src/wptKeyRevokeDlg.cpp:136
+#: Src/wptKeyRevokeDlg.cpp:112
msgid ""
"Please move this certificate to a medium where it can bestored in a safe "
"place (floppy, CDR, etc..).\n"
@@ -4613,37 +4591,37 @@
"‚ª‚Å‚«‚Ü‚·I"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:98
-#: Src/wptKeyRevokeDlg.cpp:159
+#: Src/wptKeyRevokeDlg.cpp:135
msgid "Choose File to save the Certificate"
msgstr "Ø–¾‘‚ð•Û‘¶‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:107
-#: Src/wptKeyRevokeDlg.cpp:168
+#: Src/wptKeyRevokeDlg.cpp:144
msgid "Please select a reason."
msgstr "——R‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:148
-#: Src/wptKeyRevokeDlg.cpp:195
+#: Src/wptKeyRevokeDlg.cpp:173
msgid "Revocation certificate generated."
msgstr "–³Œø‰»Ø–¾‘‚ªì¬‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptSigList.cpp:47
-#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:58
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:57
msgid "Algorithm"
msgstr "ƒAƒ‹ƒSƒŠƒYƒ€"
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:121 Src/wptKeyRevokersDlg.cpp:175
+#: Src/wptKeyRevokersDlg.cpp:100 Src/wptKeyRevokersDlg.cpp:161
msgid "Designated Key Revokers"
msgstr "Žw’è‚̃L[‚𖳌ø‰»‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:122
-#: Src/wptKeyRevokersDlg.cpp:161
+#: Src/wptKeyRevokersDlg.cpp:147
msgid "Designated Revoker Keys"
msgstr "Žw’è‚Ì–³Œø‰»‚·‚éƒL["
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:123
-#: Src/wptKeyRevokersDlg.cpp:176
+#: Src/wptKeyRevokersDlg.cpp:162
#, c-format
msgid "Do you want to retrieve 0x%s via the default keyserver?"
msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å 0x%s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
@@ -4806,7 +4784,7 @@
msgid "Port"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:475
+#: Src/wptKeyserverDlg.cpp:476
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4825,12 +4803,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:496
+#: Src/wptKeyserverDlg.cpp:497
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:498
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4849,7 +4827,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:498
+#: Src/wptKeyserverDlg.cpp:499
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4868,75 +4846,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:523 Src/wptKeyserverDlg.cpp:737
-#: Src/wptKeyserverDlg.cpp:757
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
+#: Src/wptKeyserverDlg.cpp:758
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
msgid "&Add"
msgstr "’ljÁ(&A)"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:527
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:528
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:529
msgid "Host name:"
msgstr "ƒzƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:536
+#: Src/wptKeyserverDlg.cpp:537
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:541
+#: Src/wptKeyserverDlg.cpp:542
msgid "Invalid port, valid numbers are < 65535"
msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:585 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "ŽóM(&R)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:587
+#: Src/wptKeyserverDlg.cpp:588
msgid "Send key (default is receiving)"
msgstr "ƒL[‚ð‘—M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:589
+#: Src/wptKeyserverDlg.cpp:590
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:590
+#: Src/wptKeyserverDlg.cpp:591
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:591
-#, fuzzy
+#: Src/wptKeyserverDlg.cpp:592
msgid "C&hange proxy"
-msgstr "•ÏX(&C)"
+msgstr "ƒvƒƒNƒV[•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:592
+#: Src/wptKeyserverDlg.cpp:593
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:619
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4944,7 +4921,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:644 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptKeyserverDlg.cpp:645 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
@@ -4954,33 +4931,33 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:651 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
msgid "Please select one of the keyservers."
msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:376
-#: Src/wptKeyserverDlg.cpp:659
+#: Src/wptKeyserverDlg.cpp:660
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:666 Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
msgid "Please enter the search pattern."
msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:704
msgid "Only keyids are allowed."
msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:709
+#: Src/wptKeyserverDlg.cpp:710
msgid "Only enter the name of the user."
msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyserverDlg.cpp:716
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
@@ -4996,7 +4973,7 @@
msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:87 Src/wptKeyserverSearchDlg.cpp:117
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
msgid "Keyserver Search"
msgstr "ƒL[ƒT[ƒo[ŒŸõ"
@@ -5029,22 +5006,22 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:215
+#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:210
msgid "Signature Properties"
msgstr "–¼‚Ì‘®«"
# c:\oss\winpt\src\wptKeysigDlg.cpp:189
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:166 Src/wptKeysigDlg.cpp:211
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:164 Src/wptKeysigDlg.cpp:206
msgid "Exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚é‚à‚Ì"
# c:\oss\winpt\src\wptKeysigDlg.cpp:190
-#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:212
+#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:207
msgid "Non-revocably"
msgstr "–³Œø‚Éo—ˆ‚È‚¢‚æ"
# c:\oss\winpt\src\wptSigList.cpp:43
-#: Src/wptKeysigDlg.cpp:145 Src/wptSigList.cpp:54
+#: Src/wptKeysigDlg.cpp:144 Src/wptSigList.cpp:53
msgid "Class"
msgstr "ƒNƒ‰ƒX"
@@ -5053,76 +5030,70 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:145
msgid "Expire date"
msgstr "—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:146
msgid "Issuer key"
msgstr "”sŽÒƒL["
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:148
+#: Src/wptKeysigDlg.cpp:147
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:166
+#: Src/wptKeysigDlg.cpp:164
msgid "Non-exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢‚à‚Ì"
# c:\oss\winpt\src\wptSigList.cpp:118
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:152
+#: Src/wptKeysigDlg.cpp:177 Src/wptSigList.cpp:156
msgid " user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysigDlg.cpp:396
-#: Src/wptKeysigDlg.cpp:288
+#: Src/wptKeysigDlg.cpp:283
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:322 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:317 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "–¼‚Ì‘®«(&P)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:323
+#: Src/wptKeysigDlg.cpp:318
msgid "Signing &Key Properties"
msgstr "ƒL[‚Ì‘®«‚𖼂·‚é(&K)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:362
+#: Src/wptKeysigDlg.cpp:357
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:372
+#: Src/wptKeysigDlg.cpp:367
msgid "Key not found in keyring."
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptKeysigDlg.cpp:400
+#: Src/wptKeysigDlg.cpp:395
#, c-format
msgid "Signature List for \"%s\""
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeysigDlg.cpp:333
-#: Src/wptKeysigDlg.cpp:404
+#: Src/wptKeysigDlg.cpp:399
msgid "&Receive Key"
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:152
# c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:336
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
msgid "Choose Signature Class"
msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
@@ -5163,7 +5134,7 @@
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:261
+#: Src/wptKeysignDlg.cpp:264
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -5185,52 +5156,52 @@
"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
# c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:273
+#: Src/wptKeysignDlg.cpp:277
msgid "No valid secret key found."
msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:279
+#: Src/wptKeysignDlg.cpp:282
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:280
+#: Src/wptKeysignDlg.cpp:283
msgid "Signature expires on"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
# c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:281
+#: Src/wptKeysignDlg.cpp:284
msgid "Sign non-revocably"
msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚É–¼‚·‚é"
-#: Src/wptKeysignDlg.cpp:282
+#: Src/wptKeysignDlg.cpp:285
msgid "&Ask for certification level"
msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:285
+#: Src/wptKeysignDlg.cpp:288
msgid "&Show photo"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:286 Src/wptPassphraseCB.cpp:94
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:68
+#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
+#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr "“ü—Í‚ð‰B‚·(&H)"
-#: Src/wptKeysignDlg.cpp:352
+#: Src/wptKeysignDlg.cpp:355
msgid "You cannot select today as the expiration date."
-msgstr ""
+msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:288
-#: Src/wptKeysignDlg.cpp:368
+#: Src/wptKeysignDlg.cpp:371
msgid "Could not get Key ID from key."
msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:389
+#: Src/wptKeysignDlg.cpp:392
msgid "This key is already signed by your key"
msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
@@ -5333,35 +5304,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:227
+#: Src/wptMAPI.cpp:103 Src/wptMAPI.cpp:226
msgid "Could not sent mail."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptMDSumDlg.cpp:103
+#: Src/wptMDSumDlg.cpp:72
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:121
+#: Src/wptMDSumDlg.cpp:103
msgid "&Save..."
msgstr "•Û‘¶...(&S)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptMDSumDlg.cpp:123
+#: Src/wptMDSumDlg.cpp:105
msgid "Save to clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚É•Û‘¶‚·‚é"
-#: Src/wptMDSumDlg.cpp:124
+#: Src/wptMDSumDlg.cpp:106
msgid "Print Message Digest"
msgstr "ƒƒbƒZ[ƒWƒ_ƒCƒWƒFƒXƒg‚ðˆóü‚·‚éB"
-#: Src/wptMDSumDlg.cpp:177
+#: Src/wptMDSumDlg.cpp:149
msgid "Select file to save checksums"
msgstr "ƒ`ƒFƒbƒNƒTƒ€‚ð•Û‘¶‚·‚邽‚߂̃tƒ@ƒCƒ‹‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptMDSumDlg.cpp:182
+#: Src/wptMDSumDlg.cpp:154
#, c-format
msgid "Checksums successfully saved in '%s'"
msgstr "ƒ`ƒFƒbƒNƒTƒ€‚𳂵‚'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
@@ -5397,27 +5368,27 @@
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚̃Cƒ“ƒ|[ƒg‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:61
-#: Src/wptPassphraseCB.cpp:98
+#: Src/wptPassphraseCB.cpp:96
msgid "Encrypted with the following public key(s)"
msgstr "ˆÈ‰º‚ÌŒöŠJŒ®‚ňƉ»‚µ‚½‚à‚Ì‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:82
-#: Src/wptPassphraseCB.cpp:142
+#: Src/wptPassphraseCB.cpp:143
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "–³–¼ƒL[ID (%s, 0x%s)"
-#: Src/wptPassphraseCB.cpp:153
+#: Src/wptPassphraseCB.cpp:154
msgid "Bad passphrase; Enter passphrase again"
msgstr "–³Œø‚ȃpƒXƒtƒŒ[ƒYAÄ“x“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:90
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:155
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:158
+#: Src/wptPassphraseCB.cpp:159
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -5427,7 +5398,7 @@
"%s ‚ªˆÃ†‰»ƒf[ƒ^‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:224
-#: Src/wptPassphraseCB.cpp:302
+#: Src/wptPassphraseCB.cpp:304
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5439,7 +5410,7 @@
"%s ƒL[, ID %s (ƒ[ƒ“ƒL[ ID %s)\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:231
-#: Src/wptPassphraseCB.cpp:308
+#: Src/wptPassphraseCB.cpp:310
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5451,7 +5422,7 @@
"%s ƒL[, ID %s\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:283
-#: Src/wptPassphraseCB.cpp:396
+#: Src/wptPassphraseCB.cpp:398
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -5574,7 +5545,6 @@
msgstr "ƒL[ƒT[ƒo[‚±‚¤‚¹‚¢(&C)"
#: Src/wptPreferencesDlg.cpp:125
-#, fuzzy
msgid "Cache &passphrases for 'n' minutes"
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð 'n' •bŠÔƒLƒƒƒbƒVƒ…‚·‚é(&P)"
@@ -5631,13 +5601,12 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:232
#: Src/wptPreferencesDlg.cpp:258
-#, fuzzy
msgid ""
"Please enter a value that is between 1-720.\n"
"It is not a good idea to cache the passphrase more than 12 hours."
msgstr ""
-"‚P`‚R‚U‚O‚O‚͈̔͂̒l‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B\n"
-"ƒpƒXƒtƒŒ[ƒY‚ð1ŽžŠÔˆÈãƒLƒƒƒbƒVƒ…‚·‚邱‚Æ‚ª—Ç‚‚ ‚è‚Ü‚¹‚ñB"
+"‚P`‚V‚Q‚O‚͈̔͂̒l‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B\n"
+"ƒpƒXƒtƒŒ[ƒY‚ð‚P‚QŽžŠÔˆÈãƒLƒƒƒbƒVƒ…‚·‚邱‚Æ‚ª—Ç‚‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptPreferencesDlg.cpp:245
#: Src/wptPreferencesDlg.cpp:271
@@ -5666,9 +5635,8 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
#: Src/wptProxySettingsDlg.cpp:78
-#, fuzzy
msgid "Please enter the proxy hostname."
-msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
+msgstr "ƒvƒƒNƒV[ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
@@ -5710,13 +5678,12 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
#: Src/wptProxySettingsDlg.cpp:155
-#, fuzzy
msgid "Proxy type"
-msgstr "ƒL[‚ÌŽí—Þ"
+msgstr "ƒvƒƒNƒV[‚ÌŽí—Þ"
#: Src/wptProxySettingsDlg.cpp:156
msgid "Authentication"
-msgstr ""
+msgstr "”FØ"
#: Src/wptProxySettingsDlg.cpp:196
msgid "Please fill out all required fields for authentication."
@@ -5768,26 +5735,25 @@
msgstr "ƒŒƒMƒXƒgƒŠ‚É‘‚‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptSigList.cpp:42
-#: Src/wptSigList.cpp:53
+#: Src/wptSigList.cpp:52
msgid "Valid"
msgstr "—LŒø"
# c:\oss\winpt\src\wptSigList.cpp:46
-#: Src/wptSigList.cpp:57
+#: Src/wptSigList.cpp:56
msgid "Expiration"
msgstr "ŠúŒÀ"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
#: Src/wptSigTreeDlg.cpp:164
-#, fuzzy, c-format
+#, c-format
msgid "Signature Tree for \"%s\" (0x%s)"
-msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
+msgstr "ˆÈ‰º—p‚Ì–¼ƒcƒŠ[\"%s\" (0x%s)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptSigTreeDlg.cpp:166
-#, fuzzy
+#: Src/wptSigTreeDlg.cpp:167
msgid "Edit..."
-msgstr "•ÒW"
+msgstr "•ÒW..."
# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
#: Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:89
@@ -5829,9 +5795,8 @@
#~ msgstr "ƒLƒƒƒ“ƒZƒ‹"
# c:\oss\winpt\src\wptKeyserver.cpp:438
-#, fuzzy
#~ msgid "Proxy: none"
-#~ msgstr "ƒvƒƒNƒV[ƒGƒ‰["
+#~ msgstr "ƒvƒƒNƒV[F‚È‚µ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
#~ msgid "Default"
@@ -6145,6 +6110,10 @@
#~ "Ž‚Á‚Ä‚¢‚é 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/README-0.11.txt
===================================================================
--- trunk/README-0.11.txt 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/README-0.11.txt 2006-05-03 14:34:08 UTC (rev 209)
@@ -1,6 +1,6 @@
- Windows Privacy Tray 0.11.x
+ Windows Privacy Tray 0.12.x
===========================
@@ -19,7 +19,7 @@
(WinPT+GPG) to track down bugs and to help that it will become stable soon.
-_It is required to use GPG 1.4.2 or later for WinPT 0.11.x_.
+_It is required to use GPG 1.4.2 or later for WinPT 0.12.x_.
Requirements for smart card use
@@ -27,7 +27,7 @@
- A card reader that is PC/SC compatible
- An OpenPGP card (the release version 1.0 or higher)
-- GnuPG 1.4.2 or later and WinPT 0.11.x
+- GnuPG 1.4.2 or later and WinPT 0.12.x
Feel free to ask on gnupg-users at gnupg.org or
winpt-users at wald.intevation.org for more information.
@@ -36,7 +36,7 @@
Install
~~~~~~~
-Unzip winpt-0.11.x-exe.zip and replace the old winpt.exe and the ptd.dll.
+Unzip winpt-0.12.x-exe.zip and replace the old winpt.exe and the ptd.dll.
Please make sure that there are no concurrent ptd.dll files on your hard
disk. That's all. Now you can start WinPT.
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/ChangeLog 2006-05-03 14:34:08 UTC (rev 209)
@@ -1,3 +1,16 @@
+2006-05-02 Timo Schulz <ts at g10code.de>
+
+ * wptFileManagerDlg.cpp (file_encrypt_dlg_proc): Use a
+ caption for the radio button group.
+ * wptKeyserverDlg.cpp (keyserver_recv_key): Use new code.
+ * wptKeyserver.cpp (kserver_recvkey, finger_recvkey,
+ ldap_recvkey): Avoid fixed buffers.
+ (do_spawn_ldap_helper): New.
+ (ldap_recvkey): Factor out code into helper function.
+ * wptPassphraseCBDlg.cpp (passphrase_callback_proc):
+ Increase width of the list box to make sure even large
+ user IDs will be completly displayed.
+
2006-05-01 Timo Schulz <ts at g10code.de>
* WinPT.cpp (WinMain): Check if the user has admin privileges.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/WinPT-en.rc 2006-05-03 14:34:08 UTC (rev 209)
@@ -329,26 +329,26 @@
PUSHBUTTON "&Cancel",IDCANCEL,294,189,53,14
END
-IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 225, 167
+IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 236, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Decryption"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Encrypted with the following public key(s)",
- IDC_DECRYPT_LISTINF,8,6,130,8
- LISTBOX IDC_DECRYPT_LIST,8,15,207,35,LBS_SORT |
+ IDC_DECRYPT_LISTINF,8,6,209,8
+ LISTBOX IDC_DECRYPT_LIST,8,15,221,35,LBS_SORT |
LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL |
WS_TABSTOP
- GROUPBOX "",IDC_STATIC,8,52,208,51
- LTEXT "Passphrase info",IDC_DECRYPT_MSG,11,60,196,39
+ GROUPBOX "",IDC_STATIC,8,52,221,51
+ LTEXT "Passphrase info",IDC_DECRYPT_MSG,11,60,211,39
LTEXT "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
201,8
+ EDITTEXT IDC_DECRYPT_PWD,8,117,221,13,ES_PASSWORD |
+ ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_DECRYPT_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,146,131,72,10
- EDITTEXT IDC_DECRYPT_PWD,8,117,206,13,ES_PASSWORD |
- ES_AUTOHSCROLL
- DEFPUSHBUTTON "&OK",IDOK,116,150,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,165,150,49,14
+ WS_TABSTOP,157,131,72,10
+ DEFPUSHBUTTON "&OK",IDOK,130,150,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,179,150,49,14
END
IDD_WINPT_KEYSERVER DIALOG DISCARDABLE 0, 0, 209, 186
@@ -736,20 +736,20 @@
PUSHBUTTON "&Cancel",IDCANCEL,248,144,51,14
END
-IDD_WINPT_FILE_ENCRYPT DIALOG DISCARDABLE 0, 0, 348, 151
+IDD_WINPT_FILE_ENCRYPT DIALOG DISCARDABLE 0, 0, 348, 156
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Encrypt"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "List1",IDC_ENCRYPT_LIST,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,6,6,333,92
- GROUPBOX "",IDC_STATIC,5,98,107,46
+ GROUPBOX "Options",IDC_ENCRYPT_OPTINF,5,99,107,51
CONTROL "&Text Output",IDC_ENCRYPT_ARMOR,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,11,106,78,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,111,78,10
CONTROL "&Wipe Original",IDC_ENCRYPT_WIPE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,11,119,81,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,124,81,10
CONTROL "Anonymize (throw keyid)",IDC_ENCRYPT_ANON,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,11,132,98,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,137,98,10
CONTROL "&Select Key for signing",IDC_ENCRYPT_SIGN,"Button",
BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,103,113,
10
@@ -846,7 +846,7 @@
ES_WANTRETURN | WS_DISABLED
END
-IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 118
+IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 122
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Signing"
FONT 8, "MS Sans Serif"
@@ -858,9 +858,9 @@
EDITTEXT IDC_DECRYPT_SIGN_PWD,7,71,219,12,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_DECRYPT_SIGN_HIDE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,159,83,71,10
- DEFPUSHBUTTON "&OK",IDOK,131,101,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,181,101,47,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,159,85,71,10
+ DEFPUSHBUTTON "&OK",IDOK,131,105,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,181,105,47,14
END
IDD_WINPT_GROUP DIALOG DISCARDABLE 0, 0, 178, 66
@@ -1439,7 +1439,7 @@
IDD_WINPT_DECRYPT, DIALOG
BEGIN
LEFTMARGIN, 4
- RIGHTMARGIN, 218
+ RIGHTMARGIN, 229
TOPMARGIN, 3
BOTTOMMARGIN, 161
END
@@ -1617,7 +1617,7 @@
LEFTMARGIN, 2
RIGHTMARGIN, 342
TOPMARGIN, 2
- BOTTOMMARGIN, 147
+ BOTTOMMARGIN, 152
END
IDD_WINPT_KEYPROPS, DIALOG
@@ -1673,7 +1673,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 230
TOPMARGIN, 3
- BOTTOMMARGIN, 112
+ BOTTOMMARGIN, 116
END
IDD_WINPT_GROUP, DIALOG
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/resource.h 2006-05-03 14:34:08 UTC (rev 209)
@@ -650,6 +650,7 @@
#define IDC_SIGPROPS_POLICINF 1526
#define IDC_SIGPROPS_POLIC 1527
#define IDC_KEYEDIT_REVOKE 1528
+#define IDC_ENCRYPT_OPTINF 1529
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -830,7 +831,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 246
#define _APS_NEXT_COMMAND_VALUE 40186
-#define _APS_NEXT_CONTROL_VALUE 1529
+#define _APS_NEXT_CONTROL_VALUE 1530
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/wptFileManagerDlg.cpp 2006-05-03 14:34:08 UTC (rev 209)
@@ -74,13 +74,12 @@
if (!c)
dlg_fatal_error( dlg, "Could not get dialog state!" );
kc = keycache_get_ctx (KEYCACHE_PUB);
- if (!kc)
- BUG (dlg);
SetWindowText (dlg, _("File Encrypt"));
SetDlgItemText (dlg, IDC_ENCRYPT_ARMOR, _("&Text Output"));
SetDlgItemText (dlg, IDC_ENCRYPT_WIPE, _("&Wipe Original"));
SetDlgItemText (dlg, IDC_ENCRYPT_ANON, _("Anonymize (throw keyid)"));
SetDlgItemText (dlg, IDC_ENCRYPT_SIGN, _("&Select Key for signing"));
+ SetDlgItemText (dlg, IDC_ENCRYPT_OPTINF, _("Options"));
SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
/* XXX: support --hidden-recipient */
Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/wptKeyCache.cpp 2006-05-03 14:34:08 UTC (rev 209)
@@ -738,7 +738,7 @@
return err;
/* XXX: GPGME_KEYLIST_MODE_SIG_NOTATIONS causes an internal error! */
- gpgme_set_keylist_mode (c, GPGME_KEYLIST_MODE_SIGS);
+ gpgme_set_keylist_mode (c, GPGME_KEYLIST_MODE_SIGS/*|GPGME_KEYLIST_MODE_SIG_NOTATIONS*/);
err = gpgme_op_keylist_start (c, pattern, secret);
while(!err) {
err = gpgme_op_keylist_next (c, &key);
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/wptKeyserver.cpp 2006-05-03 14:34:08 UTC (rev 209)
@@ -240,6 +240,25 @@
return 0;
}
+
+/* Helper to create a string from the gpgme data and
+ then release the gpgme data object. */
+char*
+data_release_and_get_mem (gpgme_data_t in, int *r_bufferlen)
+{
+ size_t n;
+ char *buffer, *p;
+
+ gpg_data_putc (in, '\0');
+ p = gpgme_data_release_and_get_mem (in, &n);
+ buffer = m_strdup (p);
+ if (r_bufferlen)
+ *r_bufferlen = (int)n;
+ gpgme_free (p);
+ return buffer;
+}
+
+
/* Read much data as possible from the socket @fd and
return the data in @buffer. Caller must free data.
Return value: 0 on success. */
@@ -247,11 +266,12 @@
sock_read_ext (int fd, char **buffer, int *r_bufferlen)
{
gpgme_data_t dh;
- char buf[1024], *p;
+ char buf[1024];
size_t n=0;
int nread, rc;
- gpgme_data_new (&dh);
+ if (gpgme_data_new (&dh))
+ BUG (0);
while (n < 10) {
rc = sock_select (fd, 1);
if (rc == SOCKET_ERROR) {
@@ -269,12 +289,8 @@
gpgme_data_write (dh, buf, nread);
}
}
- gpg_data_putc (dh, '\0');
- p = gpgme_data_release_and_get_mem (dh, &n);
- *buffer = m_strdup (p);
- if (r_bufferlen)
- *r_bufferlen = n;
- gpgme_free (p);
+
+ *buffer = data_release_and_get_mem (dh, r_bufferlen);
return 0;
}
@@ -495,8 +511,6 @@
if (hostname != NULL) {
free_if_alloc (default_keyserver);
default_keyserver = m_strdup (hostname);
- if (!default_keyserver)
- BUG (0);
default_keyserver_port = port;
}
if (!port)
@@ -590,8 +604,6 @@
/* check if the host has a http:// prefix and skip it */
if (proxy.host && !strncmp (proxy.host, "http://", 7)) {
char *host = m_strdup (proxy.host+7);
- if (!host)
- BUG (0);
free_if_alloc (proxy.host);
proxy.host = host;
}
@@ -737,10 +749,12 @@
URL_encode (const char *url, size_t ulen, size_t *ret_nlen)
{
gpgme_data_t hd;
- char numbuf[5], *pp, *p;
- size_t i, n;
+ char numbuf[5], *p;
+ size_t i;
+ int nlen;
- gpgme_data_new (&hd);
+ if (gpgme_data_new (&hd))
+ BUG (0);
for (i=0; i < ulen; i++) {
if (isalnum (url[i]) || url[i] == '-')
gpg_data_putc (hd, url[i]);
@@ -751,14 +765,10 @@
gpgme_data_write (hd, numbuf, strlen (numbuf));
}
}
- gpg_data_putc (hd, '\0');
- /* Copy memory to avoid that we need to use gpgme_free later. */
- pp = gpgme_data_release_and_get_mem (hd, &n);
- p = m_strdup (pp);
- gpgme_free (pp);
+ p = data_release_and_get_mem (hd, &nlen);
if (ret_nlen)
- *ret_nlen = n;
+ *ret_nlen = nlen;
return p;
}
@@ -825,13 +835,14 @@
}
+/* Interface for receiving a public key. */
int
-kserver_recvkey_ext (const char *hostname, WORD port, const char *keyid,
- char **r_key, int *r_keylen)
+kserver_recvkey (const char *hostname, WORD port, const char *keyid,
+ char **r_key, int *r_keylen)
{
char *request = NULL;
int conn_fd;
- int rc, n;
+ int rc;
if (!port)
port = HKP_PORT;
@@ -868,14 +879,12 @@
goto leave;
}
- rc = sock_read_ext (conn_fd, r_key, &n);
+ rc = sock_read_ext (conn_fd, r_key, r_keylen);
if (rc == SOCKET_ERROR) {
rc = WPTERR_WINSOCK_RECVKEY;
goto leave;
}
- if (r_keylen)
- *r_keylen = n;
log_debug ("%s\r\n", *r_key);
rc = check_hkp_response (*r_key, 1);
if (rc)
@@ -889,30 +898,7 @@
return rc;
}
-/* Interface for receiving a public key. */
-int
-kserver_recvkey (const char *hostname, WORD port, const char *keyid,
- char *key, int maxkeylen)
-{
- char *tmpkey;
- int rc, nread=0;
- /* XXX: just a wrapper around the new method, replace it
- soon as possible. */
- rc = kserver_recvkey_ext (hostname, port, keyid, &tmpkey, &nread);
- if (rc)
- return rc;
-
- if (nread > maxkeylen) {
- free_if_alloc (tmpkey);
- return WPTERR_GENERAL;
- }
- strcpy (key, tmpkey);
- free_if_alloc (tmpkey);
- return 0;
-}
-
-
/* Interface to send a public key. */
int
kserver_sendkey (const char *hostname, WORD port, const char *pubkey, int len )
@@ -1194,18 +1180,14 @@
}
-/* Receive an key via LDAP from host @host with the keyid @keyid.
- @key contains the key on success. */
-int
-ldap_recvkey (const char *host, const char *keyid, char *key, int maxkeylen)
-{
- FILE *fp;
- const char *s;
- char *ksprg = NULL, *p = NULL, *sep;
- char inf[256], outf[256], buf[512];
- DWORD n;
- int start_key = 0, failed = 0;
- int rc = 0;
+static FILE*
+do_spawn_ldap_helper (const char *host, const char *keyid)
+{
+ FILE *fp = NULL;
+ char *p, *sep;
+ char *ksprg;
+ char outf[256], inf[256];
+ size_t n;
p = get_gnupg_prog ();
n = strlen (p) + 1 + 128;
@@ -1221,7 +1203,7 @@
if (file_exist_check (ksprg)) {
log_box ("LDAP Keyserver Plugin", MB_ERR,
"%s: could not find LDAP keyserver module!", ksprg);
- rc = -1;
+ fp = NULL;
goto leave;
}
get_temp_name (outf, sizeof (outf)-1, keyid);
@@ -1230,7 +1212,6 @@
if (!fp) {
log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", inf,
winpt_strerror (WPTERR_FILE_OPEN));
- rc = -1;
goto leave;
}
fprintf (fp,
@@ -1249,18 +1230,41 @@
BUG (NULL);
sprintf (p, "%s -o %s %s", ksprg, outf, inf);
if (spawn_application (p)) {
- rc = -1;
+ fp = NULL;
goto leave;
}
-
fp = fopen (outf, "rb");
- if (!fp) {
+ if (!fp)
log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", outf,
winpt_strerror (WPTERR_FILE_OPEN));
- rc = -1;
- goto leave;
- }
- memset (key, 0, maxkeylen);
+
+leave:
+ DeleteFile (inf);
+ DeleteFile (outf);
+ free_if_alloc (p);
+ free_if_alloc (ksprg);
+ return fp;
+}
+
+/* Receive an key via LDAP from host @host with the keyid @keyid.
+ @key contains the key on success. */
+int
+ldap_recvkey (const char *host, const char *keyid,
+ char **r_key, int *r_keylen)
+{
+ gpgme_data_t raw;
+ FILE *fp;
+ const char *s;
+ char buf[512];
+ int start_key = 0, failed = 0;
+ int rc = 0;
+
+ fp = do_spawn_ldap_helper (host, keyid);
+ if (!fp)
+ return WPTERR_GENERAL;
+
+ if (gpgme_data_new (&raw))
+ BUG (0);
while (!feof (fp)) {
s = fgets (buf, sizeof (buf)-1, fp);
if (!s)
@@ -1272,23 +1276,18 @@
if (!start_key && strstr (s, "KEY") && strstr (s, "BEGIN")) {
start_key = 1;
continue;
- }
+ }
if (!start_key)
continue;
- strcat (key, buf);
- maxkeylen -= strlen (buf);
- if (maxkeylen < 0 || (strstr (s, "KEY") && strstr (s, "END")))
+ gpgme_data_write (raw, buf, strlen (buf));
+ if (strstr (s, "KEY") && strstr (s, "END"))
break;
}
fclose (fp);
-leave:
- if (failed || !strlen (key))
+ if (failed)
rc = WPTERR_WINSOCK_RECVKEY;
- DeleteFile (inf);
- DeleteFile (outf);
- free_if_alloc (p);
- free_if_alloc (ksprg);
+ *r_key = data_release_and_get_mem (raw, r_keylen);
return rc;
}
@@ -1296,9 +1295,11 @@
/* Receive an key via FINGER from host @host with the user @user.
On success @key contains the key. */
int
-finger_recvkey (const char *host, const char *user, char *key, int maxkeylen)
+finger_recvkey (const char *host, const char *user,
+ char **r_key, int *r_keylen)
{
- char buf[128];
+ gpgme_data_t raw;
+ char buf[256];
int fd, nread;
int start_key = 0;
int rc=0;
@@ -1310,30 +1311,30 @@
sock_write (fd, user, strlen (user));
sock_write (fd, "\r\n", 2);
- memset (key, 0, maxkeylen);
- while (maxkeylen > 0) {
+ if (gpgme_data_new (&raw))
+ BUG (0);
+
+ for (;;) {
if (sock_getline (fd, buf, sizeof (buf), &nread))
break;
strcat (buf, "\n");
if (strstr (buf, "BEGIN PGP PUBLIC KEY BLOCK")) {
- strcat (key, buf);
+ gpgme_data_write (raw, buf, nread);
start_key = 1;
- maxkeylen -= nread;
}
else if (strstr (buf, "END PGP PUBLIC KEY BLOCK" ) && start_key) {
- strcat (key, buf);
+ gpgme_data_write (raw, buf, nread);
start_key--;
- maxkeylen -= nread;
break;
}
- else if (start_key) {
- strcat (key, buf);
- maxkeylen -= nread;
- }
+ else if (start_key)
+ gpgme_data_write (raw, buf, nread);
}
+
closesocket (fd);
if (start_key != 0)
rc = WPTERR_WINSOCK_RECVKEY;
+ *r_key = data_release_and_get_mem (raw, r_keylen);
return rc;
}
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-05-03 14:34:08 UTC (rev 209)
@@ -41,7 +41,6 @@
#include "wptDlgs.h"
#include "wptUTF8.h"
-#define MAX_KEYSIZE 80000
char* get_reg_entry_keyserver (const char *);
int set_reg_entry_keyserver (const char *, const char *);
@@ -171,18 +170,14 @@
{
gpgme_ctx_t ctx;
gpgme_data_t keydata;
- gpgme_error_t ec;
- gpgme_import_result_t import_res = NULL;
+ gpgme_import_result_t import_res = NULL;
+ gpgme_error_t err;
char *rawkey = NULL;
+ int keylen = 0;
int rc;
-
- /* XXX: implement dynamic buffers. */
- rawkey = new char[MAX_KEYSIZE];
- if (!rawkey)
- BUG (0);
- memset (rawkey, 0, MAX_KEYSIZE);
+
if (proto == KSPROTO_LDAP) {
- rc = ldap_recvkey (kserver, pattern, rawkey, MAX_KEYSIZE-1);
+ rc = ldap_recvkey (kserver, pattern, &rawkey, &keylen);
if (rc) {
msg_box (dlg, _("LDAP key import failed.\n"
"Please make sure you have an online connection"
@@ -193,7 +188,7 @@
}
}
else if (proto == KSPROTO_FINGER) {
- rc = finger_recvkey (kserver, pattern, rawkey, MAX_KEYSIZE-1);
+ rc = finger_recvkey (kserver, pattern, &rawkey, &keylen);
if (rc) {
log_box (_("Keyserver"), MB_ERR,
_("Finger key import failed: %s\n"), winpt_strerror (rc));
@@ -203,7 +198,7 @@
}
else if ((rc = kserver_recvkey (kserver, port,
kserver_check_keyid (pattern),
- rawkey, MAX_KEYSIZE-1))) {
+ &rawkey, &keylen))) {
hkp_err_box (dlg, kserver, port, rc);
free_if_alloc (rawkey);
return rc;
@@ -214,13 +209,12 @@
_("Keyserver"), MB_ERR);
goto leave;
}
- ec = gpgme_new (&ctx);
- if (ec)
+ if (gpgme_new (&ctx))
BUG (NULL);
gpgme_data_new_from_mem (&keydata, rawkey, strlen (rawkey), 1);
- rc = gpgme_op_import (ctx, keydata);
- if (rc) {
- msg_box (dlg, gpgme_strerror ((gpgme_error_t)rc), _("Import"), MB_ERR);
+ 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);
Modified: trunk/TODO-GPGME-PORT.txt
===================================================================
--- trunk/TODO-GPGME-PORT.txt 2006-05-01 12:22:18 UTC (rev 208)
+++ trunk/TODO-GPGME-PORT.txt 2006-05-03 14:34:08 UTC (rev 209)
@@ -2,9 +2,6 @@
* Allow to use --hidden-recipient.
-* Grep for 'XXX' and implement the missing code or
- replace the dummy code with real code.
-
* If the card is not inserted and for example gpgme_op_sign
is called there is no real error.
(IMHO: gpgme should care for 'CARDCTRL 5' and then return
@@ -18,6 +15,7 @@
long as the file is not too large. The limite is <100 MB.
Otherwise the process would take too much time and propably
the window/process freezes up.
- (ts: should be fixed with gpgme 1.1.1)
+ (fixed in gpgme 1.1.1)
+
\ No newline at end of file
More information about the Winpt-commits
mailing list