[Winpt-commits] r195 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Apr 3 19:10:53 CEST 2006
Author: twoaday
Date: 2006-04-03 19:10:47 +0200 (Mon, 03 Apr 2006)
New Revision: 195
Modified:
trunk/Include/wptFileManager.h
trunk/Include/wptKeylist.h
trunk/Include/wptW32API.h
trunk/NEWS
trunk/Po/build-utf-mo.sh
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileVerifyDlg.cpp
trunk/Src/wptGPGMEWrapper.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManager.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/configure.ac
Log:
Prepare new release.
Modified: trunk/Include/wptFileManager.h
===================================================================
--- trunk/Include/wptFileManager.h 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Include/wptFileManager.h 2006-04-03 17:10:47 UTC (rev 195)
@@ -70,6 +70,16 @@
typedef struct fm_state_s * fm_state_t;
+/* Signature verification context for a file. */
+struct file_sig_ctx_s {
+ char *file; /* plaintext file name */
+ gpgme_signature_t sig; /* the actual signature */
+ unsigned use_uid:1; /* 1=if the user id from context should be used. */
+ const char *user_id;
+};
+typedef struct file_sig_ctx_s *file_sig_ctx_t;
+
+
enum file_data_flag_t {
F_DATA_WRITE = 0,
F_DATA_READ = 1,
@@ -113,6 +123,10 @@
int fm_check_file_type (listview_ctrl_t lv, int pos, int fm_cmd);
int fm_send_file (listview_ctrl_t lv);
+/*-- wptFileVerifyDlg.cpp --*/
+void file_verify_add_state (file_sig_ctx_t c);
+void file_verify_wait (void);
+
/*-- ccommands --*/
int fm_encrypt_into_zip (fm_state_t ctx, listview_ctrl_t lv);
int fm_encrypt (fm_state_t c, const char * name, int sign);
Modified: trunk/Include/wptKeylist.h
===================================================================
--- trunk/Include/wptKeylist.h 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Include/wptKeylist.h 2006-04-03 17:10:47 UTC (rev 195)
@@ -20,6 +20,8 @@
#ifndef WPT_KEYLIST_H
#define WPT_KEYLIST_H
+#include "wptFileManager.h"
+
/* Available sort-by modes. */
enum key_sort_t {
KEY_SORT_USERID = 0,
@@ -85,15 +87,6 @@
KEY_IMG_PAIR= 1
};
-/* Signature verification context for a file. */
-struct file_sig_ctx_s {
- char *file; /* plaintext file name */
- gpgme_signature_t sig; /* the actual signature */
- unsigned use_uid:1; /* 1=if the user id from context should be used. */
- const char *user_id;
-};
-typedef struct file_sig_ctx_s *file_sig_ctx_t;
-
/*-- keylist.c --*/
const char* get_key_pubalgo2 (gpgme_pubkey_algo_t alg);
const char* get_key_pubalgo (gpgme_pubkey_algo_t alg);
Modified: trunk/Include/wptW32API.h
===================================================================
--- trunk/Include/wptW32API.h 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Include/wptW32API.h 2006-04-03 17:10:47 UTC (rev 195)
@@ -21,6 +21,10 @@
#ifndef WPT_W32_API_H
#define WPT_W32_API_H
+/* Macros to change the cursor */
+#define op_begin() SetCursor (LoadCursor (NULL, IDC_WAIT))
+#define op_end() SetCursor (LoadCursor (NULL, IDC_ARROW))
+
#include "wptCrypto.h"
#include "wptUtil.h"
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/NEWS 2006-04-03 17:10:47 UTC (rev 195)
@@ -779,4 +779,6 @@
* Allow no interactive input when --stop is used.
* Allow to select the language on first start when no
installer has been used for installation.
-
\ No newline at end of file
+* Restore the original file name after decryption if possible.
+* Fix problem to send keys to some keyservers.
+* New edit key command to compact keys.
Modified: trunk/Po/build-utf-mo.sh
===================================================================
--- trunk/Po/build-utf-mo.sh 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Po/build-utf-mo.sh 2006-04-03 17:10:47 UTC (rev 195)
@@ -5,4 +5,6 @@
#msgfmt --output-file=winpt.mo -
msgfmt -v --check --output-file=winpt.mo de.po
+#msgfmt -v --check --output-file=winpt.mo jp.po
+
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Po/de.po 2006-04-03 17:10:47 UTC (rev 195)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.9\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-31 18:47+0200\n"
+"POT-Creation-Date: 2006-04-02 19:20+0200\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
@@ -58,16 +58,16 @@
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
-#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
-#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
-#: Src/wptKeyserverDlg.cpp:475 Src/wptKeyserverDlg.cpp:535
-#: Src/wptKeyserverDlg.cpp:540 Src/wptKeyserverDlg.cpp:651
-#: Src/wptKeyserverDlg.cpp:659 Src/wptKeyserverDlg.cpp:666
-#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:698
-#: Src/wptKeyserverDlg.cpp:703 Src/wptKeyserverDlg.cpp:709
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
+#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
+#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
+#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
+#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
+#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:717
msgid "Keyserver"
msgstr "Schlüsselserver"
@@ -235,7 +235,7 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Hilfe"
@@ -321,7 +321,7 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:521
msgid "&Name"
msgstr "&Name"
@@ -337,7 +337,7 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "&Niemals"
@@ -382,7 +382,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1370
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -445,21 +445,21 @@
"Bitte die OpenPGP-SmartCard einlegen\n"
"OK zum Fortfahren oder Abbrechen"
-#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
-#: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
+#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
msgstr "Benutzerkennung nicht gefunden"
-#: Src/wptClipDecryptDlg.cpp:120 Src/wptClipDecryptDlg.cpp:133
-#: Src/wptClipDecryptDlg.cpp:141 Src/wptClipDecryptDlg.cpp:148
-#: Src/wptClipDecryptDlg.cpp:150 Src/wptFileManager.cpp:1277
-#: Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
+#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:134 Src/wptFileManager.cpp:1329
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -468,18 +468,18 @@
"Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
"Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
-#: Src/wptClipDecryptDlg.cpp:141
+#: Src/wptClipDecryptDlg.cpp:140
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Unbekannter Algorithmus: %s"
# c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:146
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Ungültige OpenPGP Nachricht (vielleicht: \"quoted printable\" im Armorteil)."
-#: Src/wptClipDecryptDlg.cpp:155
+#: Src/wptClipDecryptDlg.cpp:154
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -492,40 +492,40 @@
"Es ist möglich, dass die Daten beschädigt worden aber es ist ebenfalls "
"möglich das dies ein Teil eines Attacke ist."
-#: Src/wptClipDecryptDlg.cpp:160
+#: Src/wptClipDecryptDlg.cpp:159
msgid "*** IMPORTANT ***"
msgstr "*** WICHTIG ***"
-#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
-#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
+#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
-#: Src/wptClipDecryptDlg.cpp:182
+#: Src/wptClipDecryptDlg.cpp:181
msgid "Signature Status: Created with a fully trusted key"
msgstr "Signatur Status: Erstellt mit einem vertraunswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:183
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:187
+#: Src/wptClipDecryptDlg.cpp:186
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr "Signatur Status: Erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:190
+#: Src/wptClipDecryptDlg.cpp:189
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
"Signatur Status: Erstellt mit einem Schlüssel ohne definiertes Vertrauen"
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:196
msgid "WinPT Verify"
msgstr "WinPT Verifikation"
-#: Src/wptClipDecryptDlg.cpp:198
+#: Src/wptClipDecryptDlg.cpp:197
#, c-format
msgid ""
"%s\n"
@@ -547,7 +547,7 @@
msgid "Clipboard"
msgstr "Zwischenablage"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:575
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
msgid "File Open"
msgstr "Datei öffnen"
@@ -563,7 +563,7 @@
msgid "File Save"
msgstr "Datei speichern"
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:109
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -599,8 +599,8 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
-#: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
@@ -626,11 +626,11 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:345 Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:524 Src/wptKeyEditDlgs.cpp:656
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/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
@@ -661,8 +661,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
-#: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
+#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signieren"
@@ -706,9 +706,9 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1558 Src/wptFileManager.cpp:1613
+#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
-#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
+#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
msgid "Verify"
@@ -758,33 +758,34 @@
msgid "Enter URL to retrieve the public key"
msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:771
-#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
-#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
-#: Src/wptKeyEditDlgs.cpp:988 Src/wptKeyEditDlgs.cpp:1006
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1062
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1159
-#: Src/wptKeyEditDlgs.cpp:1288 Src/wptKeyEditDlgs.cpp:1292
-#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
-#: Src/wptKeyEditDlgs.cpp:1338 Src/wptKeyEditDlgs.cpp:1342
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1367
-#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1413
-#: Src/wptKeyEditDlgs.cpp:1418 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1431 Src/wptKeyEditDlgs.cpp:1436
-#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
-#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1568
-#: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
-#: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
-#: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
-#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
-#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
-#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:832 Src/wptKeyEditDlgs.cpp:871
+#: Src/wptKeyEditDlgs.cpp:886 Src/wptKeyEditDlgs.cpp:888
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyEditDlgs.cpp:983
+#: Src/wptKeyEditDlgs.cpp:990 Src/wptKeyEditDlgs.cpp:1008
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptKeyEditDlgs.cpp:1292 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1371
+#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1417
+#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1435 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1497 Src/wptKeyEditDlgs.cpp:1504
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1547
+#: Src/wptKeyEditDlgs.cpp:1555 Src/wptKeyEditDlgs.cpp:1572
+#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
+#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
+#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -994,18 +995,18 @@
msgid "Unknown error=%d"
msgstr "Unbekannter Fehler=%d"
-#: Src/wptFileManager.cpp:108 Src/wptFileManager.cpp:130
-#: Src/wptFileManager.cpp:136 Src/wptFileManager.cpp:175
-#: Src/wptFileManager.cpp:300 Src/wptFileManager.cpp:669
-#: Src/wptFileManager.cpp:814 Src/wptFileManager.cpp:928
-#: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
-#: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
-#: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
+#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
+#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
+#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Dateimanager"
-#: Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:132
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
@@ -1014,12 +1015,12 @@
"\"%s\" hat Nur-Lesen Attribut.\n"
"Auf Standard setzen?"
-#: Src/wptFileManager.cpp:135
+#: Src/wptFileManager.cpp:136
msgid "Could not reset file attribute to normal."
msgstr "Konnte Dateiattribut nicht auf normal zurücksetzen"
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:147
-#: Src/wptFileManager.cpp:171
+#: Src/wptFileManager.cpp:172
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -1032,26 +1033,26 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Name"
-#: Src/wptFileManager.cpp:385
+#: Src/wptFileManager.cpp:386
msgid "Operation"
msgstr "Prozess"
-#: Src/wptFileManager.cpp:669
+#: Src/wptFileManager.cpp:670
msgid "Please select a file."
msgstr "Bitte eine Datei auswählen."
-#: Src/wptFileManager.cpp:815
+#: Src/wptFileManager.cpp:816
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1060,53 +1061,53 @@
"\"%s\" scheint keine Text-Datei zu sein.\n"
"Möchsten Sie wirklich diese Datei signieren?"
-#: Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:930
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" existiert nicht"
-#: Src/wptFileManager.cpp:1014 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Dateistatus"
-#: Src/wptFileManager.cpp:1060
+#: Src/wptFileManager.cpp:1057
msgid "Enter filename for encrypted file"
msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
-#: Src/wptFileManager.cpp:1089
+#: Src/wptFileManager.cpp:1086
msgid "Could not get default secret key."
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
-#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
+#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signieren"
-#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symmetrisch"
-#: Src/wptFileManager.cpp:1200
+#: Src/wptFileManager.cpp:1195
msgid "Encryption failed."
msgstr "Verschlüsselung fehlgeschlagen."
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "Good signature"
msgstr "Korrekte Signatur"
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "BAD signature"
msgstr "Falsche Signatur"
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1230
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1115,23 +1116,24 @@
"Signatur erstellt %s mit %s key ID %s\n"
"%s von \"%s\""
-#: Src/wptFileManager.cpp:1240
+#: Src/wptFileManager.cpp:1235
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptFileManager.cpp:1288
+#: Src/wptFileManager.cpp:1311
msgid "Choose Filename for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1299
+#: Src/wptFileManager.cpp:1320
msgid "Please enter filename for plaintext file"
msgstr "Wählen Sie einen Namen für die Klartext-Datei"
-#: Src/wptFileManager.cpp:1337 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: Src/wptFileManager.cpp:1343
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1140,41 +1142,52 @@
"Entshlüsselung fehlgeschlagen.\n"
"%s: existiert nicht."
-#: Src/wptFileManager.cpp:1385
+#: Src/wptFileManager.cpp:1371
+#, c-format
+msgid ""
+"The original file name is '%s'.\n"
+"\n"
+"Do you want to use this instead of '%s'?"
+msgstr ""
+"Der originale Dateiname ist '%s'.\n"
+"\n"
+"Wollen Sie diesen anstatt von '%s' benutzen?"
+
+#: Src/wptFileManager.cpp:1419
msgid "Enter filename for signed file"
msgstr "Wählen Sie einen Namen für die signierte Datei"
-#: Src/wptFileManager.cpp:1489
+#: Src/wptFileManager.cpp:1523
msgid "Could not find detached signature in the clipboard."
msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1509
+#: Src/wptFileManager.cpp:1543
msgid "No files to check."
msgstr "Keine Datei(en) zu pruefen."
-#: Src/wptFileManager.cpp:1526
+#: Src/wptFileManager.cpp:1560
msgid "Select Data File"
msgstr "Bitte Datendatei auswählen"
-#: Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1562
msgid "Selected Output File"
msgstr "Bitte Ausgabedatei auswählen"
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1590
msgid "Invalid file name. Exit"
msgstr "Ungültiger Dateiname. Abbruch"
-#: Src/wptFileManager.cpp:1660 Src/wptFileManager.cpp:1671
+#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
-#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:447 Src/wptKeyManager.cpp:458
+#: Src/wptKeyManager.cpp:586 Src/wptKeyserverDlg.cpp:223
msgid "Import"
msgstr "Importieren"
-#: Src/wptFileManager.cpp:1668
+#: Src/wptFileManager.cpp:1696
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1186,58 +1199,58 @@
"\n"
"Kann diese(n) Schlüssel nicht importieren!"
-#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:256
-#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
+#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
msgid "No key was selected for export."
msgstr "Kein Schlüssel zum Exportieren ausgewählt."
-#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
+#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1021
-#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1392
-#: Src/wptKeyserverDlg.cpp:99
+#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
+#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG Status"
-#: Src/wptFileManager.cpp:1721
+#: Src/wptFileManager.cpp:1749
#, c-format
msgid "Finished (Output: %s)"
msgstr "Fertig (Ausgabe: %s)"
-#: Src/wptFileManager.cpp:1768
+#: Src/wptFileManager.cpp:1796
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManager.cpp:1828
+#: Src/wptFileManager.cpp:1855
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "Verschlüsseln in eine ZIP-Datei macht nur mit mehreren Dateien Sinn"
-#: Src/wptFileManager.cpp:1833
+#: Src/wptFileManager.cpp:1860
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1902
+#: Src/wptFileManager.cpp:1929
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1905
+#: Src/wptFileManager.cpp:1932
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1905 Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1939
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
@@ -1266,12 +1279,12 @@
msgstr "Bitte wählen Sie wenigstens einen Empfänger."
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:411
msgid "No valid OpenPGP data found."
msgstr "Keine gültigen OpenPGP-Daten gefunden."
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:436
msgid "Key Import"
msgstr "Schlüsselimport"
@@ -1321,10 +1334,10 @@
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1292
-#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
-#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1346 Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyManager.cpp:670 Src/wptKeyManager.cpp:772
+#: Src/wptKeyManager.cpp:808 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
@@ -1571,7 +1584,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:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1708 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
@@ -1790,24 +1803,24 @@
msgstr "Wählen Sie GPG.EXE Datei aus"
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:158 Src/wptKeyManager.cpp:163
-#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
-#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
-#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
-#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
-#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
-#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
-#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
-#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
-#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
-#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
-#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
-#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
-#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
-#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:153 Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:209 Src/wptKeyManager.cpp:252
+#: Src/wptKeyManager.cpp:264 Src/wptKeyManager.cpp:295
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:307
+#: Src/wptKeyManager.cpp:309 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:339 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:404
+#: Src/wptKeyManager.cpp:409 Src/wptKeyManager.cpp:412
+#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:423
+#: Src/wptKeyManager.cpp:428 Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:564 Src/wptKeyManager.cpp:670
+#: Src/wptKeyManager.cpp:699 Src/wptKeyManager.cpp:708
+#: Src/wptKeyManager.cpp:719 Src/wptKeyManager.cpp:745
+#: Src/wptKeyManager.cpp:772 Src/wptKeyManager.cpp:779
+#: Src/wptKeyManager.cpp:803 Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828 Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:888 Src/wptKeyManager.cpp:948
+#: Src/wptKeyManager.cpp:978 Src/wptKeyManagerDlg.cpp:1162
#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
@@ -1894,17 +1907,17 @@
msgid "Unknown Hotkey"
msgstr "Unbekanntes Tastenkürzel"
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1178
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1452
-#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1119 Src/wptKeyEditDlgs.cpp:1180
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1528
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr "Widerrufen"
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1353
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -1918,7 +1931,7 @@
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1195
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1197
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
@@ -1934,7 +1947,7 @@
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1041
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
@@ -1942,8 +1955,8 @@
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1040
-#: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1149 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
@@ -1980,24 +1993,24 @@
msgid "Key Cache"
msgstr "Schlüsselcache"
-#: Src/wptKeyEditDlgs.cpp:208
+#: Src/wptKeyEditDlgs.cpp:210
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeyEditDlgs.cpp:1112
+#: Src/wptKeyEditDlgs.cpp:225 Src/wptKeyEditDlgs.cpp:1114
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+#: Src/wptKeyEditDlgs.cpp:241 Src/wptKeyEditDlgs.cpp:1121
msgid "OK"
msgstr "OK"
-#: Src/wptKeyEditDlgs.cpp:264
+#: Src/wptKeyEditDlgs.cpp:266
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:265
+#: Src/wptKeyEditDlgs.cpp:267
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2007,7 +2020,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:340
+#: Src/wptKeyEditDlgs.cpp:342
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 "
@@ -2018,7 +2031,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:341
+#: Src/wptKeyEditDlgs.cpp:343
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2026,35 +2039,35 @@
"Bitte ein Bild auswählen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:344 Src/wptKeyEditDlgs.cpp:446
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:344
+#: Src/wptKeyEditDlgs.cpp:346
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:362
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:364 Src/wptKeyEditDlgs.cpp:374
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
-#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:902
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:376
+#: Src/wptKeyEditDlgs.cpp:382 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:402 Src/wptKeyEditDlgs.cpp:904
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:367
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:380
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2062,18 +2075,18 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:388 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "Bitte ein Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:407
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
-#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
-#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:408 Src/wptKeyEditDlgs.cpp:489
+#: Src/wptKeyEditDlgs.cpp:571 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1458 Src/wptKeyEditDlgs.cpp:1530
+#: Src/wptKeyEditDlgs.cpp:1615 Src/wptKeyEditDlgs.cpp:1795
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
@@ -2081,137 +2094,137 @@
msgstr "GnuPG-Status"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:350
-#: Src/wptKeyEditDlgs.cpp:442
+#: Src/wptKeyEditDlgs.cpp:444
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
"Hinzufügen eines \"Widerrufers\" kann nicht mehr\n"
"rückgängig gemacht werden."
-#: Src/wptKeyEditDlgs.cpp:443
+#: Src/wptKeyEditDlgs.cpp:445
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
-#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:448 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:917
msgid "Add Revoker"
msgstr "\"Wiederrufer\" hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1486
-#: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
-#: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1933
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:486
+#: Src/wptKeyEditDlgs.cpp:488
msgid "Revoker successfully addded."
msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:520
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:520
+#: Src/wptKeyEditDlgs.cpp:522
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:521
+#: Src/wptKeyEditDlgs.cpp:523
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:536
+#: Src/wptKeyEditDlgs.cpp:538
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:567
+#: Src/wptKeyEditDlgs.cpp:538 Src/wptKeyEditDlgs.cpp:542
+#: Src/wptKeyEditDlgs.cpp:547 Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:569
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:542
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
"Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
-#: Src/wptKeyEditDlgs.cpp:545
+#: Src/wptKeyEditDlgs.cpp:547
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:551
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:569
+#: Src/wptKeyEditDlgs.cpp:571
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:844
+#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:846
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key type"
msgstr "Schlüssel-Typ"
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:653
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:654
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:697
+#: Src/wptKeyEditDlgs.cpp:699
msgid "Please select one entry."
msgstr "Bitte wählen Sie einen Eintrag aus."
-#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
-#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:738 Src/wptKeyEditDlgs.cpp:828
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
-#: Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:740
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
-#: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
-#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
-#: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:828
+#: Src/wptKeyEditDlgs.cpp:903 Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1417 Src/wptKeyEditDlgs.cpp:1479
#: Src/wptKeyManagerDlg.cpp:1521
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:785
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:884
+#: Src/wptKeyEditDlgs.cpp:886
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:934 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:936 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:212
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyManager.cpp:207
msgid "Key status changed."
msgstr "Schlüsselstatus geändert."
-#: Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:988
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2219,15 +2232,15 @@
"Kann das Passwort das Schlüssels nicht ändern, da der \n"
"Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
-#: Src/wptKeyEditDlgs.cpp:993
+#: Src/wptKeyEditDlgs.cpp:995
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:997
+#: Src/wptKeyEditDlgs.cpp:999
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:1004 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1006 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2235,44 +2248,44 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1021
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1021
+#: Src/wptKeyEditDlgs.cpp:1023
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1040 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1155
msgid "Could not find key."
msgstr "Konnte Schlüssel nicht finden."
-#: Src/wptKeyEditDlgs.cpp:1062
+#: Src/wptKeyEditDlgs.cpp:1064
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1146 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:1148
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1159
+#: Src/wptKeyEditDlgs.cpp:1161
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1253
+#: Src/wptKeyEditDlgs.cpp:1255
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2293,6 +2306,7 @@
"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"
+"CLEAN \t\tremove unusable signatures from key\r\n"
msgstr ""
"ADDUID\t\t\tBenutzerkennung hinzufügen\r\n"
"ADDPHOTO \t\tFoto ID hinzufügen\r\n"
@@ -2311,20 +2325,21 @@
"ENABLE \t\tSchlüssel aktivieren\r\n"
"SIGN\t \t\tBenutzerkennung signieren (exportierbar)\r\n"
"LSIGN\t \t\tBenutzerkennung signieren (nicht-exportierbar)\r\n"
+"CLEAN \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
-#: Src/wptKeyEditDlgs.cpp:1272
+#: Src/wptKeyEditDlgs.cpp:1276
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptKeyEditDlgs.cpp:1292
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1306
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2341,15 +2356,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1314
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1354
msgid ""
"Key already expired.\n"
"\n"
@@ -2359,19 +2374,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1363 Src/wptKeyEditDlgs.cpp:1366
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1391
+#: Src/wptKeyEditDlgs.cpp:1395
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1426
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2383,31 +2398,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1435
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1454
+#: Src/wptKeyEditDlgs.cpp:1458
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1476
+#: Src/wptKeyEditDlgs.cpp:1480
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1502
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2417,43 +2432,43 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1526
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1526
+#: Src/wptKeyEditDlgs.cpp:1530
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1568
+#: Src/wptKeyEditDlgs.cpp:1572
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1608
+#: Src/wptKeyEditDlgs.cpp:1612
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1611
+#: Src/wptKeyEditDlgs.cpp:1615
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1703
+#: Src/wptKeyEditDlgs.cpp:1707
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1709 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1760
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1767
+#: Src/wptKeyEditDlgs.cpp:1771
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2468,40 +2483,44 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1787
+#: Src/wptKeyEditDlgs.cpp:1791
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1795
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1914
+#: Src/wptKeyEditDlgs.cpp:1902
+msgid "Finished to compact key."
+msgstr "Schlüssel erfolgreich bearbeitet."
+
+#: Src/wptKeyEditDlgs.cpp:1937
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:1996
+#: Src/wptKeyEditDlgs.cpp:2019
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2009
+#: Src/wptKeyEditDlgs.cpp:2032
msgid "Could not set user ID window procedure."
msgstr "Konnte \"userID window procedure\" nicht setzen."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:1739
-#: Src/wptKeyEditDlgs.cpp:2018
+#: Src/wptKeyEditDlgs.cpp:2041
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2073
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2054
+#: Src/wptKeyEditDlgs.cpp:2077
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "Dieser Befehl kann mit PGP2 (v3) Schlüsseln nicht verwendet werden.\n"
@@ -2857,7 +2876,7 @@
msgid "Secret Key List"
msgstr "Liste der geheimen Schlüssel"
-#: Src/wptKeyManager.cpp:157
+#: Src/wptKeyManager.cpp:152
msgid ""
"This key has expired!\n"
"Key check failed."
@@ -2865,7 +2884,7 @@
"Dieser Schlüssel ist abgelaufen!\n"
"Schlüsselüberprüfung fehlgeschlagen."
-#: Src/wptKeyManager.cpp:162
+#: Src/wptKeyManager.cpp:157
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
@@ -2873,25 +2892,25 @@
"Dieser Schlüssel wurde vom Besitzer widerrufen!\n"
"Schlüsselüberprüfung fehlgeschlagen."
-#: Src/wptKeyManager.cpp:305
+#: Src/wptKeyManager.cpp:299
msgid "Only one secret key can be exported."
msgstr "Nur ein geheimer Schlüssel kann exportiert werden."
-#: Src/wptKeyManager.cpp:316
+#: Src/wptKeyManager.cpp:310
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr "Geheimer Schlüssel gespeichert in '%s'."
-#: Src/wptKeyManager.cpp:350
+#: Src/wptKeyManager.cpp:344
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr "Schlüssel erfolgreich in '%s' gespeichert."
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:416
msgid "No valid OpenPGP keys found."
msgstr "Keine gültigen OpenPGP-Schlüssel gefunden."
-#: Src/wptKeyManager.cpp:427
+#: Src/wptKeyManager.cpp:421
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
@@ -2899,11 +2918,11 @@
"Der Schlüssel ist \"dash escaped\".\n"
"Möchten Sie den Schlüssel extrahieren?"
-#: Src/wptKeyManager.cpp:433
+#: Src/wptKeyManager.cpp:427
msgid "Cannot import dash escaped OpenPGP keys."
msgstr "Kann keine beschädigten OpenPGP-Schlüssel importieren."
-#: Src/wptKeyManager.cpp:462 Src/wptKeyManager.cpp:590
+#: Src/wptKeyManager.cpp:456 Src/wptKeyManager.cpp:584
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -2911,43 +2930,43 @@
"Schlüssel ohne Eigensignatur erkannt!\n"
"(Dieser Schlüssel ist für Verschlüsselung, etc. NICHT verwendbar)\n"
-#: Src/wptKeyManager.cpp:491 Src/wptKeyManager.cpp:498
-#: Src/wptKeyManager.cpp:507
+#: Src/wptKeyManager.cpp:485 Src/wptKeyManager.cpp:492
+#: Src/wptKeyManager.cpp:501
msgid "Key Import HTTP"
msgstr "Schlüssel Import HTTP"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:448
-#: Src/wptKeyManager.cpp:491
+#: Src/wptKeyManager.cpp:485
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr "Ungültige HTTP URL: %s"
-#: Src/wptKeyManager.cpp:508
+#: Src/wptKeyManager.cpp:502
#, c-format
msgid "Could not fetch key from URL: %s"
msgstr "Konnte Schlüssel von der URL: %s nicht runterladen"
-#: Src/wptKeyManager.cpp:537
+#: Src/wptKeyManager.cpp:531
msgid "Choose Name of the Key File"
msgstr "Namen der Schlüsseldatei auswählen"
-#: Src/wptKeyManager.cpp:550
+#: Src/wptKeyManager.cpp:544
msgid "File Import"
msgstr "Dateiimport"
-#: Src/wptKeyManager.cpp:561
+#: Src/wptKeyManager.cpp:555
msgid "Could not read key-data from file."
msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
-#: Src/wptKeyManager.cpp:681
+#: Src/wptKeyManager.cpp:675
msgid "Do you really want to confirm each key?"
msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
-#: Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:676
msgid "Delete Confirmation"
msgstr "Löschen Bestätigen"
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:700
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2959,7 +2978,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:715
+#: Src/wptKeyManager.cpp:709
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2976,7 +2995,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:722
+#: Src/wptKeyManager.cpp:716
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -2986,34 +3005,34 @@
"Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
"Schlüssel werden gelöscht.\n"
-#: Src/wptKeyManager.cpp:786
+#: Src/wptKeyManager.cpp:780
#, c-format
-msgid "Do you really want to send '%s' to keyserver %s?"
-msgstr "Wollen Sie '%s' wirklich zum Schlüsselserver %s senden?"
+msgid "Do you really want to send '0x%s' to keyserver %s?"
+msgstr "Wollen Sie '0x%s' wirklich zum Schlüsselserver %s senden?"
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:802
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:888
+#: Src/wptKeyManager.cpp:882
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
-#: Src/wptKeyManager.cpp:893
+#: Src/wptKeyManager.cpp:887
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:979
+#: Src/wptKeyManager.cpp:973
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
@@ -3332,7 +3351,7 @@
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:585
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
@@ -3534,28 +3553,28 @@
msgid "Do you want to retrieve 0x%s via the default keyserver?"
msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
-#: Src/wptKeyserver.cpp:344
+#: Src/wptKeyserver.cpp:346
msgid "The network subsystem has failed"
msgstr "Das Netzwerk gab einen Fehler zurück"
-#: Src/wptKeyserver.cpp:346
+#: Src/wptKeyserver.cpp:348
msgid "Authoritative Answer Host not found"
msgstr "Authorisierter Rechner wurde nicht gefunden"
-#: Src/wptKeyserver.cpp:348
+#: Src/wptKeyserver.cpp:350
msgid "The connection has been dropped because of a network failure"
msgstr "Die Verbindung wurde aufgrund einen Netzwerkfehlers beendet"
-#: Src/wptKeyserver.cpp:350
+#: Src/wptKeyserver.cpp:352
#, c-format
msgid "Unknown Winsock error ec=%d"
msgstr "Unbekannter Winsock-Fehler ec=%d"
-#: Src/wptKeyserver.cpp:538
+#: Src/wptKeyserver.cpp:540
msgid "Could not save keyserver.conf file"
msgstr "Konnte keyserver.conf Datei nicht speichern"
-#: Src/wptKeyserver.cpp:583
+#: Src/wptKeyserver.cpp:585
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -3563,11 +3582,11 @@
"Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
"Passwort setzen, um Proxy-Authentifizierung nutzen zu können!"
-#: Src/wptKeyserver.cpp:586
+#: Src/wptKeyserver.cpp:588
msgid "Proxy Error"
msgstr "Proxyfehler"
-#: Src/wptKeyserver.cpp:612
+#: Src/wptKeyserver.cpp:614
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3575,25 +3594,25 @@
"Alle Eintraäge in dieser Datei müssen über einen gültigen Präfix verfügen.\n"
"Aktuell werden HKP/HTTP, LDAP and FINGER unterstützt.\n"
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:616
msgid "Keyserver Error"
msgstr "Schlüsselserver-Fehler"
# c:\oss\winpt-gpgme\src\wptKeyserver.cpp:548
-#: Src/wptKeyserver.cpp:638
+#: Src/wptKeyserver.cpp:640
msgid "The keyserver limit is exceeded"
msgstr "Das Limit der Keyserver wurde erreicht"
-#: Src/wptKeyserver.cpp:639
+#: Src/wptKeyserver.cpp:641
msgid "Keyserver Warning"
msgstr "Keyserver Warnung"
-#: Src/wptKeyserverDlg.cpp:98
+#: Src/wptKeyserverDlg.cpp:100
#, c-format
msgid "Key '%s' successfully sent"
msgstr "Schlüssel '%s' erfolgreich versendet"
-#: Src/wptKeyserverDlg.cpp:132
+#: Src/wptKeyserverDlg.cpp:134
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -3601,19 +3620,19 @@
"WARNUNG: Mehrere Schlüssel wurden gefunden.\n"
"\n"
-#: Src/wptKeyserverDlg.cpp:137
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) successfully received but nothing was changed."
msgstr "Schlüssel erfolgreich empfangen, aber keine Änderungen durchgeführt."
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:141
msgid "Key(s) sucessfully received and imported."
msgstr "Schlüssel erfolgreich empfangen und importiert."
-#: Src/wptKeyserverDlg.cpp:155
+#: Src/wptKeyserverDlg.cpp:157
msgid "Imported Keys"
msgstr "Importierte Schlüssel"
-#: Src/wptKeyserverDlg.cpp:185
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3623,110 +3642,110 @@
"Bitte stellen Sie sicher, dass Sie eine Internetverbindung hergestellt haben "
"und gpgkeys_ldap.exe installiert ist."
-#: Src/wptKeyserverDlg.cpp:197
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "Finger Schlüsselimport fehlgeschlagen: %s\n"
-#: Src/wptKeyserverDlg.cpp:211
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
-#: Src/wptKeyserverDlg.cpp:366
+#: Src/wptKeyserverDlg.cpp:368
msgid "Please select one of the servers."
msgstr "Bitte einen der Server auswählen."
-#: Src/wptKeyserverDlg.cpp:371
+#: Src/wptKeyserverDlg.cpp:373
msgid "Only HTTP keyserver can be used."
msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:390
msgid "DNS Name"
msgstr "DNS Name"
-#: Src/wptKeyserverDlg.cpp:389
+#: Src/wptKeyserverDlg.cpp:391
msgid "Port"
msgstr "Port"
-#: Src/wptKeyserverDlg.cpp:474
+#: Src/wptKeyserverDlg.cpp:476
msgid "No space for new keyserver entry"
msgstr "Kein Platz für neuen Keserver-Eintrag"
-#: Src/wptKeyserverDlg.cpp:495
+#: Src/wptKeyserverDlg.cpp:497
msgid "HKP Keyserver"
msgstr "HKP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:496
+#: Src/wptKeyserverDlg.cpp:498
msgid "LDAP Keyserver"
msgstr "LDAP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:499
msgid "Finger Keyserver"
msgstr "Finger-Keyserver"
-#: Src/wptKeyserverDlg.cpp:522 Src/wptKeyserverDlg.cpp:736
-#: Src/wptKeyserverDlg.cpp:756
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
+#: Src/wptKeyserverDlg.cpp:758
msgid "Edit Keyserver"
msgstr "Editiere Keyserver"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:615
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
msgid "&Add"
msgstr "&Hinzufügen"
-#: Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:527
msgid "Type:"
msgstr "Typ:"
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:528
msgid "Port:"
msgstr "Port:"
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:529
msgid "Host name:"
msgstr "Rechnername:"
-#: Src/wptKeyserverDlg.cpp:535
+#: Src/wptKeyserverDlg.cpp:537
msgid "Please enter a host name"
msgstr "Bitte einen Rechnernamen eingeben."
-#: Src/wptKeyserverDlg.cpp:540
+#: Src/wptKeyserverDlg.cpp:542
msgid "Invalid port, valid numbers are < 65535"
msgstr "Ungültiger Port, gültige Nummern sind < 65535"
-#: Src/wptKeyserverDlg.cpp:584 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "&Empfangen"
-#: Src/wptKeyserverDlg.cpp:586
+#: Src/wptKeyserverDlg.cpp:588
msgid "Send key (default is receiving)"
msgstr "Schlüssel senden (sonst empfangen)"
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:590
msgid "Please enter the key ID or email address you search for"
msgstr "Bitte die key ID oder E-Mail-Adresse angeben die gesucht wird"
-#: Src/wptKeyserverDlg.cpp:589
+#: Src/wptKeyserverDlg.cpp:591
msgid "&Search"
msgstr "&Suchen"
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:592
msgid "C&hange proxy"
msgstr "Proxy Ä&ndern"
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:593
msgid "Set &default"
msgstr "Als &Standard"
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Remove"
msgstr "&Entfernen"
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:619
msgid "&Edit"
msgstr "&Edtieren"
-#: Src/wptKeyserverDlg.cpp:643 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
@@ -3734,27 +3753,27 @@
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: Src/wptKeyserverDlg.cpp:650 Src/wptKeyserverDlg.cpp:681
+#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
msgid "Please select one of the keyservers."
msgstr "Bitte einen Keyserver auswählen."
-#: Src/wptKeyserverDlg.cpp:658
+#: Src/wptKeyserverDlg.cpp:660
msgid "This is not implemented yet!"
msgstr "Das ist noch nicht implementiert!"
-#: Src/wptKeyserverDlg.cpp:665 Src/wptKeyserverDlg.cpp:697
+#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
msgid "Please enter the search pattern."
msgstr "Bitte Suchmuster eingeben."
-#: Src/wptKeyserverDlg.cpp:702
+#: Src/wptKeyserverDlg.cpp:704
msgid "Only keyids are allowed."
msgstr "Nur Schlüssel-IDs zulässig"
-#: Src/wptKeyserverDlg.cpp:708
+#: Src/wptKeyserverDlg.cpp:710
msgid "Only enter the name of the user."
msgstr "Nur den Namen des Benutzers eingeben."
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
msgid "Only email addresses or keyids are allowed."
msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Po/fr.po 2006-04-03 17:10:47 UTC (rev 195)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.8\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-31 18:47+0200\n"
+"POT-Creation-Date: 2006-04-02 19:20+0200\n"
"PO-Revision-Date: 2006-03-04 21:32+0100\n"
"Last-Translator: Pascal Brochart <pbrochart at tuxfamily.org>\n"
"Language-Team: FR <winpt-dev at wald.intevation.org>\n"
@@ -49,16 +49,16 @@
msgstr "Impossible de créer le répertoire de WinPT"
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
-#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
-#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
-#: Src/wptKeyserverDlg.cpp:475 Src/wptKeyserverDlg.cpp:535
-#: Src/wptKeyserverDlg.cpp:540 Src/wptKeyserverDlg.cpp:651
-#: Src/wptKeyserverDlg.cpp:659 Src/wptKeyserverDlg.cpp:666
-#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:698
-#: Src/wptKeyserverDlg.cpp:703 Src/wptKeyserverDlg.cpp:709
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
+#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
+#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
+#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
+#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
+#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:717
msgid "Keyserver"
msgstr "Serveur de clé"
@@ -190,7 +190,7 @@
msgid "&About GPG..."
msgstr ""
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Aide"
@@ -270,7 +270,7 @@
"Still proceed?"
msgstr ""
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:521
msgid "&Name"
msgstr "&Nom"
@@ -286,7 +286,7 @@
msgid "Off-card passphrase"
msgstr ""
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "&Jamais"
@@ -330,7 +330,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr ""
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1370
msgid "The date you have chosen lies in the past."
msgstr ""
@@ -386,21 +386,21 @@
"Press OK to continue or Cancel"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
-#: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
+#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:120 Src/wptClipDecryptDlg.cpp:133
-#: Src/wptClipDecryptDlg.cpp:141 Src/wptClipDecryptDlg.cpp:148
-#: Src/wptClipDecryptDlg.cpp:150 Src/wptFileManager.cpp:1277
-#: Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
+#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
msgid "Decryption"
msgstr "Déchiffrement"
-#: Src/wptClipDecryptDlg.cpp:134 Src/wptFileManager.cpp:1329
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -409,16 +409,16 @@
"Chiffré avec la clé %s, ID %s.%s\n"
"Le déchiffrement a échoué: La clé secrète n'est pas disponible."
-#: Src/wptClipDecryptDlg.cpp:141
+#: Src/wptClipDecryptDlg.cpp:140
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "L'algorithme n'est pas supporté: %s"
-#: Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:146
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:155
+#: Src/wptClipDecryptDlg.cpp:154
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -427,38 +427,38 @@
"but it might be also possible that this is part of an attack."
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:160
+#: Src/wptClipDecryptDlg.cpp:159
msgid "*** IMPORTANT ***"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
-#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
+#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "Etat de GnuPG: Terminé"
-#: Src/wptClipDecryptDlg.cpp:182
+#: Src/wptClipDecryptDlg.cpp:181
msgid "Signature Status: Created with a fully trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:184
+#: Src/wptClipDecryptDlg.cpp:183
msgid "Signature Status: Created with a marginal trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:187
+#: Src/wptClipDecryptDlg.cpp:186
msgid "Signature Status: Created with an UNTRUSTED key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:190
+#: Src/wptClipDecryptDlg.cpp:189
msgid "Signature Status: Created with an undefined trusted key"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:196
msgid "WinPT Verify"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:198
+#: Src/wptClipDecryptDlg.cpp:197
#, c-format
msgid ""
"%s\n"
@@ -476,7 +476,7 @@
msgid "Clipboard"
msgstr "Presse papiers"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:575
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
msgid "File Open"
msgstr ""
@@ -490,7 +490,7 @@
msgid "File Save"
msgstr ""
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:109
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -524,8 +524,8 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
-#: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fermer"
@@ -550,11 +550,11 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:345 Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:524 Src/wptKeyEditDlgs.cpp:656
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/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
@@ -584,8 +584,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
-#: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
+#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signer"
@@ -629,9 +629,9 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1558 Src/wptFileManager.cpp:1613
+#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
-#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
+#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
msgid "Verify"
@@ -677,33 +677,34 @@
msgid "Enter URL to retrieve the public key"
msgstr ""
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:771
-#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
-#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
-#: Src/wptKeyEditDlgs.cpp:988 Src/wptKeyEditDlgs.cpp:1006
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1062
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1159
-#: Src/wptKeyEditDlgs.cpp:1288 Src/wptKeyEditDlgs.cpp:1292
-#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
-#: Src/wptKeyEditDlgs.cpp:1338 Src/wptKeyEditDlgs.cpp:1342
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1367
-#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1413
-#: Src/wptKeyEditDlgs.cpp:1418 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1431 Src/wptKeyEditDlgs.cpp:1436
-#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
-#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1568
-#: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
-#: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
-#: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
-#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
-#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
-#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:832 Src/wptKeyEditDlgs.cpp:871
+#: Src/wptKeyEditDlgs.cpp:886 Src/wptKeyEditDlgs.cpp:888
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyEditDlgs.cpp:983
+#: Src/wptKeyEditDlgs.cpp:990 Src/wptKeyEditDlgs.cpp:1008
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptKeyEditDlgs.cpp:1292 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1371
+#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1417
+#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1435 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1497 Src/wptKeyEditDlgs.cpp:1504
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1547
+#: Src/wptKeyEditDlgs.cpp:1555 Src/wptKeyEditDlgs.cpp:1572
+#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
+#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
+#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr ""
@@ -911,29 +912,29 @@
msgid "Unknown error=%d"
msgstr "Erreur inconnue=%d"
-#: Src/wptFileManager.cpp:108 Src/wptFileManager.cpp:130
-#: Src/wptFileManager.cpp:136 Src/wptFileManager.cpp:175
-#: Src/wptFileManager.cpp:300 Src/wptFileManager.cpp:669
-#: Src/wptFileManager.cpp:814 Src/wptFileManager.cpp:928
-#: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
-#: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
-#: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
+#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
+#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
+#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Gestionnaire de fichier"
-#: Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:132
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
"Set attribute to normal?"
msgstr ""
-#: Src/wptFileManager.cpp:135
+#: Src/wptFileManager.cpp:136
msgid "Could not reset file attribute to normal."
msgstr ""
-#: Src/wptFileManager.cpp:171
+#: Src/wptFileManager.cpp:172
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -941,142 +942,151 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Nom"
-#: Src/wptFileManager.cpp:385
+#: Src/wptFileManager.cpp:386
msgid "Operation"
msgstr "Opération"
-#: Src/wptFileManager.cpp:669
+#: Src/wptFileManager.cpp:670
msgid "Please select a file."
msgstr "Sélectionner un fichier."
-#: Src/wptFileManager.cpp:815
+#: Src/wptFileManager.cpp:816
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
"Do you really want to clearsign it?"
msgstr ""
-#: Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:930
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" n'existe pas"
-#: Src/wptFileManager.cpp:1014 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Status du fichier"
-#: Src/wptFileManager.cpp:1060
+#: Src/wptFileManager.cpp:1057
msgid "Enter filename for encrypted file"
msgstr ""
-#: Src/wptFileManager.cpp:1089
+#: Src/wptFileManager.cpp:1086
msgid "Could not get default secret key."
msgstr "Ne peut obtenir la clé secrète par défaut."
-#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
+#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signer"
-#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Chiffrer"
-#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symétrique"
-#: Src/wptFileManager.cpp:1200
+#: Src/wptFileManager.cpp:1195
msgid "Encryption failed."
msgstr "Erreur de chiffrement."
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "Good signature"
msgstr "Bonne signature"
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "BAD signature"
msgstr "MAUVAISE signature"
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1230
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
"%s from \"%s\""
msgstr ""
-#: Src/wptFileManager.cpp:1240
+#: Src/wptFileManager.cpp:1235
msgid "Decrypt Verify"
msgstr ""
-#: Src/wptFileManager.cpp:1288
+#: Src/wptFileManager.cpp:1311
msgid "Choose Filename for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1299
+#: Src/wptFileManager.cpp:1320
msgid "Please enter filename for plaintext file"
msgstr ""
-#: Src/wptFileManager.cpp:1337 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "Déchiffrer"
-#: Src/wptFileManager.cpp:1343
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
"%s: does not exist."
msgstr ""
-#: Src/wptFileManager.cpp:1385
+#: Src/wptFileManager.cpp:1371
+#, c-format
+msgid ""
+"The original file name is '%s'.\n"
+"\n"
+"Do you want to use this instead of '%s'?"
+msgstr ""
+
+#: Src/wptFileManager.cpp:1419
msgid "Enter filename for signed file"
msgstr ""
-#: Src/wptFileManager.cpp:1489
+#: Src/wptFileManager.cpp:1523
msgid "Could not find detached signature in the clipboard."
msgstr ""
-#: Src/wptFileManager.cpp:1509
+#: Src/wptFileManager.cpp:1543
msgid "No files to check."
msgstr "Aucun fichiers à vérifier."
-#: Src/wptFileManager.cpp:1526
+#: Src/wptFileManager.cpp:1560
msgid "Select Data File"
msgstr ""
-#: Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1562
msgid "Selected Output File"
msgstr ""
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1590
msgid "Invalid file name. Exit"
msgstr ""
-#: Src/wptFileManager.cpp:1660 Src/wptFileManager.cpp:1671
+#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
-#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:447 Src/wptKeyManager.cpp:458
+#: Src/wptKeyManager.cpp:586 Src/wptKeyserverDlg.cpp:223
msgid "Import"
msgstr "Importer"
-#: Src/wptFileManager.cpp:1668
+#: Src/wptFileManager.cpp:1696
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1084,58 +1094,58 @@
"Cannot import these key(s)!"
msgstr ""
-#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:256
-#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
+#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
msgid "No key was selected for export."
msgstr ""
-#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
+#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exporter"
-#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1021
-#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1392
-#: Src/wptKeyserverDlg.cpp:99
+#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
+#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "Status de GnuPG"
-#: Src/wptFileManager.cpp:1721
+#: Src/wptFileManager.cpp:1749
#, c-format
msgid "Finished (Output: %s)"
msgstr ""
-#: Src/wptFileManager.cpp:1768
+#: Src/wptFileManager.cpp:1796
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManager.cpp:1828
+#: Src/wptFileManager.cpp:1855
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr ""
-#: Src/wptFileManager.cpp:1833
+#: Src/wptFileManager.cpp:1860
msgid "Choose File Name for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1902
+#: Src/wptFileManager.cpp:1929
msgid "Choose a Name for the Archive"
msgstr ""
-#: Src/wptFileManager.cpp:1905
+#: Src/wptFileManager.cpp:1932
msgid "Invalid archive name. Exit."
msgstr ""
-#: Src/wptFileManager.cpp:1905 Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
msgid "Encrypt Directory"
msgstr ""
-#: Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1939
msgid "Could not create zip archive."
msgstr ""
@@ -1164,12 +1174,12 @@
msgstr ""
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:281
-#: Src/wptKeyManager.cpp:417
+#: Src/wptKeyManager.cpp:411
msgid "No valid OpenPGP data found."
msgstr ""
#: Src/wptFileManagerDlg.cpp:203 Src/wptFileManagerDlg.cpp:217
-#: Src/wptKeyManager.cpp:442
+#: Src/wptKeyManager.cpp:436
msgid "Key Import"
msgstr ""
@@ -1215,10 +1225,10 @@
msgid "Options"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1292
-#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
-#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1346 Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyManager.cpp:670 Src/wptKeyManager.cpp:772
+#: Src/wptKeyManager.cpp:808 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
@@ -1445,7 +1455,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:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1708 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
@@ -1658,24 +1668,24 @@
msgstr ""
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
-#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:158 Src/wptKeyManager.cpp:163
-#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
-#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
-#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
-#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
-#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
-#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
-#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
-#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
-#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
-#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
-#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
-#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
-#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
-#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:153 Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:209 Src/wptKeyManager.cpp:252
+#: Src/wptKeyManager.cpp:264 Src/wptKeyManager.cpp:295
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:307
+#: Src/wptKeyManager.cpp:309 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:339 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:404
+#: Src/wptKeyManager.cpp:409 Src/wptKeyManager.cpp:412
+#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:423
+#: Src/wptKeyManager.cpp:428 Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:564 Src/wptKeyManager.cpp:670
+#: Src/wptKeyManager.cpp:699 Src/wptKeyManager.cpp:708
+#: Src/wptKeyManager.cpp:719 Src/wptKeyManager.cpp:745
+#: Src/wptKeyManager.cpp:772 Src/wptKeyManager.cpp:779
+#: Src/wptKeyManager.cpp:803 Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828 Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:888 Src/wptKeyManager.cpp:948
+#: Src/wptKeyManager.cpp:978 Src/wptKeyManagerDlg.cpp:1162
#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
@@ -1756,17 +1766,17 @@
msgid "Unknown Hotkey"
msgstr ""
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1178
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1452
-#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1119 Src/wptKeyEditDlgs.cpp:1180
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1528
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr ""
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1353
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -1780,7 +1790,7 @@
msgid "public key"
msgstr "clé publique"
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1195
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1197
msgid "Invalid user ID"
msgstr ""
@@ -1796,7 +1806,7 @@
msgid "Size"
msgstr "Taille"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1041
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
@@ -1804,8 +1814,8 @@
msgid "Key ID"
msgstr ""
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1040
-#: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1149 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
@@ -1838,280 +1848,280 @@
msgid "Key Cache"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:208
+#: Src/wptKeyEditDlgs.cpp:210
msgid "Ultimate"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeyEditDlgs.cpp:1112
+#: Src/wptKeyEditDlgs.cpp:225 Src/wptKeyEditDlgs.cpp:1114
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+#: Src/wptKeyEditDlgs.cpp:241 Src/wptKeyEditDlgs.cpp:1121
msgid "OK"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:264
+#: Src/wptKeyEditDlgs.cpp:266
msgid "user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:265
+#: Src/wptKeyEditDlgs.cpp:267
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
"%s"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:340
+#: Src/wptKeyEditDlgs.cpp:342
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
"close to 240x288 is a good size to use."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:341
+#: Src/wptKeyEditDlgs.cpp:343
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:344 Src/wptKeyEditDlgs.cpp:446
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:344
+#: Src/wptKeyEditDlgs.cpp:346
msgid "Add Photo ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:362
msgid "Select Image File"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:364 Src/wptKeyEditDlgs.cpp:374
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
-#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:902
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:376
+#: Src/wptKeyEditDlgs.cpp:382 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:402 Src/wptKeyEditDlgs.cpp:904
msgid "Add Photo"
msgstr "Ajouter une photo"
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:367
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:380
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:388 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "Entrer une passphrase."
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:407
msgid "Photo successfully added."
msgstr "Photo ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
-#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
-#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:408 Src/wptKeyEditDlgs.cpp:489
+#: Src/wptKeyEditDlgs.cpp:571 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1458 Src/wptKeyEditDlgs.cpp:1530
+#: Src/wptKeyEditDlgs.cpp:1615 Src/wptKeyEditDlgs.cpp:1795
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "Etat de GnuPG"
-#: Src/wptKeyEditDlgs.cpp:442
+#: Src/wptKeyEditDlgs.cpp:444
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:443
+#: Src/wptKeyEditDlgs.cpp:445
msgid "Public key"
msgstr "Clé publique"
-#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
-#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:448 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:917
msgid "Add Revoker"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1486
-#: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
-#: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1933
msgid "Please select a user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "Entrer la passphrase."
-#: Src/wptKeyEditDlgs.cpp:486
+#: Src/wptKeyEditDlgs.cpp:488
msgid "Revoker successfully addded."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:520
msgid "Add new User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:520
+#: Src/wptKeyEditDlgs.cpp:522
msgid "&Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:521
+#: Src/wptKeyEditDlgs.cpp:523
msgid "&Comment"
msgstr "&Commentaire"
-#: Src/wptKeyEditDlgs.cpp:536
+#: Src/wptKeyEditDlgs.cpp:538
msgid "Please enter a name (min. 5 chars.)"
msgstr "Entrer un nom (min. 5 caractères)"
-#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:567
+#: Src/wptKeyEditDlgs.cpp:538 Src/wptKeyEditDlgs.cpp:542
+#: Src/wptKeyEditDlgs.cpp:547 Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:569
msgid "UserID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:542
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:545
+#: Src/wptKeyEditDlgs.cpp:547
msgid "Please enter an email address."
msgstr "Entrer une adresse email"
-#: Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:551
msgid "Invalid email address."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:569
+#: Src/wptKeyEditDlgs.cpp:571
msgid "user ID successfully added."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:844
+#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:846
msgid "Add new Subkey"
msgstr "Ajouter la nouvelle clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key type"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:653
msgid "Size in bits"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:654
msgid "Key expiration"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:697
+#: Src/wptKeyEditDlgs.cpp:699
msgid "Please select one entry."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
-#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:738 Src/wptKeyEditDlgs.cpp:828
msgid "Add Subkey"
msgstr "Ajouter la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:740
msgid "Subkey successfully added."
msgstr "Clé secondaire ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
-#: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
-#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
-#: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:828
+#: Src/wptKeyEditDlgs.cpp:903 Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1417 Src/wptKeyEditDlgs.cpp:1479
#: Src/wptKeyManagerDlg.cpp:1521
msgid "There is no secret key available!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:785
msgid "Add user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:884
+#: Src/wptKeyEditDlgs.cpp:886
msgid "Preferred keyserver successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:934 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:936 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyManager.cpp:212
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyManager.cpp:207
msgid "Key status changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:988
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:993
+#: Src/wptKeyEditDlgs.cpp:995
msgid "Current (old) Passphrase"
msgstr "Actuel (ancienne) Passphrase"
-#: Src/wptKeyEditDlgs.cpp:997
+#: Src/wptKeyEditDlgs.cpp:999
msgid "New Passphrase"
msgstr "Nouvelle Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1004 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1006 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1021
msgid "Change Passwd"
msgstr "Changement de mot de passe"
-#: Src/wptKeyEditDlgs.cpp:1021
+#: Src/wptKeyEditDlgs.cpp:1023
msgid "Passphrase successfully changed."
msgstr "Passphrase modifiée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1040 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Déscription"
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "Expires"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1155
msgid "Could not find key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1062
+#: Src/wptKeyEditDlgs.cpp:1064
msgid "No subkey(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1146 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "Validité"
-#: Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:1148
msgid "Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1159
+#: Src/wptKeyEditDlgs.cpp:1161
msgid "No user ID(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1253
+#: Src/wptKeyEditDlgs.cpp:1255
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2132,21 +2142,22 @@
"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"
+"CLEAN \t\tremove unusable signatures from key\r\n"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1272
+#: Src/wptKeyEditDlgs.cpp:1276
msgid "Key Edit Help"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptKeyEditDlgs.cpp:1292
msgid "Primary key can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
msgid "Primary subkey can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1306
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2157,34 +2168,34 @@
"Do you really want to delete this subkey?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1314
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "Effacer la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "Clé secondaire effacée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1354
msgid ""
"Key already expired.\n"
"\n"
"Do you want to change the expiration date?"
msgstr "Voulez-vous changer la date d'expiration?"
-#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1363 Src/wptKeyEditDlgs.cpp:1366
msgid "Key Expiration Date"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Expire Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1391
+#: Src/wptKeyEditDlgs.cpp:1395
msgid "Subkey expire date successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1426
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2192,31 +2203,31 @@
"This command is only available to revoke single subkeys"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1435
msgid "Key already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Revoke Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1454
+#: Src/wptKeyEditDlgs.cpp:1458
msgid "Subkey successfully revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1476
+#: Src/wptKeyEditDlgs.cpp:1480
msgid "Revoke user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Key has only one user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
msgid "This user ID has been already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1502
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2224,43 +2235,43 @@
"Do you really want to revoke this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1526
msgid "Revoke User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1526
+#: Src/wptKeyEditDlgs.cpp:1530
msgid "User ID successfully revoked"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1568
+#: Src/wptKeyEditDlgs.cpp:1572
msgid "Could not set user ID preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1608
+#: Src/wptKeyEditDlgs.cpp:1612
msgid "Primary"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1611
+#: Src/wptKeyEditDlgs.cpp:1615
msgid "User ID successfully flagged"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "No preferences available."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1703
+#: Src/wptKeyEditDlgs.cpp:1707
msgid "MDC feature"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1709 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1760
msgid "Primary user ID can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1767
+#: Src/wptKeyEditDlgs.cpp:1771
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2270,39 +2281,43 @@
"Do you really want to delete this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1787
+#: Src/wptKeyEditDlgs.cpp:1791
msgid "Delete user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1795
msgid "User ID successfully deleted"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1914
+#: Src/wptKeyEditDlgs.cpp:1902
+msgid "Finished to compact key."
+msgstr ""
+
+#: Src/wptKeyEditDlgs.cpp:1937
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1996
+#: Src/wptKeyEditDlgs.cpp:2019
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2009
+#: Src/wptKeyEditDlgs.cpp:2032
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2018
+#: Src/wptKeyEditDlgs.cpp:2041
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2073
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2054
+#: Src/wptKeyEditDlgs.cpp:2077
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2634,88 +2649,88 @@
msgid "Secret Key List"
msgstr ""
-#: Src/wptKeyManager.cpp:157
+#: Src/wptKeyManager.cpp:152
msgid ""
"This key has expired!\n"
"Key check failed."
msgstr ""
-#: Src/wptKeyManager.cpp:162
+#: Src/wptKeyManager.cpp:157
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
msgstr ""
-#: Src/wptKeyManager.cpp:305
+#: Src/wptKeyManager.cpp:299
msgid "Only one secret key can be exported."
msgstr ""
-#: Src/wptKeyManager.cpp:316
+#: Src/wptKeyManager.cpp:310
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr ""
-#: Src/wptKeyManager.cpp:350
+#: Src/wptKeyManager.cpp:344
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr ""
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:416
msgid "No valid OpenPGP keys found."
msgstr ""
-#: Src/wptKeyManager.cpp:427
+#: Src/wptKeyManager.cpp:421
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
msgstr ""
-#: Src/wptKeyManager.cpp:433
+#: Src/wptKeyManager.cpp:427
msgid "Cannot import dash escaped OpenPGP keys."
msgstr ""
-#: Src/wptKeyManager.cpp:462 Src/wptKeyManager.cpp:590
+#: Src/wptKeyManager.cpp:456 Src/wptKeyManager.cpp:584
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
msgstr ""
-#: Src/wptKeyManager.cpp:491 Src/wptKeyManager.cpp:498
-#: Src/wptKeyManager.cpp:507
+#: Src/wptKeyManager.cpp:485 Src/wptKeyManager.cpp:492
+#: Src/wptKeyManager.cpp:501
msgid "Key Import HTTP"
msgstr ""
-#: Src/wptKeyManager.cpp:491
+#: Src/wptKeyManager.cpp:485
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr ""
-#: Src/wptKeyManager.cpp:508
+#: Src/wptKeyManager.cpp:502
#, c-format
msgid "Could not fetch key from URL: %s"
msgstr ""
-#: Src/wptKeyManager.cpp:537
+#: Src/wptKeyManager.cpp:531
msgid "Choose Name of the Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptKeyManager.cpp:550
+#: Src/wptKeyManager.cpp:544
msgid "File Import"
msgstr ""
-#: Src/wptKeyManager.cpp:561
+#: Src/wptKeyManager.cpp:555
msgid "Could not read key-data from file."
msgstr ""
-#: Src/wptKeyManager.cpp:681
+#: Src/wptKeyManager.cpp:675
msgid "Do you really want to confirm each key?"
msgstr ""
-#: Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:676
msgid "Delete Confirmation"
msgstr "Confirmation de l'effacement"
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:700
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2723,7 +2738,7 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:715
+#: Src/wptKeyManager.cpp:709
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2734,39 +2749,39 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:722
+#: Src/wptKeyManager.cpp:716
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
"placeholder will be deleted.\n"
msgstr ""
-#: Src/wptKeyManager.cpp:786
-#, c-format
-msgid "Do you really want to send '%s' to keyserver %s?"
-msgstr ""
+#: Src/wptKeyManager.cpp:780
+#, fuzzy, c-format
+msgid "Do you really want to send '0x%s' to keyserver %s?"
+msgstr "Voulez-vous effacer le contenu du presse papiers?"
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:802
msgid "Please only select one key."
msgstr ""
-#: Src/wptKeyManager.cpp:888
+#: Src/wptKeyManager.cpp:882
msgid "Do you really want to refresh all keys in the keyring?"
msgstr ""
-#: Src/wptKeyManager.cpp:893
+#: Src/wptKeyManager.cpp:887
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search"
msgstr "Chercher"
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search for:"
msgstr ""
-#: Src/wptKeyManager.cpp:979
+#: Src/wptKeyManager.cpp:973
#, c-format
msgid "String pattern \"%s\" not found."
msgstr ""
@@ -3060,7 +3075,7 @@
msgid "Smart Card support is not available."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:585
msgid "Keyserver Access"
msgstr ""
@@ -3241,188 +3256,188 @@
msgid "Do you want to retrieve 0x%s via the default keyserver?"
msgstr ""
-#: Src/wptKeyserver.cpp:344
+#: Src/wptKeyserver.cpp:346
msgid "The network subsystem has failed"
msgstr ""
-#: Src/wptKeyserver.cpp:346
+#: Src/wptKeyserver.cpp:348
msgid "Authoritative Answer Host not found"
msgstr ""
-#: Src/wptKeyserver.cpp:348
+#: Src/wptKeyserver.cpp:350
msgid "The connection has been dropped because of a network failure"
msgstr ""
-#: Src/wptKeyserver.cpp:350
+#: Src/wptKeyserver.cpp:352
#, c-format
msgid "Unknown Winsock error ec=%d"
msgstr ""
-#: Src/wptKeyserver.cpp:538
+#: Src/wptKeyserver.cpp:540
msgid "Could not save keyserver.conf file"
msgstr ""
-#: Src/wptKeyserver.cpp:583
+#: Src/wptKeyserver.cpp:585
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
msgstr ""
-#: Src/wptKeyserver.cpp:586
+#: Src/wptKeyserver.cpp:588
msgid "Proxy Error"
msgstr ""
-#: Src/wptKeyserver.cpp:612
+#: Src/wptKeyserver.cpp:614
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
msgstr ""
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:616
msgid "Keyserver Error"
msgstr ""
-#: Src/wptKeyserver.cpp:638
+#: Src/wptKeyserver.cpp:640
msgid "The keyserver limit is exceeded"
msgstr ""
-#: Src/wptKeyserver.cpp:639
+#: Src/wptKeyserver.cpp:641
msgid "Keyserver Warning"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:98
+#: Src/wptKeyserverDlg.cpp:100
#, c-format
msgid "Key '%s' successfully sent"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:132
+#: Src/wptKeyserverDlg.cpp:134
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:137
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) successfully received but nothing was changed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:141
msgid "Key(s) sucessfully received and imported."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:155
+#: Src/wptKeyserverDlg.cpp:157
msgid "Imported Keys"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:185
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
"installed"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:197
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:211
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:366
+#: Src/wptKeyserverDlg.cpp:368
msgid "Please select one of the servers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:371
+#: Src/wptKeyserverDlg.cpp:373
msgid "Only HTTP keyserver can be used."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:390
msgid "DNS Name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:389
+#: Src/wptKeyserverDlg.cpp:391
msgid "Port"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:474
+#: Src/wptKeyserverDlg.cpp:476
msgid "No space for new keyserver entry"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:495
+#: Src/wptKeyserverDlg.cpp:497
msgid "HKP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:496
+#: Src/wptKeyserverDlg.cpp:498
msgid "LDAP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:497
+#: Src/wptKeyserverDlg.cpp:499
msgid "Finger Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:522 Src/wptKeyserverDlg.cpp:736
-#: Src/wptKeyserverDlg.cpp:756
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
+#: Src/wptKeyserverDlg.cpp:758
msgid "Edit Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:615
+#: Src/wptKeyserverDlg.cpp:525 Src/wptKeyserverDlg.cpp:617
msgid "&Add"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:527
msgid "Type:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:528
msgid "Port:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:527
+#: Src/wptKeyserverDlg.cpp:529
msgid "Host name:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:535
+#: Src/wptKeyserverDlg.cpp:537
msgid "Please enter a host name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:540
+#: Src/wptKeyserverDlg.cpp:542
msgid "Invalid port, valid numbers are < 65535"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:584 Src/wptKeyserverSearchDlg.cpp:60
+#: Src/wptKeyserverDlg.cpp:586 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:586
+#: Src/wptKeyserverDlg.cpp:588
msgid "Send key (default is receiving)"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:588
+#: Src/wptKeyserverDlg.cpp:590
msgid "Please enter the key ID or email address you search for"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:589
+#: Src/wptKeyserverDlg.cpp:591
msgid "&Search"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:592
msgid "C&hange proxy"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:593
msgid "Set &default"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Remove"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:619
msgid "&Edit"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:643 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
@@ -3430,27 +3445,27 @@
msgid "Proxy Settings"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:650 Src/wptKeyserverDlg.cpp:681
+#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:683
msgid "Please select one of the keyservers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:658
+#: Src/wptKeyserverDlg.cpp:660
msgid "This is not implemented yet!"
msgstr "Ceci n'est pas encore implémenté!"
-#: Src/wptKeyserverDlg.cpp:665 Src/wptKeyserverDlg.cpp:697
+#: Src/wptKeyserverDlg.cpp:667 Src/wptKeyserverDlg.cpp:699
msgid "Please enter the search pattern."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:702
+#: Src/wptKeyserverDlg.cpp:704
msgid "Only keyids are allowed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:708
+#: Src/wptKeyserverDlg.cpp:710
msgid "Only enter the name of the user."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:714
+#: Src/wptKeyserverDlg.cpp:716
msgid "Only email addresses or keyids are allowed."
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Po/jp.po 2006-04-03 17:10:47 UTC (rev 195)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-31 18:47+0200\n"
+"POT-Creation-Date: 2006-04-02 19:20+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -80,16 +80,16 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/WinPT.cpp:300 Src/WinPT.cpp:317 Src/WinPT.cpp:328
-#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:539
-#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
-#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:372
-#: Src/wptKeyserverDlg.cpp:475 Src/wptKeyserverDlg.cpp:535
-#: Src/wptKeyserverDlg.cpp:540 Src/wptKeyserverDlg.cpp:651
-#: Src/wptKeyserverDlg.cpp:659 Src/wptKeyserverDlg.cpp:666
-#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:698
-#: Src/wptKeyserverDlg.cpp:703 Src/wptKeyserverDlg.cpp:709
-#: Src/wptKeyserverDlg.cpp:715
+#: Src/wptKeyManagerDlg.cpp:941 Src/wptKeyserver.cpp:541
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:190
+#: Src/wptKeyserverDlg.cpp:198 Src/wptKeyserverDlg.cpp:214
+#: Src/wptKeyserverDlg.cpp:368 Src/wptKeyserverDlg.cpp:374
+#: Src/wptKeyserverDlg.cpp:477 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverDlg.cpp:653
+#: Src/wptKeyserverDlg.cpp:661 Src/wptKeyserverDlg.cpp:668
+#: Src/wptKeyserverDlg.cpp:684 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:717
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
@@ -269,7 +269,7 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
@@ -380,7 +380,7 @@
"‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:519
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:521
msgid "&Name"
msgstr "–¼‘O(&N)"
@@ -404,7 +404,7 @@
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:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
@@ -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:1366
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1370
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -545,8 +545,8 @@
"Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
-#: Src/wptClipDecryptDlg.cpp:195 Src/wptFileManager.cpp:1239
+#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -558,16 +558,16 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:138
# c:\oss\winpt\src\wptFileManager.cpp:952
# c:\oss\winpt\src\wptFileManager.cpp:996
-#: Src/wptClipDecryptDlg.cpp:120 Src/wptClipDecryptDlg.cpp:133
-#: Src/wptClipDecryptDlg.cpp:141 Src/wptClipDecryptDlg.cpp:148
-#: Src/wptClipDecryptDlg.cpp:150 Src/wptFileManager.cpp:1277
-#: Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
+#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
+#: Src/wptFileManager.cpp:1349
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:134 Src/wptFileManager.cpp:1329
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -576,17 +576,17 @@
" %s‚ňƉ»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
"•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
-#: Src/wptClipDecryptDlg.cpp:141
+#: Src/wptClipDecryptDlg.cpp:140
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
-#: Src/wptClipDecryptDlg.cpp:147
+#: Src/wptClipDecryptDlg.cpp:146
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr "•s–¾‚ÈOpenPGPƒƒbƒZ[ƒW"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
-#: Src/wptClipDecryptDlg.cpp:155
+#: Src/wptClipDecryptDlg.cpp:154
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -601,7 +601,7 @@
"‚Ü‚½‚Í‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:160
+#: Src/wptClipDecryptDlg.cpp:159
msgid "*** IMPORTANT ***"
msgstr "*** d—v ***"
@@ -613,40 +613,40 @@
# c:\oss\winpt\src\wptKeyManager.cpp:274
# c:\oss\winpt\src\wptKeyManager.cpp:610
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
-#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:279
-#: Src/wptKeyManager.cpp:757 Src/wptKeyManager.cpp:956 Src/wptSymEnc.cpp:91
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
+#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:182
+#: 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:184
+#: 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:187
+#: 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:190
+#: 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:197
+#: Src/wptClipDecryptDlg.cpp:196
msgid "WinPT Verify"
msgstr "WinPT Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:198
+#: 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:575
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
msgid "File Open"
msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
@@ -699,7 +699,7 @@
msgstr "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚é"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:109
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -747,8 +747,8 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2019
-#: Src/wptKeyserverDlg.cpp:592 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -782,11 +782,11 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:445
-#: Src/wptKeyEditDlgs.cpp:522 Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:345 Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:524 Src/wptKeyEditDlgs.cpp:656
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
-#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverSearchDlg.cpp:61
+#: Src/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
@@ -837,8 +837,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1090
-#: Src/wptFileManager.cpp:1108 Src/wptFileManager.cpp:1372
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
+#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
@@ -909,9 +909,9 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1558 Src/wptFileManager.cpp:1613
+#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
-#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:182
+#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
msgid "Verify"
@@ -1016,33 +1016,34 @@
# 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:771
-#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
-#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:886
-#: Src/wptKeyEditDlgs.cpp:937 Src/wptKeyEditDlgs.cpp:981
-#: Src/wptKeyEditDlgs.cpp:988 Src/wptKeyEditDlgs.cpp:1006
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1062
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1159
-#: Src/wptKeyEditDlgs.cpp:1288 Src/wptKeyEditDlgs.cpp:1292
-#: Src/wptKeyEditDlgs.cpp:1296 Src/wptKeyEditDlgs.cpp:1301
-#: Src/wptKeyEditDlgs.cpp:1338 Src/wptKeyEditDlgs.cpp:1342
-#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1367
-#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1413
-#: Src/wptKeyEditDlgs.cpp:1418 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1431 Src/wptKeyEditDlgs.cpp:1436
-#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
-#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1543
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1568
-#: Src/wptKeyEditDlgs.cpp:1588 Src/wptKeyEditDlgs.cpp:1596
-#: Src/wptKeyEditDlgs.cpp:1697 Src/wptKeyEditDlgs.cpp:1730
-#: Src/wptKeyEditDlgs.cpp:1757 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1772 Src/wptKeyEditDlgs.cpp:1910
-#: Src/wptKeyEditDlgs.cpp:1915 Src/wptKeyEditDlgs.cpp:1924
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1942
-#: Src/wptKeyEditDlgs.cpp:1997 Src/wptKeyEditDlgs.cpp:2010
-#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2050
-#: Src/wptKeyEditDlgs.cpp:2055 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:832 Src/wptKeyEditDlgs.cpp:871
+#: Src/wptKeyEditDlgs.cpp:886 Src/wptKeyEditDlgs.cpp:888
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyEditDlgs.cpp:983
+#: Src/wptKeyEditDlgs.cpp:990 Src/wptKeyEditDlgs.cpp:1008
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeyEditDlgs.cpp:1161
+#: Src/wptKeyEditDlgs.cpp:1292 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1305
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1346
+#: Src/wptKeyEditDlgs.cpp:1356 Src/wptKeyEditDlgs.cpp:1371
+#: Src/wptKeyEditDlgs.cpp:1375 Src/wptKeyEditDlgs.cpp:1417
+#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1435 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1497 Src/wptKeyEditDlgs.cpp:1504
+#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1547
+#: Src/wptKeyEditDlgs.cpp:1555 Src/wptKeyEditDlgs.cpp:1572
+#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
+#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
+#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
+#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1314,19 +1315,19 @@
# c:\oss\winpt\src\wptFileManager.cpp:1381
# c:\oss\winpt\src\wptFileStatDlg.cpp:124
# c:\oss\winpt\src\wptMainProc.cpp:387 c:\oss\winpt\src\wptMainProc.cpp:526
-#: Src/wptFileManager.cpp:108 Src/wptFileManager.cpp:130
-#: Src/wptFileManager.cpp:136 Src/wptFileManager.cpp:175
-#: Src/wptFileManager.cpp:300 Src/wptFileManager.cpp:669
-#: Src/wptFileManager.cpp:814 Src/wptFileManager.cpp:928
-#: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
-#: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
-#: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
+#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
+#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
+#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
# c:\oss\winpt\src\wptFileManager.cpp:102
-#: Src/wptFileManager.cpp:131
+#: Src/wptFileManager.cpp:132
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
@@ -1336,12 +1337,12 @@
"‘®«‚ð•’Ê‚Éݒ肵‚Ü‚·‚©H"
# c:\oss\winpt\src\wptCardDlg.cpp:317
-#: Src/wptFileManager.cpp:135
+#: Src/wptFileManager.cpp:136
msgid "Could not reset file attribute to normal."
msgstr "ƒtƒ@ƒCƒ‹‘®«‚ð•’Ê‚É’u‚«’¼‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:137
-#: Src/wptFileManager.cpp:171
+#: Src/wptFileManager.cpp:172
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -1357,7 +1358,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:383 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1366,24 +1367,24 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:919
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:43
# c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1145
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "–¼‘O"
# c:\oss\winpt\src\wptFileManager.cpp:181
-#: Src/wptFileManager.cpp:385
+#: Src/wptFileManager.cpp:386
msgid "Operation"
msgstr "‘€ì"
# c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:669
+#: Src/wptFileManager.cpp:670
msgid "Please select a file."
msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:815
+#: Src/wptFileManager.cpp:816
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1393,25 +1394,25 @@
"‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:929
+#: Src/wptFileManager.cpp:930
#, 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:1014 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:825
-#: Src/wptFileManager.cpp:1060
+#: Src/wptFileManager.cpp:1057
msgid "Enter filename for encrypted file"
msgstr "ˆÃ†‰»‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:837
-#: Src/wptFileManager.cpp:1089
+#: Src/wptFileManager.cpp:1086
msgid "Could not get default secret key."
msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1420,7 +1421,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:1122 Src/wptFileManager.cpp:1408
+#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1429,7 +1430,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:1135 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1438,28 +1439,28 @@
# c:\oss\winpt\src\wptFileManager.cpp:914
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
-#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
+#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
# c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1200
+#: Src/wptFileManager.cpp:1195
msgid "Encryption failed."
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1227
+#: Src/wptFileManager.cpp:1222
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1230
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1469,29 +1470,30 @@
"%s ‚©‚ç \"%s\"‚Å‚·B"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1240
+#: Src/wptFileManager.cpp:1235
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1288
+#: Src/wptFileManager.cpp:1311
msgid "Choose Filename for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1299
+#: Src/wptFileManager.cpp:1320
msgid "Please enter filename for plaintext file"
msgstr "ƒvƒŒ[ƒ“ƒeƒLƒX—p‚̃gƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1006
# c:\oss\winpt\src\wptFileManager.cpp:1011
# c:\oss\winpt\src\wptFileManagerDlg.cpp:402
-#: Src/wptFileManager.cpp:1337 Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
+#: Src/wptFileManagerDlg.cpp:554
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1343
+#: Src/wptFileManager.cpp:1364
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1500,33 +1502,41 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
+#: Src/wptFileManager.cpp:1371
+#, c-format
+msgid ""
+"The original file name is '%s'.\n"
+"\n"
+"Do you want to use this instead of '%s'?"
+msgstr ""
+
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1385
+#: Src/wptFileManager.cpp:1419
msgid "Enter filename for signed file"
msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1489
+#: Src/wptFileManager.cpp:1523
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:1509
+#: Src/wptFileManager.cpp:1543
msgid "No files to check."
msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1526
+#: Src/wptFileManager.cpp:1560
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1562
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1558
+#: Src/wptFileManager.cpp:1590
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1541,18 +1551,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:1660 Src/wptFileManager.cpp:1671
+#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
-#: Src/wptKeyManager.cpp:453 Src/wptKeyManager.cpp:464
-#: Src/wptKeyManager.cpp:592 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:447 Src/wptKeyManager.cpp:458
+#: Src/wptKeyManager.cpp:586 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:1668
+#: Src/wptFileManager.cpp:1696
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1568,15 +1578,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:1694 Src/wptKeyManager.cpp:256
-#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:335
+#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
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:1694 Src/wptFileManager.cpp:1717
+#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1584,7 +1594,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1594,51 +1604,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:1721 Src/wptKeyEditDlgs.cpp:1021
-#: Src/wptKeyEditDlgs.cpp:1318 Src/wptKeyEditDlgs.cpp:1392
-#: Src/wptKeyserverDlg.cpp:99
+#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
+#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1721
+#: Src/wptFileManager.cpp:1749
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1768
+#: Src/wptFileManager.cpp:1796
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1828
+#: Src/wptFileManager.cpp:1855
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:1833
+#: Src/wptFileManager.cpp:1860
msgid "Choose File Name for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1902
+#: Src/wptFileManager.cpp:1929
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:1905
+#: Src/wptFileManager.cpp:1932
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:1905 Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1939
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1676,14 +1686,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:417
+#: Src/wptKeyManager.cpp:411
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:442
+#: Src/wptKeyManager.cpp:436
msgid "Key Import"
msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
@@ -1760,10 +1770,10 @@
# 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:1292
-#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1418
-#: Src/wptKeyManager.cpp:676 Src/wptKeyManager.cpp:778
-#: Src/wptKeyManager.cpp:814 Src/wptKeyManagerDlg.cpp:1494
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1346 Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyManager.cpp:670 Src/wptKeyManager.cpp:772
+#: Src/wptKeyManager.cpp:808 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
@@ -2090,7 +2100,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:1704 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1708 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
@@ -2420,24 +2430,24 @@
# 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:158 Src/wptKeyManager.cpp:163
-#: Src/wptKeyManager.cpp:214 Src/wptKeyManager.cpp:257
-#: Src/wptKeyManager.cpp:270 Src/wptKeyManager.cpp:301
-#: Src/wptKeyManager.cpp:306 Src/wptKeyManager.cpp:313
-#: Src/wptKeyManager.cpp:315 Src/wptKeyManager.cpp:336
-#: Src/wptKeyManager.cpp:345 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:369 Src/wptKeyManager.cpp:410
-#: Src/wptKeyManager.cpp:415 Src/wptKeyManager.cpp:418
-#: Src/wptKeyManager.cpp:423 Src/wptKeyManager.cpp:429
-#: Src/wptKeyManager.cpp:434 Src/wptKeyManager.cpp:562
-#: Src/wptKeyManager.cpp:570 Src/wptKeyManager.cpp:676
-#: Src/wptKeyManager.cpp:705 Src/wptKeyManager.cpp:714
-#: Src/wptKeyManager.cpp:725 Src/wptKeyManager.cpp:751
-#: Src/wptKeyManager.cpp:778 Src/wptKeyManager.cpp:785
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:814
-#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:889
-#: Src/wptKeyManager.cpp:894 Src/wptKeyManager.cpp:954
-#: Src/wptKeyManager.cpp:984 Src/wptKeyManagerDlg.cpp:1162
+#: Src/wptImagelist.cpp:52 Src/wptKeyManager.cpp:153 Src/wptKeyManager.cpp:158
+#: Src/wptKeyManager.cpp:209 Src/wptKeyManager.cpp:252
+#: Src/wptKeyManager.cpp:264 Src/wptKeyManager.cpp:295
+#: Src/wptKeyManager.cpp:300 Src/wptKeyManager.cpp:307
+#: Src/wptKeyManager.cpp:309 Src/wptKeyManager.cpp:330
+#: Src/wptKeyManager.cpp:339 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:363 Src/wptKeyManager.cpp:404
+#: Src/wptKeyManager.cpp:409 Src/wptKeyManager.cpp:412
+#: Src/wptKeyManager.cpp:417 Src/wptKeyManager.cpp:423
+#: Src/wptKeyManager.cpp:428 Src/wptKeyManager.cpp:556
+#: Src/wptKeyManager.cpp:564 Src/wptKeyManager.cpp:670
+#: Src/wptKeyManager.cpp:699 Src/wptKeyManager.cpp:708
+#: Src/wptKeyManager.cpp:719 Src/wptKeyManager.cpp:745
+#: Src/wptKeyManager.cpp:772 Src/wptKeyManager.cpp:779
+#: Src/wptKeyManager.cpp:803 Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828 Src/wptKeyManager.cpp:883
+#: Src/wptKeyManager.cpp:888 Src/wptKeyManager.cpp:948
+#: Src/wptKeyManager.cpp:978 Src/wptKeyManagerDlg.cpp:1162
#: Src/wptKeyManagerDlg.cpp:1175 Src/wptKeyManagerDlg.cpp:1185
#: Src/wptKeyManagerDlg.cpp:1473 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1522
@@ -2548,10 +2558,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1178
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1452
-#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1119 Src/wptKeyEditDlgs.cpp:1180
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1456
+#: Src/wptKeyEditDlgs.cpp:1495 Src/wptKeyEditDlgs.cpp:1528
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
@@ -2562,8 +2572,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117 Src/wptKeyEditDlgs.cpp:1353
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -2581,7 +2591,7 @@
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1195
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1197
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2613,7 +2623,7 @@
# 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:353 Src/wptKeyEditDlgs.cpp:1039
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1041
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
@@ -2626,8 +2636,8 @@
# 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:354 Src/wptKeyEditDlgs.cpp:1040
-#: Src/wptKeyEditDlgs.cpp:1147 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1042
+#: Src/wptKeyEditDlgs.cpp:1149 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
@@ -2670,14 +2680,14 @@
msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:208
+#: Src/wptKeyEditDlgs.cpp:210
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:223 Src/wptKeyEditDlgs.cpp:1112
+#: Src/wptKeyEditDlgs.cpp:225 Src/wptKeyEditDlgs.cpp:1114
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr "‚Í‚¸‚Í‚È‚¢"
@@ -2685,17 +2695,17 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptKeyEditDlgs.cpp:239 Src/wptKeyEditDlgs.cpp:1119
+#: Src/wptKeyEditDlgs.cpp:241 Src/wptKeyEditDlgs.cpp:1121
msgid "OK"
msgstr "OK"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:264
+#: Src/wptKeyEditDlgs.cpp:266
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:265
+#: Src/wptKeyEditDlgs.cpp:267
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2703,7 +2713,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:340
+#: Src/wptKeyEditDlgs.cpp:342
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 "
@@ -2714,7 +2724,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:341
+#: Src/wptKeyEditDlgs.cpp:343
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2724,7 +2734,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:344 Src/wptKeyEditDlgs.cpp:446
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2734,12 +2744,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:344
+#: Src/wptKeyEditDlgs.cpp:346
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:360
+#: Src/wptKeyEditDlgs.cpp:362
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2748,25 +2758,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:364 Src/wptKeyEditDlgs.cpp:374
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
-#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:902
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:376
+#: Src/wptKeyEditDlgs.cpp:382 Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:402 Src/wptKeyEditDlgs.cpp:904
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:365
+#: Src/wptKeyEditDlgs.cpp:367
#, 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:374 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:376 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:378
+#: Src/wptKeyEditDlgs.cpp:380
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2775,12 +2785,12 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:388 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:405
+#: Src/wptKeyEditDlgs.cpp:407
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2799,10 +2809,10 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:167
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:75
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
-#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
-#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
-#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1526
-#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:408 Src/wptKeyEditDlgs.cpp:489
+#: Src/wptKeyEditDlgs.cpp:571 Src/wptKeyEditDlgs.cpp:740
+#: Src/wptKeyEditDlgs.cpp:1458 Src/wptKeyEditDlgs.cpp:1530
+#: Src/wptKeyEditDlgs.cpp:1615 Src/wptKeyEditDlgs.cpp:1795
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
@@ -2810,12 +2820,12 @@
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:318
-#: Src/wptKeyEditDlgs.cpp:442
+#: Src/wptKeyEditDlgs.cpp:444
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:445
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2823,9 +2833,9 @@
# 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:468 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:915
+#: Src/wptKeyEditDlgs.cpp:448 Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:917
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2834,43 +2844,43 @@
# 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:1486
-#: Src/wptKeyEditDlgs.cpp:1543 Src/wptKeyEditDlgs.cpp:1588
-#: Src/wptKeyEditDlgs.cpp:1730 Src/wptKeyEditDlgs.cpp:1761
-#: Src/wptKeyEditDlgs.cpp:1910
+#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
+#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
+#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
+#: Src/wptKeyEditDlgs.cpp:1933
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:470 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:486
+#: Src/wptKeyEditDlgs.cpp:488
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:520
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:520
+#: Src/wptKeyEditDlgs.cpp:522
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:521
+#: Src/wptKeyEditDlgs.cpp:523
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:536
+#: Src/wptKeyEditDlgs.cpp:538
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2878,14 +2888,14 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
-#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
-#: Src/wptKeyEditDlgs.cpp:567
+#: Src/wptKeyEditDlgs.cpp:538 Src/wptKeyEditDlgs.cpp:542
+#: Src/wptKeyEditDlgs.cpp:547 Src/wptKeyEditDlgs.cpp:551
+#: Src/wptKeyEditDlgs.cpp:569
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:542
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2893,43 +2903,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:545
+#: Src/wptKeyEditDlgs.cpp:547
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:551
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:569
+#: Src/wptKeyEditDlgs.cpp:571
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:844
+#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:846
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:651
+#: Src/wptKeyEditDlgs.cpp:653
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:654
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:697
+#: Src/wptKeyEditDlgs.cpp:699
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2942,18 +2952,18 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:540
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:637
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:676
-#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
-#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:699 Src/wptKeyEditDlgs.cpp:705
+#: Src/wptKeyEditDlgs.cpp:738 Src/wptKeyEditDlgs.cpp:828
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:702
+#: Src/wptKeyEditDlgs.cpp:704
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS‚͌ŒèƒL[ƒTƒCƒY1024‚ªŽg—p‚µ‚Ü‚·BƒTƒCƒY‚ª•ÏX‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:678
-#: Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:740
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2966,10 +2976,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1196
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
-#: Src/wptKeyEditDlgs.cpp:901 Src/wptKeyEditDlgs.cpp:915
-#: Src/wptKeyEditDlgs.cpp:980 Src/wptKeyEditDlgs.cpp:1338
-#: Src/wptKeyEditDlgs.cpp:1413 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:828
+#: Src/wptKeyEditDlgs.cpp:903 Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1417 Src/wptKeyEditDlgs.cpp:1479
#: Src/wptKeyManagerDlg.cpp:1521
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -2977,29 +2987,29 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:579
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:599
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:613
-#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
+#: Src/wptKeyEditDlgs.cpp:768 Src/wptKeyEditDlgs.cpp:785
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:884
+#: Src/wptKeyEditDlgs.cpp:886
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:934 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:936 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:937 Src/wptKeyManager.cpp:212
+#: Src/wptKeyEditDlgs.cpp:939 Src/wptKeyManager.cpp:207
msgid "Key status changed."
msgstr "ƒL[‚Ìó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:988
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -3008,19 +3018,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:993
+#: Src/wptKeyEditDlgs.cpp:995
msgid "Current (old) Passphrase"
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:997
+#: Src/wptKeyEditDlgs.cpp:999
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:1004 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1006 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3029,55 +3039,55 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1021
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1021
+#: Src/wptKeyEditDlgs.cpp:1023
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1038 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1040 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1043
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1057 Src/wptKeyEditDlgs.cpp:1155
msgid "Could not find key."
msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
-#: Src/wptKeyEditDlgs.cpp:1062
+#: Src/wptKeyEditDlgs.cpp:1064
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:1144 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1146 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:1148
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1159
+#: Src/wptKeyEditDlgs.cpp:1161
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1253
+#: Src/wptKeyEditDlgs.cpp:1255
#, fuzzy
msgid ""
"ADDUID \t\tadd a user ID\r\n"
@@ -3099,6 +3109,7 @@
"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"
+"CLEAN \t\tremove unusable signatures from key\r\n"
msgstr ""
"ADDUID \t\tƒ†[ƒU[ID‚ð’ljÁ‚·‚é\r\n"
"ADDPHOTO \t\tƒtƒHƒgID‚ð’ljÁ‚·‚é\r\n"
@@ -3117,22 +3128,22 @@
"ENABLE \t\tƒL[‚ð—LŒø‚É‚·‚é\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1272
+#: Src/wptKeyEditDlgs.cpp:1276
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptKeyEditDlgs.cpp:1292
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
msgid "Primary subkey can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒTƒuƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1302
+#: Src/wptKeyEditDlgs.cpp:1306
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3150,16 +3161,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1314
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1354
msgid ""
"Key already expired.\n"
"\n"
@@ -3172,22 +3183,22 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1146
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1149
# c:\oss\winpt\src\wptKeygenDlg.cpp:303 c:\oss\winpt\src\wptKeygenDlg.cpp:306
-#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1363 Src/wptKeyEditDlgs.cpp:1366
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1391
+#: Src/wptKeyEditDlgs.cpp:1395
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1422
+#: Src/wptKeyEditDlgs.cpp:1426
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3200,37 +3211,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1435
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1454
+#: Src/wptKeyEditDlgs.cpp:1458
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1476
+#: Src/wptKeyEditDlgs.cpp:1480
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1481
+#: Src/wptKeyEditDlgs.cpp:1485
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1502
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3242,51 +3253,51 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1526
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1526
+#: Src/wptKeyEditDlgs.cpp:1530
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1568
+#: Src/wptKeyEditDlgs.cpp:1572
#, fuzzy
msgid "Could not set user ID preferences"
msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1608
+#: Src/wptKeyEditDlgs.cpp:1612
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1611
+#: Src/wptKeyEditDlgs.cpp:1615
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1703
+#: Src/wptKeyEditDlgs.cpp:1707
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1709 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1756
+#: Src/wptKeyEditDlgs.cpp:1760
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1767
+#: Src/wptKeyEditDlgs.cpp:1771
#, fuzzy, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3300,17 +3311,21 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1787
+#: Src/wptKeyEditDlgs.cpp:1791
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1791
+#: Src/wptKeyEditDlgs.cpp:1795
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
+#: Src/wptKeyEditDlgs.cpp:1902
+msgid "Finished to compact key."
+msgstr ""
+
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1914
+#: Src/wptKeyEditDlgs.cpp:1937
#, fuzzy
msgid "Do you really want to make this sig exportable?"
msgstr ""
@@ -3319,32 +3334,32 @@
"%s"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:1996
+#: Src/wptKeyEditDlgs.cpp:2019
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:2009
+#: Src/wptKeyEditDlgs.cpp:2032
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:2018
+#: Src/wptKeyEditDlgs.cpp:2041
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2050
+#: Src/wptKeyEditDlgs.cpp:2073
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2054
+#: Src/wptKeyEditDlgs.cpp:2077
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3792,7 +3807,7 @@
msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManager.cpp:97
-#: Src/wptKeyManager.cpp:157
+#: Src/wptKeyManager.cpp:152
msgid ""
"This key has expired!\n"
"Key check failed."
@@ -3801,7 +3816,7 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:100
-#: Src/wptKeyManager.cpp:162
+#: Src/wptKeyManager.cpp:157
msgid ""
"This key has been revoked by its owner!\n"
"Key check failed."
@@ -3810,29 +3825,29 @@
"ƒL[‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:298
-#: Src/wptKeyManager.cpp:305
+#: Src/wptKeyManager.cpp:299
msgid "Only one secret key can be exported."
msgstr "ˆêŒÂ‚̔閧Œ®‚Ì‚Ý‚ªƒGƒLƒXƒ|[ƒg‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:316
+#: Src/wptKeyManager.cpp:310
#, c-format
msgid "Secret key successfully saved in '%s'."
msgstr "”é–§Œ®‚ð'%s'‚É•Û‘¶‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:360
-#: Src/wptKeyManager.cpp:350
+#: Src/wptKeyManager.cpp:344
#, c-format
msgid "Key(s) successfully saved in '%s'."
msgstr "ƒL[‚𳂵‚'%s'‚É•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:412
-#: Src/wptKeyManager.cpp:422
+#: Src/wptKeyManager.cpp:416
msgid "No valid OpenPGP keys found."
msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:416
-#: Src/wptKeyManager.cpp:427
+#: Src/wptKeyManager.cpp:421
msgid ""
"The key you want to import is dash escacped.\n"
"Do you want to extract the key?"
@@ -3841,13 +3856,13 @@
"ƒL[‚ðˆø‚o‚µ‚½‚¢‚Å‚µ‚傤‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:422
-#: Src/wptKeyManager.cpp:433
+#: Src/wptKeyManager.cpp:427
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:462 Src/wptKeyManager.cpp:590
+#: Src/wptKeyManager.cpp:456 Src/wptKeyManager.cpp:584
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -3858,51 +3873,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:491 Src/wptKeyManager.cpp:498
-#: Src/wptKeyManager.cpp:507
+#: Src/wptKeyManager.cpp:485 Src/wptKeyManager.cpp:492
+#: Src/wptKeyManager.cpp:501
msgid "Key Import HTTP"
msgstr "ƒL[ƒCƒ“ƒ|[ƒg‚ÌHTTP"
# c:\oss\winpt\src\wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:491
+#: Src/wptKeyManager.cpp:485
#, c-format
msgid "Invalid HTTP URL: %s"
msgstr "–³Œø‚ÈHTTP URL: %s"
# c:\oss\winpt\src\wptMAPI.cpp:348
-#: Src/wptKeyManager.cpp:508
+#: Src/wptKeyManager.cpp:502
#, fuzzy, c-format
msgid "Could not fetch key from URL: %s"
msgstr "'%s' ‚ɑ΂µ‚ăL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1082
-#: Src/wptKeyManager.cpp:537
+#: Src/wptKeyManager.cpp:531
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:550
+#: Src/wptKeyManager.cpp:544
msgid "File Import"
msgstr "ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒ|[ƒg"
# c:\oss\winpt\src\wptKeyManager.cpp:500
-#: Src/wptKeyManager.cpp:561
+#: Src/wptKeyManager.cpp:555
msgid "Could not read key-data from file."
msgstr "ƒL[‚̃f[ƒ^‚ðƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:681
+#: Src/wptKeyManager.cpp:675
msgid "Do you really want to confirm each key?"
msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
-#: Src/wptKeyManager.cpp:682
+#: Src/wptKeyManager.cpp:676
msgid "Delete Confirmation"
msgstr "Šm”F‚ð휂·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:700
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -3914,7 +3929,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:715
+#: Src/wptKeyManager.cpp:709
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3932,7 +3947,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:722
+#: Src/wptKeyManager.cpp:716
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3943,37 +3958,37 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:786
-#, c-format
-msgid "Do you really want to send '%s' to keyserver %s?"
+#: Src/wptKeyManager.cpp:780
+#, fuzzy, c-format
+msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "'%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s? ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:802
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:888
+#: Src/wptKeyManager.cpp:882
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:893
+#: Src/wptKeyManager.cpp:887
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:968
+#: Src/wptKeyManager.cpp:962
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:979
+#: Src/wptKeyManager.cpp:973
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4372,7 +4387,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
# c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyManagerDlg.cpp:1667 Src/wptKeyserverDlg.cpp:585
msgid "Keyserver Access"
msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
@@ -4604,33 +4619,33 @@
msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å 0x%s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyserver.cpp:271
-#: Src/wptKeyserver.cpp:344
+#: Src/wptKeyserver.cpp:346
msgid "The network subsystem has failed"
msgstr "ƒlƒbƒgƒ[ƒNƒTƒuƒVƒXƒeƒ€‚ªáŠQ‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserver.cpp:272
-#: Src/wptKeyserver.cpp:346
+#: Src/wptKeyserver.cpp:348
msgid "Authoritative Answer Host not found"
msgstr "M—Š‚Å‚«‚éƒAƒ“ƒT[ƒzƒXƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyserver.cpp:273
-#: Src/wptKeyserver.cpp:348
+#: Src/wptKeyserver.cpp:350
msgid "The connection has been dropped because of a network failure"
msgstr "ƒlƒbƒgƒ[ƒNáŠQ‚Ì‚½‚ßÚ‘±‚ªØ’f‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserver.cpp:274
-#: Src/wptKeyserver.cpp:350
+#: Src/wptKeyserver.cpp:352
#, c-format
msgid "Unknown Winsock error ec=%d"
msgstr "–¢’m‚ÌWinsockƒGƒ‰[ ec=%d"
# c:\oss\winpt\src\wptPreferencesDlg.cpp:221
-#: Src/wptKeyserver.cpp:538
+#: Src/wptKeyserver.cpp:540
msgid "Could not save keyserver.conf file"
msgstr "keyserver.confƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyserver.cpp:436
-#: Src/wptKeyserver.cpp:583
+#: Src/wptKeyserver.cpp:585
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -4639,12 +4654,12 @@
"ƒvƒƒNƒV[‚Ì”FØI"
# c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserver.cpp:586
+#: Src/wptKeyserver.cpp:588
msgid "Proxy Error"
msgstr "ƒvƒƒNƒV[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:462
-#: Src/wptKeyserver.cpp:612
+#: Src/wptKeyserver.cpp:614
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -4667,27 +4682,27 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserver.cpp:614
+#: Src/wptKeyserver.cpp:616
msgid "Keyserver Error"
msgstr "ƒL[ƒT[ƒo[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:473
-#: Src/wptKeyserver.cpp:638
+#: Src/wptKeyserver.cpp:640
msgid "The keyserver limit is exceeded"
msgstr "ƒL[ƒT[ƒo[‚̧ŒÀ‚ª’´‚¦‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserver.cpp:639
+#: Src/wptKeyserver.cpp:641
msgid "Keyserver Warning"
msgstr "ƒL[ƒT[ƒo[Œx"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:89
-#: Src/wptKeyserverDlg.cpp:98
+#: Src/wptKeyserverDlg.cpp:100
#, c-format
msgid "Key '%s' successfully sent"
msgstr "'%s' ƒL[‚Ì‘—M‚ª¬Œ÷‚µ‚Ü‚µ‚½B"
-#: Src/wptKeyserverDlg.cpp:132
+#: Src/wptKeyserverDlg.cpp:134
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -4696,12 +4711,12 @@
"\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:161
-#: Src/wptKeyserverDlg.cpp:137
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) successfully received but nothing was changed."
msgstr "ƒL[‚ÌŽóM‚ɬŒ÷‚µ‚Ü‚µ‚½‚ªA‚Å‚à‰½‚à•Ï‚í‚Á‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:166
-#: Src/wptKeyserverDlg.cpp:139
+#: Src/wptKeyserverDlg.cpp:141
msgid "Key(s) sucessfully received and imported."
msgstr "ƒL[‚ÌŽóM‚ª¬Œ÷‚µAƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
@@ -4716,12 +4731,12 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptKeyserverDlg.cpp:155
+#: Src/wptKeyserverDlg.cpp:157
msgid "Imported Keys"
msgstr "ƒCƒ“ƒ|[ƒg‚µ‚½ƒL["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:116
-#: Src/wptKeyserverDlg.cpp:185
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -4732,36 +4747,36 @@
"”F‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:127
-#: Src/wptKeyserverDlg.cpp:197
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "FINGERƒL[‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %s\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyserverDlg.cpp:211
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:366
+#: Src/wptKeyserverDlg.cpp:368
msgid "Please select one of the servers."
msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:371
+#: Src/wptKeyserverDlg.cpp:373
msgid "Only HTTP keyserver can be used."
msgstr "HTTPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:390
msgid "DNS Name"
msgstr "DNS–¼"
-#: Src/wptKeyserverDlg.cpp:389
+#: Src/wptKeyserverDlg.cpp:391
msgid "Port"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:474
+#: Src/wptKeyserverDlg.cpp:476
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4780,12 +4795,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:495
+#: Src/wptKeyserverDlg.cpp:497
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:496
+#: Src/wptKeyserverDlg.cpp:498
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4804,7 +4819,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:497
+#: Src/wptKeyserverDlg.cpp:499
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4823,75 +4838,75 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:522 Src/wptKeyserverDlg.cpp:736
-#: Src/wptKeyserverDlg.cpp:756
+#: Src/wptKeyserverDlg.cpp:524 Src/wptKeyserverDlg.cpp:738
+#: Src/wptKeyserverDlg.cpp:758
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:523 Src/wptKeyserverDlg.cpp:615
+#: 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:525
+#: Src/wptKeyserverDlg.cpp:527
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:526
+#: Src/wptKeyserverDlg.cpp:528
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:527
+#: 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:535
+#: Src/wptKeyserverDlg.cpp:537
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:540
+#: 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:584 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:586
+#: 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:588
+#: 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:589
+#: Src/wptKeyserverDlg.cpp:591
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:590
+#: Src/wptKeyserverDlg.cpp:592
#, fuzzy
msgid "C&hange proxy"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:591
+#: Src/wptKeyserverDlg.cpp:593
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:618
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:619
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4899,7 +4914,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:643 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
@@ -4909,33 +4924,33 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:650 Src/wptKeyserverDlg.cpp:681
+#: 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:658
+#: 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:665 Src/wptKeyserverDlg.cpp:697
+#: 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:702
+#: 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:708
+#: 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:714
+#: Src/wptKeyserverDlg.cpp:716
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/ChangeLog 2006-04-03 17:10:47 UTC (rev 195)
@@ -1,3 +1,15 @@
+2006-04-02 Timo Schulz <ts at g10code.de>
+
+ * wptKeyserver.cpp: decrease general threshold for timeout.
+ * wptKeyEditDlgs.cpp (do_editkey_clean): New.
+
+2006-04-01 Timo Schulz <ts at g10code.de>
+
+ * wptFileVerifyDlg.cpp (file_verify_use_event): Removed.
+ * wptFileManager.cpp (restore_original_name): New.
+ (fm_decrypt): Restore original file name from literal
+ packet if possible.
+
2006-03-31 Timo Schulz <ts at g10code.de>
* wptCommonDlg.cpp (nls_load_langlist): New.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/WinPT-en.rc 2006-04-03 17:10:47 UTC (rev 195)
@@ -339,7 +339,7 @@
GROUPBOX "",IDC_STATIC,8,52,208,51
LTEXT "Passphrase info",IDC_DECRYPT_MSG,11,60,196,39
LTEXT "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
- 137,8
+ 201,8
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 |
@@ -852,7 +852,7 @@
GROUPBOX "",IDC_STATIC,7,4,220,52
LTEXT "Passphrase info",IDC_DECRYPT_SIGN_MSG,13,15,210,38
LTEXT "Please enter your passphrase",IDC_DECRYPT_SIGN_PWDINFO,
- 7,59,147,8
+ 7,59,211,8
EDITTEXT IDC_DECRYPT_SIGN_PWD,7,71,219,12,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_DECRYPT_SIGN_HIDE,"Button",
@@ -1168,7 +1168,7 @@
LTEXT "Vendor",IDC_STATIC,11,50,24,8
EDITTEXT IDC_CEDIT_VENDOR,61,49,145,12,ES_AUTOHSCROLL |
WS_DISABLED
- LTEXT "Sig Count",IDC_STATIC,11,64,32,8
+ LTEXT "Sig count",IDC_STATIC,11,64,31,8
EDITTEXT IDC_CEDIT_SIGCOUNT,61,62,56,12,ES_AUTOHSCROLL |
WS_DISABLED
LTEXT "Sign-Fingerprint",IDC_STATIC,11,77,50,8
@@ -1242,7 +1242,7 @@
PUSHBUTTON "&Cancel",IDCANCEL,94,121,50,14
END
-IDD_WINPT_CARD_KEYGEN DIALOG DISCARDABLE 0, 0, 192, 159
+IDD_WINPT_CARD_KEYGEN DIALOG DISCARDABLE 0, 0, 197, 159
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Card Key Generation"
FONT 8, "MS Sans Serif"
@@ -1264,14 +1264,14 @@
LTEXT "Off-card passphrase",IDC_CKEYGEN_PWDINF,7,83,64,8
EDITTEXT IDC_CKEYGEN_PASS,73,81,110,13,ES_PASSWORD |
ES_AUTOHSCROLL
- GROUPBOX "",IDC_STATIC,5,98,178,32
+ GROUPBOX "",IDC_STATIC,5,98,184,32
CONTROL "Overwrite old keys on the card",IDC_CKEYGEN_REPLACE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,106,160,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,106,175,10
CONTROL "Make off-card backup of encryption key",
IDC_CKEYGEN_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 9,118,165,10
- DEFPUSHBUTTON "&Start",IDOK,78,141,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,131,141,50,14
+ 9,118,174,10
+ DEFPUSHBUTTON "&Start",IDOK,88,141,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,141,141,50,14
END
IDD_WINPT_CARD_CTRL DIALOG DISCARDABLE 0, 0, 181, 95
@@ -1849,7 +1849,7 @@
IDD_WINPT_CARD_KEYGEN, DIALOG
BEGIN
LEFTMARGIN, 1
- RIGHTMARGIN, 186
+ RIGHTMARGIN, 191
TOPMARGIN, 1
BOTTOMMARGIN, 155
END
@@ -1936,8 +1936,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,9,0
- PRODUCTVERSION 0,11,9,0
+ FILEVERSION 0,11,10,0
+ PRODUCTVERSION 0,11,10,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1955,14 +1955,14 @@
VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
- VALUE "FileVersion", "0.11.9\0"
+ VALUE "FileVersion", "0.11.10\0"
VALUE "InternalName", "WinPT\0"
VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "WinPT.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Windows Privacy Tray\0"
- VALUE "ProductVersion", "0.11.9\0"
+ VALUE "ProductVersion", "0.11.10\0"
VALUE "SpecialBuild", "\0"
END
END
@@ -2053,10 +2053,10 @@
POPUP "&Edit"
BEGIN
MENUITEM "&Paste", ID_FILEMISC_PASTE
- MENUITEM "Send as Mail", ID_FILEMISC_SEND, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Select All", ID_FILEMISC_SELALL
MENUITEM SEPARATOR
+ MENUITEM "Send as Mail", ID_FILEMISC_SEND, GRAYED
MENUITEM "&Preferences", ID_FILEMISC_PREFS, GRAYED
END
POPUP "&View"
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -36,7 +36,6 @@
#include "wptContext.h"
#include "wptDlgs.h"
#include "wptKeylist.h"
-#include "wptFileManager.h"
#include "wptUTF8.h"
#include "resource.h"
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptFileManager.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -1,5 +1,5 @@
/* wptFileManager.cpp - File Manager routines
- * Copyright (C) 2001-2005 Timo Schulz
+ * Copyright (C) 2001-2006 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
* This file is part of WinPT.
@@ -53,8 +53,6 @@
#include "wptKeyManager.h"
#include "openpgp.h"
-#define op_begin() SetCursor (LoadCursor (NULL, IDC_WAIT))
-#define op_end() SetCursor (LoadCursor (NULL, IDC_ARROW))
void progress_cleanup (progress_filter_s *pfx);
BOOL CALLBACK file_secdel_confirm_dlg_proc (HWND dlg, UINT msg,
@@ -63,12 +61,15 @@
gpgme_error_t sym_passphrase_cb (void *hook, const char *hint, const char *pass_inf,
int prev_was_bad, int fd);
-/*-- wptFileVerifyDlg.cpp --*/
-void file_verify_add_state (file_sig_ctx_t c);
-void file_verify_use_event (void);
-void file_verify_wait (void);
-static const char * mm_files[] = {".mov", ".avi", ".mpg", ".mpeg",
+/* Symbolic column IDs. */
+enum {
+ FM_COL_STAT = 0,
+ FM_COL_NAME = 1,
+ FM_COL_OP = 2
+};
+
+static const char *mm_files[] = {".mov", ".avi", ".mpg", ".mpeg",
".mp3", ".wav", ".mid", ".wma",
".gif", ".jpg", ".png", ".jpeg", ".dib", 0};
@@ -227,11 +228,11 @@
/* Check the armor type of the file @fname and return
a string representation of it. */
-static const char *
+static const char*
fm_check_armor_type (const char *fname, int *r_type)
{
- FILE * fp;
- char header[768], * p;
+ FILE *fp;
+ char header[768], *p;
if (r_type)
*r_type = PGP_NONE;
@@ -383,7 +384,7 @@
{0, 80, (char *)_("Status") },
{1, 256, (char *)_("Name") },
{2, 128, (char *)_("Operation") },
- {0, 0, NULL }
+ {0, 0, NULL}
};
rc = listview_new (&c);
@@ -413,7 +414,7 @@
fm_state_new (fm_state_t * ctx)
{
gpgme_error_t rc;
- fm_state_s * c;
+ fm_state_s *c;
c = new fm_state_s;
if (!c)
@@ -422,11 +423,9 @@
rc = gpgme_new (&c->ctx);
if (rc)
BUG (0);
- /* XXX rc = gpgme_recipients_new (&c->recp);*/
- /* XXX gpgme_set_comment (c->ctx, "Generated by WinPT "PGM_VERSION); */
*ctx = c;
return 0;
-} /* fm_state_new */
+}
/* Release the FM state handle @c. */
@@ -442,9 +441,10 @@
safe_free (c->recp);
free_if_alloc (c->opaque);
free_if_alloc (c->output);
- delete c; c = NULL;
+ delete c;
}
+
static int
fm_check_for_entry( listview_ctrl_t lv, const char *file )
{
@@ -459,7 +459,7 @@
}
return 0;
-} /* fm_check_for_entry */
+}
static int
@@ -483,6 +483,7 @@
}
+/* Add all files from the directory @path to the list view @lv. */
static int
fm_add_dir_files (listview_ctrl_t lv, char *path)
{
@@ -547,9 +548,9 @@
if (!type)
return WPTERR_FILE_OPEN;
if (!strcmp (type, "UNKNOWN"))
- type = gnupg_check_file_ext (name, NULL);
- rc = listview_add_item (lv, "");
- if (!rc) {
+ type = gnupg_check_file_ext (name, NULL);
+ rc = listview_add_item (lv, "");
+ if (!rc) {
listview_add_sub_item (lv, 0, 0, type);
listview_add_sub_item (lv, 0, 1, name);
}
@@ -947,8 +948,6 @@
case FM_IMPORT:
free_if_alloc (ctx->opaque);
ctx->opaque = m_strdup (fname);
- if (!ctx->opaque)
- BUG (0);
DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_IMPORT, dlg,
file_import_dlg_proc, (LPARAM)ctx);
if (ctx->cancel == 1)
@@ -1030,8 +1029,6 @@
free_if_alloc (*dst);
free_if_alloc (c->output);
c->output = m_strdup (s);
- if (!c->output)
- BUG (0);
if (dst)
*dst = fm_quote_file (s);
return 0;
@@ -1099,8 +1096,6 @@
gpgme_key_t sigkey = gpgme_signers_enum (ctx, 0);
if (sigkey && sigkey->subkeys) {
keyid = m_strdup (sigkey->subkeys->keyid);
- if (!keyid)
- BUG (NULL);
}
}
if (!c->init_cb || !c->cache_cb) {
@@ -1261,6 +1256,36 @@
}
+/* If the decrypt result contains the original file name,
+ we use it instead of the artificial "output - .gpg" string. */
+static int
+restore_original_name (const char *output, const char *plaintext_filename)
+{
+ char *dir;
+ char *orig;
+ int rc = 0;
+
+ dir = strrchr (output, '\\');
+ if (!dir)
+ orig = strdup (plaintext_filename);
+ else {
+ orig = (char*)calloc (1, strlen (plaintext_filename)+ 1 +
+ strlen (output)+1);
+ if (!orig)
+ BUG (0);
+ memcpy (orig, output, (dir-output)+1);
+ strcat (orig, plaintext_filename);
+ }
+ if (overwrite_file (orig)) {
+ DeleteFile (orig);
+ if (!MoveFile (output, orig))
+ rc = -1;
+ }
+ safe_free (orig);
+ return rc;
+}
+
+
/* Decrypt the file @name. */
int
fm_decrypt (fm_state_t c, const char *name)
@@ -1269,7 +1294,7 @@
gpgme_ctx_t ctx = c->ctx;
gpgme_decrypt_result_t res;
gpgme_verify_result_t sigres;
- file_data_t in =NULL, out=NULL;
+ file_data_t in = NULL, out = NULL;
int rc = 0;
if (!c->init_cb || !c->cache_cb) {
@@ -1279,8 +1304,6 @@
}
c->output = m_strdup (name);
- if (!c->output)
- BUG (0);
if (is_openpgp_ext (c->output))
c->output[strlen (c->output)-4] = '\0';
else {
@@ -1290,8 +1313,6 @@
if (s) {
free_if_alloc (c->output);
c->output = m_strdup (s);
- if (!c->output)
- BUG (NULL);
}
}
@@ -1325,7 +1346,7 @@
char *p = get_key_userid (keyid+8);
gpgme_pubkey_algo_t pkalgo = res->recipients->pubkey_algo;
- log_box( _("Decryption"), MB_ERR,
+ log_box (_("Decryption"), MB_ERR,
_("Encrypted with %s key, ID %s.%s\n"
"Decryption failed: secret key not available."),
get_key_pubalgo (pkalgo), keyid+8, p);
@@ -1342,11 +1363,24 @@
log_box ("Decrypt", MB_ERR,
_("Decryption failed.\n%s: does not exist."), c->output);
rc = WPTERR_GENERAL;
+ goto leave;
}
-
+ else if (res && res->file_name) {
+ char *file = strrchr (c->output, '\\');
+ int id = log_box (_("Decrypt"), MB_QUEST_ASK,
+ _("The original file name is '%s'.\n\n"
+ "Do you want to use this instead of '%s'?"),
+ res->file_name, file? file+1 : c->output);
+ if (id == IDYES) {
+ /* before we can move the file, it needs to be closed first. */
+ gpg_file_data_release (out);
+ out = NULL;
+ restore_original_name (c->output, res->file_name);
+ }
+ }
sigres = gpgme_op_verify_result (ctx);
if (sigres && sigres->signatures)
- show_verify_result (sigres);
+ show_verify_result (sigres);
leave:
if (in)
@@ -1551,8 +1585,6 @@
if (file) {
free_if_alloc (c->output);
c->output = m_strdup (file);
- if (!c->output)
- BUG (NULL);
}
else {
msg_box (c->dlg, _("Invalid file name. Exit"), _("Verify"), MB_ERR);
@@ -1591,8 +1623,6 @@
memset (&log, 0, sizeof (log));
log.file = m_strdup (name);
- if (!log.file)
- BUG (NULL);
file_verify_create_dlg ();
err = gpg_file_data_new (name, F_DATA_READ, &in);
@@ -1646,8 +1676,6 @@
free_if_alloc (c->output);
c->output = m_strdup (name);
- if (!c->output)
- BUG (NULL);
err = gpg_file_data_new (name, F_DATA_READ, &keydata);
if (err)
@@ -1781,7 +1809,6 @@
case PGP_SIG:
case PGP_CLEARSIG:
- file_verify_use_event ();
if (type == PGP_SIG)
detached = 1;
fm_verify (ctx, detached, fn);
Modified: trunk/Src/wptFileVerifyDlg.cpp
===================================================================
--- trunk/Src/wptFileVerifyDlg.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptFileVerifyDlg.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -140,6 +140,10 @@
sec_attr.bInheritHandle = FALSE;
sec_attr.lpSecurityDescriptor = NULL;
sec_attr.nLength = sizeof (sec_attr);
+
+ if (dlg_event == NULL)
+ dlg_event = CreateEvent (&sec_attr, TRUE, FALSE, NULL);
+
thread_hd = CreateThread (&sec_attr, 0, file_verify_dlg_thread, NULL, 0, &tid);
if (thread_hd == NULL) {
msg_box (NULL, "Could not create verify thread.", _("Verify"), MB_ERR);
@@ -154,24 +158,13 @@
void
file_verify_add_state (file_sig_ctx_t c)
{
- if (dlg_lv)
- verlist_add_sig_log (dlg_lv, c);
+ if (!dlg_lv)
+ return;
+ ResetEvent (dlg_event);
+ verlist_add_sig_log (dlg_lv, c);
}
-/* Create an event for the verify dialog. */
-void
-file_verify_use_event (void)
-{
- SECURITY_ATTRIBUTES sec_attr;
-
- memset (&sec_attr, 0, sizeof (sec_attr));
- sec_attr.bInheritHandle = FALSE;
- sec_attr.nLength = sizeof (sec_attr);
- dlg_event = CreateEvent (&sec_attr, TRUE, FALSE, NULL);
-}
-
-
/* Wait until the verify event is signaled. */
void
file_verify_wait (void)
Modified: trunk/Src/wptGPGMEWrapper.cpp
===================================================================
--- trunk/Src/wptGPGMEWrapper.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptGPGMEWrapper.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -29,10 +29,8 @@
#include "gpgme.h"
#include "wptGPG.h"
#include "wptGPGME.h"
+#include "wptW32API.h"
-/* Macros to change to normal and wait cursor. */
-#define op_begin() SetCursor (LoadCursor (NULL, IDC_WAIT))
-#define op_end() SetCursor (LoadCursor (NULL, IDC_ARROW))
/* Constructor to build gpgme context. */
GPGME::GPGME ()
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -61,7 +61,8 @@
CMD_ENABLE,
CMD_SIGN,
CMD_LSIGN,
- CMD_CHECK
+ CMD_CHECK,
+ CMD_CLEAN
};
struct cmdlist_s {
@@ -88,6 +89,7 @@
{"SIGN", 0, CMD_SIGN},
{"LSIGN", 0, CMD_LSIGN},
{"CHECK", 0, CMD_CHECK},
+ {"CLEAN", 0, CMD_CLEAN},
{NULL, 0}
};
@@ -1268,7 +1270,9 @@
"DISABLE \t\tdisable a key\r\n"
"ENABLE \t\tenable a key\r\n"
"SIGN \t\tsign a user-id (exportable)\r\n"
- "LSIGN \t\tsign a user-id (non-exportable)\r\n"));
+ "LSIGN \t\tsign a user-id (non-exportable)\r\n"
+ "CLEAN \t\tremove unusable signatures from key\r\n"
+ ));
msg_box (dlg, helptext, _("Key Edit Help"), MB_OK);
}
@@ -1881,6 +1885,25 @@
}
+
+static void
+do_editkey_clean (winpt_key_t k, HWND dlg)
+{
+ gpgme_error_t err;
+ GpgKeyEdit *ke;
+
+ ke = new GpgKeyEdit (k->keyid);
+ if (!ke)
+ BUG (0);
+ err = ke->cleanKey ();
+ if (err)
+ msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+ else
+ msg_box (dlg, _("Finished to compact key."), _("Key Edit"), MB_OK);
+ delete ke;
+}
+
+
/* Start the dialog to list and display the status of all
signatures for this key. */
static void
@@ -2077,6 +2100,7 @@
case CMD_LSIGN: do_editkey_sign_userid (k, dlg,
lvuid, cmd);
break;
+ case CMD_CLEAN: do_editkey_clean (k, dlg);
}
break;
Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptKeyManager.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -51,11 +51,6 @@
#include "wptGPGME.h"
-/* Macros to change the cursor */
-#define op_begin() SetCursor (LoadCursor (NULL, IDC_WAIT))
-#define op_end() SetCursor (LoadCursor (NULL, IDC_ARROW))
-
-
/* Return a user friendly key representation in @buf of
the key given by @keyid. */
static void
@@ -255,7 +250,7 @@
if (!n) {
msg_box (dlg, _("No key was selected for export."),
_("Key Manager"), MB_ERR);
- return WPTERR_GENERAL;
+ return WPTERR_GENERAL;
}
patt = gpg_keylist_to_pattern (rset, n);
@@ -782,7 +777,7 @@
if (!key)
BUG (NULL);
id = log_box (_("Key Manager"), MB_YESNO,
- _("Do you really want to send '%s' to keyserver %s?"),
+ _("Do you really want to send '0x%s' to keyserver %s?"),
key->subkeys->keyid+8, host);
if (id == IDYES)
hkp_send_key (dlg, host, port, key->subkeys->keyid+8);
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptKeyserver.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -61,7 +61,7 @@
WORD default_keyserver_port = 0;
/* Default socket timeout. */
-static int default_socket_timeout = 10;
+static int default_socket_timeout = 6;
/* Basic64 encode the input @inbuf to @outbuf. */
static void
@@ -211,7 +211,9 @@
DWORD nread;
int nleft = buflen;
int rc, n = 0;
-
+
+ if (nbytes)
+ *nbytes = 0;
while (nleft > 0) {
if (n >= default_socket_timeout)
return WPTERR_WINSOCK_TIMEOUT;
@@ -774,6 +776,8 @@
if (!port)
port = HKP_PORT;
reqlen = 512 + strlen (hostname) + 2*strlen (pubkey);
+ if (proxy.proto == PROXY_PROTO_HTTP && proxy.base64_user)
+ reqlen += strlen (proxy.base64_user) + 1;
request = new char[reqlen];
if (!request)
BUG (0);
@@ -794,7 +798,7 @@
"Content-length: %d\r\n"
"\r\n"
"keytext=%s"
- "\n",
+ "\r\n",
skip_type_prefix (hostname), port, hostname, port,
proxy.base64_user, enc_octets+9, enc_pubkey);
}
@@ -808,7 +812,7 @@
"Content-length: %d\r\n"
"\r\n"
"keytext=%s"
- "\n",
+ "\r\n",
skip_type_prefix (hostname), port,
enc_octets+9, enc_pubkey);
}
@@ -912,7 +916,7 @@
kserver_sendkey (const char *hostname, WORD port, const char *pubkey, int len )
{
char *request = NULL;
- char log[2048];
+ char log[2048] = {0};
int conn_fd, n;
int rc;
@@ -939,7 +943,7 @@
goto leave;
}
- log_debug ("kserver_sendkey:\r\n%s\r\n", log);
+ log_debug ("kserver_sendkey: read %d bytes\r\n%s\r\n", n, log);
rc = check_hkp_response (log, 0);
if (rc)
goto leave;
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-04-03 17:10:47 UTC (rev 195)
@@ -41,7 +41,7 @@
#include "wptDlgs.h"
#include "wptUTF8.h"
-#define MAX_KEYSIZE 70000
+#define MAX_KEYSIZE 80000
char* get_reg_entry_keyserver (const char *);
int set_reg_entry_keyserver (const char *, const char *);
@@ -89,7 +89,9 @@
msg_box (dlg, gpgme_strerror (ec), _("Export"), MB_ERR);
goto leave;
}
+ op_begin ();
ec = kserver_sendkey (kserver, port, rawkey, strlen (rawkey));
+ op_end ();
if (ec) {
hkp_err_box (dlg, kserver, port, ec);
goto leave;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-04-01 12:36:58 UTC (rev 194)
+++ trunk/configure.ac 2006-04-03 17:10:47 UTC (rev 195)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.10-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.10, http://www.winpt.org)
NEED_GPG_VERSION=1.4.2
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.1
More information about the Winpt-commits
mailing list