[Winpt-commits] r229 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jun 19 16:04:37 CEST 2006
Author: twoaday
Date: 2006-06-19 16:04:31 +0200 (Mon, 19 Jun 2006)
New Revision: 229
Modified:
trunk/Include/wptDlgs.h
trunk/Include/wptGPG.h
trunk/NEWS
trunk/Po/ChangeLog
trunk/Po/de.po
trunk/Po/jp.po
trunk/Po/pt_BR.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptClipEditDlg.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyRevokeDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/Src/wptMainProc.cpp
trunk/Src/wptPassphraseCB.cpp
trunk/Src/wptPassphraseDlg.cpp
trunk/Src/wptProgressDlg.cpp
trunk/Src/wptSafeEditCtrl.cpp
trunk/THANKS
trunk/configure.ac
Log:
Modified: trunk/Include/wptDlgs.h
===================================================================
--- trunk/Include/wptDlgs.h 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Include/wptDlgs.h 2006-06-19 14:04:31 UTC (rev 229)
@@ -1,5 +1,5 @@
/* wptDlgs.h - WinPT dialog headerfile
- * Copyright (C) 2000-2005 Timo Schulz
+ * Copyright (C) 2000-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -283,10 +283,11 @@
LPARAM lparam );
/*-- Pseudo dialogs --*/
-gpgme_error_t clip_decrypt_dlg (HWND hwnd);
+gpgme_error_t clip_decrypt_dlg (HWND hwnd, int use_viewer);
-void progress_callback (void * opaque, const char * what, int type,
+void progress_callback (void *opaque, const char *what, int type,
int off, int max);
+void wait_for_progress_cb (void);
/*-- Misc --*/
BOOL CALLBACK first_run_dlg_proc( HWND dlg,
Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Include/wptGPG.h 2006-06-19 14:04:31 UTC (rev 229)
@@ -145,7 +145,7 @@
int gnupg_check_homedir (void);
int gnupg_access_keyring (int _pub);
void gnupg_backup_options ();
-void gnupg_backup_keyrings (int auto_backup, int backup_mode,
+void gnupg_backup_keyrings (int auto_backup, int backup_mode,
int include_secr);
void gnupg_display_error (void);
int gnupg_copy_keyrings (void);
@@ -197,7 +197,8 @@
PASSDLG_REPEAT = 0,
PASSDLG_INIT = 1,
PASSDLG_STRICT = 2,
- PASSDLG_NOTEMPTY= 4
+ PASSDLG_NOTEMPTY= 4,
+ PASSDLG_WARN_UTF8=8,
};
void set_gpg_passphrase_cb (passphrase_cb_s *cb, gpgme_ctx_t ctx,
@@ -207,7 +208,7 @@
char *request_passphrase (const char *title, int flags, int *ret_cancel);
char *request_passphrase2 (const char *title, int flags, int *ret_cancel);
-char *request_key_passphrase (gpgme_key_t key, const char *title,
+char *request_key_passphrase (gpgme_key_t key, const char *title,
int *ret_cancel);
const char * passphrase_cb (void *opaque, const char * desc, void *r_hd);
char * get_key_userid (const char *keyid);
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/NEWS 2006-06-19 14:04:31 UTC (rev 229)
@@ -860,4 +860,18 @@
* The verify list dialog now also uses icons to
make it easier to recognize the signature state visually.
+* Allow 8-bit passphrases, formerly utf8 encoding of the
+ passphrases.
+
+* Avoid crashes when the user tries to execute functions
+ that access the key cache during synchronisation.
+
+* Better keyserver error messages.
+
+* The decrypt/verify command does not show a separate signature
+ verify message box for each message any longer but add
+ the signature information to the viewer dialog. This avoids
+ that the user needs to remind the signature state, while viewing
+ the text.
+
[updated translations: German, Portuguese(BR)]
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Po/ChangeLog 2006-06-19 14:04:31 UTC (rev 229)
@@ -1,3 +1,7 @@
+2006-06-18 Timo Schulz <ts at g10code.de>
+
+ * de.po: Updated.
+
2006-06-14 Timo Schulz <ts at g10code.de>
* pt_BR.po: New translation.
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Po/de.po 2006-06-19 14:04:31 UTC (rev 229)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 1.0.0\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-15 09:09+0200\n"
+"POT-Creation-Date: 2006-06-18 18:43+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"
@@ -32,7 +32,7 @@
#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:355 Src/wptMainProc.cpp:533
+#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:525
msgid "WinPT Error"
msgstr "WinPT Fehler"
@@ -62,7 +62,7 @@
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyserver.cpp:601
+#: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
@@ -183,8 +183,8 @@
msgid "About GnuPG"
msgstr "Über GnuPG"
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1888
-#: Src/wptMainProc.cpp:582
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1890
+#: Src/wptMainProc.cpp:574
msgid "About WinPT"
msgstr "Über WinPT"
@@ -238,12 +238,12 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2129
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2122
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Help"
msgstr "&Hilfe"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:410
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:401
msgid "Card Manager"
msgstr "Kartenmanager"
@@ -267,7 +267,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:295
+#: Src/wptMainProc.cpp:284
msgid "Card Edit"
msgstr "Karten-Editor"
@@ -356,7 +356,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1784
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1786
msgid "Card Key Generation"
msgstr "Karten-Schlüsselerzeugung"
@@ -385,7 +385,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:1378 Src/wptKeygenDlg.cpp:453
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1371 Src/wptKeygenDlg.cpp:453
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -423,7 +423,7 @@
msgid "Change Card PIN"
msgstr "Karten PIN Ändern"
-#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:241
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:256
msgid "Passphrases do not match. Please try again."
msgstr "Passwörter nicht identisch. Versuchen Sie es erneut."
@@ -448,35 +448,35 @@
"Bitte die OpenPGP-SmartCard einlegen\n"
"OK zum Fortfahren oder Abbrechen"
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:130
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
msgid "user ID not found"
msgstr "Benutzerkennung nicht gefunden"
-#: Src/wptClipDecryptDlg.cpp:117
-msgid "Signature Status: Created with a fully trusted key"
-msgstr "Signatur Status: Erstellt mit einem vertraunswürdigen Schlüssel"
+#: Src/wptClipDecryptDlg.cpp:104
+msgid "Signature status: created with a fully trusted key"
+msgstr "Signatur Status: erstellt mit einem vertraunswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:119
-msgid "Signature Status: Created with a marginal trusted key"
+#: Src/wptClipDecryptDlg.cpp:106
+msgid "Signature status: created with a marginal trusted key"
msgstr ""
-"Signatur Status: Erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
+"Signatur Status: erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:122
-msgid "Signature Status: Created with an UNTRUSTED key"
-msgstr "Signatur Status: Erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
+#: Src/wptClipDecryptDlg.cpp:109
+msgid "Signature status: created with an UNTRUSTED key"
+msgstr "Signatur Status: erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:125
-msgid "Signature Status: Created with an undefined trusted key"
+#: Src/wptClipDecryptDlg.cpp:112
+msgid "Signature status: created with an undefined trusted key"
msgstr ""
-"Signatur Status: Erstellt mit einem Schlüssel ohne definiertes Vertrauen"
+"Signatur Status: erstellt mit einem Schlüssel ohne definiertes Vertrauen"
-#: Src/wptClipDecryptDlg.cpp:133
+#: Src/wptClipDecryptDlg.cpp:172
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptClipDecryptDlg.cpp:134
+#: Src/wptClipDecryptDlg.cpp:173
#, c-format
msgid ""
"%s\n"
@@ -491,25 +491,25 @@
"Von \"%s\" mit Schlüssel ID 0x%s%s %s\n"
"%s"
-#: Src/wptClipDecryptDlg.cpp:169 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
#: Src/wptFileManager.cpp:1622 Src/wptFileManagerDlg.cpp:590
#: Src/wptFileVerifyDlg.cpp:82 Src/wptFileVerifyDlg.cpp:149
-#: Src/wptMainProc.cpp:184 Src/wptMainProc.cpp:250 Src/wptMainProc.cpp:264
-#: Src/wptMainProc.cpp:272 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
+#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:412
msgid "Verify"
msgstr "Überprüfen"
-#: Src/wptClipDecryptDlg.cpp:176 Src/wptClipDecryptDlg.cpp:189
-#: Src/wptClipDecryptDlg.cpp:197 Src/wptClipDecryptDlg.cpp:204
-#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
+#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
#: Src/wptFileManager.cpp:1327
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -518,18 +518,18 @@
"Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
"Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:236
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Unbekannter Algorithmus: %s"
# c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:203
+#: Src/wptClipDecryptDlg.cpp:242
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Ungültige OpenPGP Nachricht (vielleicht: \"quoted printable\" im Armorteil)."
-#: Src/wptClipDecryptDlg.cpp:211
+#: Src/wptClipDecryptDlg.cpp:250
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -542,31 +542,31 @@
"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:216
+#: Src/wptClipDecryptDlg.cpp:255
msgid "*** IMPORTANT ***"
msgstr "*** WICHTIG ***"
-#: Src/wptClipDecryptDlg.cpp:219 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
-#: Src/wptClipEditDlg.cpp:59 Src/wptClipEditDlg.cpp:112
-#: Src/wptClipEditDlg.cpp:120 Src/wptClipEditDlg.cpp:159
-#: Src/wptClipEditDlg.cpp:168 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:232 Src/wptMainProc.cpp:277
-#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:519
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
+#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
+#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
+#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
msgid "Clipboard"
msgstr "Zwischenablage"
-#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
msgid "File Open"
msgstr "Datei öffnen"
-#: Src/wptClipEditDlg.cpp:111
+#: Src/wptClipEditDlg.cpp:128
msgid ""
"The file you want to add is very large.\n"
"Still proceed?"
@@ -574,11 +574,11 @@
"Die Datei, die Sie hinzufügen wollen, ist sehr groß!\n"
"Wirklich fortfahren?"
-#: Src/wptClipEditDlg.cpp:150
+#: Src/wptClipEditDlg.cpp:167
msgid "File Save"
msgstr "Datei speichern"
-#: Src/wptClipEditDlg.cpp:160 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -587,34 +587,33 @@
"\"%s\" existiert bereits.\n"
"Vorhandene Datei überschreiben?"
-#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:174 Src/wptMainProc.cpp:240
-#: Src/wptMainProc.cpp:576
+#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
msgid "Clipboard Editor"
msgstr "Zwischenablagen-Editor"
-#: Src/wptClipEditDlg.cpp:196
+#: Src/wptClipEditDlg.cpp:218
msgid "&Copy"
msgstr "&Kopieren"
-#: Src/wptClipEditDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:219
msgid "Clea&r"
msgstr "&Löschen"
-#: Src/wptClipEditDlg.cpp:198 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
#: Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "&Laden"
-#: Src/wptClipEditDlg.cpp:199 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
msgid "&Save"
msgstr "&Speichern"
-#: Src/wptClipEditDlg.cpp:200
+#: Src/wptClipEditDlg.cpp:222
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:201 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -632,7 +631,7 @@
#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:154
#: Src/wptClipEncryptDlg.cpp:200 Src/wptClipEncryptDlg.cpp:207
#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:146
-#: Src/wptMainProc.cpp:214
+#: Src/wptMainProc.cpp:209
msgid "Encryption"
msgstr "Verschlüsseln"
@@ -648,10 +647,10 @@
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
#: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:544 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:334 Src/wptPassphraseCB.cpp:93
-#: Src/wptPassphraseDlg.cpp:102 Src/wptPINDlg.cpp:54
+#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
msgstr "&Abbrechen"
@@ -682,7 +681,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1086
#: Src/wptFileManager.cpp:1102 Src/wptFileManager.cpp:1392
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:220
+#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
msgid "Signing"
msgstr "Signieren"
@@ -701,7 +700,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:226
+#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:221
msgid "Sign & Encrypt"
msgstr "Signieren & Verschlüsseln"
@@ -767,31 +766,30 @@
#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1011
-#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1036
-#: Src/wptKeyEditDlgs.cpp:1047 Src/wptKeyEditDlgs.cpp:1298
-#: Src/wptKeyEditDlgs.cpp:1303 Src/wptKeyEditDlgs.cpp:1307
-#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1364
-#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1383
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1427
-#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1440
-#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1347
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1415
+#: Src/wptKeyEditDlgs.cpp:1420 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1438
+#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1510
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1556
-#: Src/wptKeyEditDlgs.cpp:1571 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1603 Src/wptKeyEditDlgs.cpp:1712
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1785
-#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1800
-#: Src/wptKeyEditDlgs.cpp:1905 Src/wptKeyEditDlgs.cpp:1907
-#: Src/wptKeyEditDlgs.cpp:1923 Src/wptKeyEditDlgs.cpp:1925
-#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1968
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1998
-#: Src/wptKeyEditDlgs.cpp:2002 Src/wptKeyEditDlgs.cpp:2069
-#: Src/wptKeyEditDlgs.cpp:2106 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2173
-#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:1025
-#: Src/wptKeyManagerDlg.cpp:1912
+#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1541
+#: Src/wptKeyEditDlgs.cpp:1549 Src/wptKeyEditDlgs.cpp:1564
+#: Src/wptKeyEditDlgs.cpp:1585 Src/wptKeyEditDlgs.cpp:1596
+#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyEditDlgs.cpp:1743
+#: Src/wptKeyEditDlgs.cpp:1778 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1793 Src/wptKeyEditDlgs.cpp:1898
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1977
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeyEditDlgs.cpp:1995
+#: Src/wptKeyEditDlgs.cpp:2062 Src/wptKeyEditDlgs.cpp:2099
+#: Src/wptKeyEditDlgs.cpp:2112 Src/wptKeyEditDlgs.cpp:2126
+#: Src/wptKeyEditDlgs.cpp:2166 Src/wptKeyEditDlgs.cpp:2171
+#: Src/wptKeyManagerDlg.cpp:1028 Src/wptKeyManagerDlg.cpp:1914
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -816,7 +814,7 @@
msgid "Please select a language"
msgstr "Bitte eine Sprache auswählen"
-#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:103 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
msgid "&OK"
msgstr "&OK"
@@ -1008,7 +1006,7 @@
#: Src/wptFileManager.cpp:1524 Src/wptFileManager.cpp:1774
#: Src/wptFileManager.cpp:1836 Src/wptFileManagerDlg.cpp:536
#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:408 Src/wptMDSumDlg.cpp:184
+#: Src/wptMainProc.cpp:399 Src/wptMDSumDlg.cpp:184
msgid "File Manager"
msgstr "Dateimanager"
@@ -1039,12 +1037,12 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1081
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1074
#: Src/wptVerifyList.cpp:162
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1171
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1164
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:112
#: Src/wptVerifyList.cpp:161
msgid "Name"
@@ -1086,13 +1084,13 @@
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
#: Src/wptFileManager.cpp:1116 Src/wptFileManager.cpp:1428
-#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:202
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
+#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:197
+#: Src/wptMainProc.cpp:409 Src/wptMainProc.cpp:416
msgid "Sign"
msgstr "Signieren"
#: Src/wptFileManager.cpp:1129 Src/wptFileManagerDlg.cpp:586
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:408 Src/wptMainProc.cpp:413
msgid "Encrypt"
msgstr "Verschlüsseln"
@@ -1101,7 +1099,7 @@
msgstr "Symmetrisch verschlüsseln"
#: Src/wptFileManager.cpp:1189 Src/wptFileManager.cpp:1194
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:407
msgid "Symmetric"
msgstr "Symmetrisch"
@@ -1198,13 +1196,13 @@
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1848
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1850
+#: Src/wptKeyManagerDlg.cpp:1882
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1061
-#: Src/wptKeyEditDlgs.cpp:1329 Src/wptKeyEditDlgs.cpp:1401
+#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1394
#: Src/wptKeyserverDlg.cpp:104
msgid "GnuPG status"
msgstr "GnuPG Status"
@@ -1264,7 +1262,7 @@
msgstr "&Schlüssel zum Signieren"
#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:299
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Options"
msgstr "Optionen"
@@ -1288,7 +1286,7 @@
msgstr "%s enthält %d Schlüssel."
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:505
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
@@ -1324,13 +1322,13 @@
msgid "Signature mode"
msgstr "Signaturmodus"
-#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1303
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1347 Src/wptKeyEditDlgs.cpp:1420
#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:784
-#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeyManagerDlg.cpp:1700
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1838 Src/wptKeyManagerDlg.cpp:1857
+#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1663
+#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1718 Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptKeyManagerDlg.cpp:1840 Src/wptKeyManagerDlg.cpp:1859
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1344,16 +1342,16 @@
msgid "%d Object(s) marked"
msgstr "%d Objekt(e) markiert"
-#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:546
+#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:538
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:963
-#: Src/wptKeyManagerDlg.cpp:968 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:964
+#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:967
msgid "View"
msgstr "Ansicht"
@@ -1373,13 +1371,13 @@
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:980
-#: Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1031
msgid "&Sign"
msgstr "&Signieren"
#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:589
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:414
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
@@ -1399,7 +1397,7 @@
msgid "E&xport"
msgstr "E&xportieren"
-#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:415
+#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:406
msgid "Exit"
msgstr "Beenden"
@@ -1578,8 +1576,8 @@
#: Src/wptGPGPrefsDlg.cpp:223 Src/wptGPGPrefsDlg.cpp:229
#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:239
#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:990
-#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:225
+#: Src/wptKeyEditDlgs.cpp:1710 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptMainProc.cpp:426 Src/wptPreferencesDlg.cpp:225
#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
#: Src/wptRegistry.cpp:596
@@ -1718,8 +1716,8 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1810
-#: Src/wptMainProc.cpp:594
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1812
+#: Src/wptMainProc.cpp:586
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
@@ -1816,20 +1814,19 @@
#: Src/wptKeyManager.cpp:835 Src/wptKeyManager.cpp:892
#: Src/wptKeyManager.cpp:897 Src/wptKeyManager.cpp:953
#: Src/wptKeyManager.cpp:983 Src/wptKeyManager.cpp:1070
-#: Src/wptKeyManagerDlg.cpp:1311 Src/wptKeyManagerDlg.cpp:1322
-#: Src/wptKeyManagerDlg.cpp:1332 Src/wptKeyManagerDlg.cpp:1635
-#: Src/wptKeyManagerDlg.cpp:1657 Src/wptKeyManagerDlg.cpp:1672
-#: Src/wptKeyManagerDlg.cpp:1682 Src/wptKeyManagerDlg.cpp:1690
-#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1706
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1780
-#: Src/wptKeyManagerDlg.cpp:1839 Src/wptKeyManagerDlg.cpp:1857
-#: Src/wptKeyManagerDlg.cpp:1862 Src/wptKeyManagerDlg.cpp:1867
-#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptKeyManagerDlg.cpp:2056 Src/wptKeysigDlg.cpp:94
-#: Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309 Src/wptKeysigDlg.cpp:381
-#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:557 Src/wptMainProc.cpp:565
+#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
+#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1641
+#: Src/wptKeyManagerDlg.cpp:1664 Src/wptKeyManagerDlg.cpp:1679
+#: Src/wptKeyManagerDlg.cpp:1689 Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1707 Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptKeyManagerDlg.cpp:1841
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptKeyManagerDlg.cpp:1864
+#: Src/wptKeyManagerDlg.cpp:1869 Src/wptKeyManagerDlg.cpp:1940
+#: Src/wptKeyManagerDlg.cpp:1945 Src/wptKeyManagerDlg.cpp:2058
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
+#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:549 Src/wptMainProc.cpp:557
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1904,18 +1901,18 @@
msgstr "Unbekanntes Tastenkürzel"
#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:256
-#: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeyEditDlgs.cpp:1194
-#: Src/wptKeyEditDlgs.cpp:1439 Src/wptKeyEditDlgs.cpp:1459
-#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1529
-#: Src/wptKeyEditDlgs.cpp:1596 Src/wptKeyEditDlgs.cpp:1762
-#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
+#: Src/wptKeyEditDlgs.cpp:1137 Src/wptKeyEditDlgs.cpp:1187
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1452
+#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1589 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1957 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
#: Src/wptKeysigDlg.cpp:207
msgid "Revoked"
msgstr "Widerrufen"
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeyEditDlgs.cpp:1135 Src/wptKeyEditDlgs.cpp:1354
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
msgid "Expired"
@@ -1929,39 +1926,39 @@
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1202
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1195
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:907 Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:979
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
msgstr "Benutzerkennung"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:908
-#: Src/wptKeyManagerDlg.cpp:999 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1071
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1079
-#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeyEditDlgs.cpp:1166 Src/wptKeylist.cpp:594
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1005
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Erstellung"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:909 Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1004
msgid "Type"
msgstr "Typ"
@@ -1995,12 +1992,12 @@
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1132
#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:385
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1139
msgid "OK"
msgstr "OK"
@@ -2038,7 +2035,7 @@
"Das Bild muss eine JPEG Datei sein."
#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:335
msgid "Passphrase"
msgstr "Passwort"
@@ -2079,9 +2076,9 @@
#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:468
#: Src/wptKeyEditDlgs.cpp:550 Src/wptKeyEditDlgs.cpp:721
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1531
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1816
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1809
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
#: Src/wptKeyPropsDlg.cpp:379 Src/wptOwnertrustDlg.cpp:119
#: Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
@@ -2103,10 +2100,10 @@
msgid "Add Revoker"
msgstr "Wiederrufer hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1790
-#: Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1585
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1953
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
@@ -2189,9 +2186,9 @@
#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:817
#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
-#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyManagerDlg.cpp:1689
+#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyManagerDlg.cpp:1696
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
@@ -2224,11 +2221,11 @@
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1028
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1036
msgid ""
"Are you sure that you really don't want a passphrase?\n"
"This is propably a bad idea, still proceed?"
@@ -2236,40 +2233,32 @@
"Sind Sie sicher das Sie wirklich keine Passphrase wollen?\n"
"Das ist generell keine gute Idee, trotzdem fortfahren?"
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptPassphraseDlg.cpp:248
-msgid ""
-"The passphrase contains 8-bit characters.\n"
-"It is not suggested to use charset specific characters."
-msgstr ""
-"Das Passwort enthält 8-bit Zeichen.\n"
-"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-
-#: Src/wptKeyEditDlgs.cpp:1059
+#: Src/wptKeyEditDlgs.cpp:1052
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyEditDlgs.cpp:1070 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1080
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:912
+#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1172
+#: Src/wptKeyEditDlgs.cpp:1165
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1260
+#: Src/wptKeyEditDlgs.cpp:1253
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2313,15 +2302,15 @@
"CLEAN \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
"MINIMIZE \t\tEntferne alle Signaturen vom Schlüssel\r\n"
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1275
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1298 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1300
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1315
+#: Src/wptKeyEditDlgs.cpp:1308
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2338,15 +2327,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1325
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1329
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1355
msgid ""
"Key already expired.\n"
"\n"
@@ -2356,19 +2345,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1374
+#: Src/wptKeyEditDlgs.cpp:1364 Src/wptKeyEditDlgs.cpp:1367
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1388
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1400
+#: Src/wptKeyEditDlgs.cpp:1393
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1424
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2380,31 +2369,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1433
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1457
+#: Src/wptKeyEditDlgs.cpp:1450
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1461
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1476
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1492
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1505
+#: Src/wptKeyEditDlgs.cpp:1498
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2414,47 +2403,47 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1571
+#: Src/wptKeyEditDlgs.cpp:1564
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1615
+#: Src/wptKeyEditDlgs.cpp:1608
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1618
+#: Src/wptKeyEditDlgs.cpp:1611
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1712
+#: Src/wptKeyEditDlgs.cpp:1705
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1716
+#: Src/wptKeyEditDlgs.cpp:1709
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1718
+#: Src/wptKeyEditDlgs.cpp:1711
msgid "user ID:"
msgstr "Benutzerkennung:"
-#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1712 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1784
+#: Src/wptKeyEditDlgs.cpp:1777
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1795
+#: Src/wptKeyEditDlgs.cpp:1788
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2469,27 +2458,27 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1812
+#: Src/wptKeyEditDlgs.cpp:1805
msgid "Delete User ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1816
+#: Src/wptKeyEditDlgs.cpp:1809
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1907 Src/wptKeyEditDlgs.cpp:1925
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1918
msgid "Finished to compact key."
msgstr "Schlüssel erfolgreich bearbeitet."
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1960
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeysignDlg.cpp:439
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:2061
+#: Src/wptKeyEditDlgs.cpp:2054
#, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
@@ -2507,28 +2496,28 @@
"erstellen wollen welches es erlaubt den gelisteten Schlüssel\n"
"zu widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:2105
+#: Src/wptKeyEditDlgs.cpp:2098
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2118
+#: Src/wptKeyEditDlgs.cpp:2111
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:2127
+#: Src/wptKeyEditDlgs.cpp:2120
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2130
+#: Src/wptKeyEditDlgs.cpp:2123
msgid "&Revoke..."
msgstr "&Widerrufen..."
-#: Src/wptKeyEditDlgs.cpp:2173
+#: Src/wptKeyEditDlgs.cpp:2166
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2177
+#: Src/wptKeyEditDlgs.cpp:2170
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"
@@ -2567,8 +2556,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:1904 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:1906 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2590,8 +2579,9 @@
#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:410 Src/wptKeygenDlg.cpp:415
#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:432
#: Src/wptKeygenDlg.cpp:440 Src/wptKeygenDlg.cpp:454 Src/wptKeygenDlg.cpp:461
-#: Src/wptKeygenDlg.cpp:470 Src/wptKeygenDlg.cpp:491 Src/wptKeygenDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1771 Src/wptPassphraseDlg.cpp:145
+#: Src/wptKeygenDlg.cpp:471 Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1773 Src/wptPassphraseDlg.cpp:147
+#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
@@ -2682,15 +2672,15 @@
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:560
+#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:561
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:566
msgid "Please do not enter the email address in the name field."
msgstr "Bitte geben Sie nicht die E-Mail-Adresse im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:572
+#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
@@ -2698,34 +2688,34 @@
msgid "Please do NOT enter the email address in the comment field."
msgstr "Bitte geben Sie die E-Mail-Adresse NICHT im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:469 Src/wptKeyRevokeDlg.cpp:176
+#: Src/wptKeygenDlg.cpp:470 Src/wptKeyRevokeDlg.cpp:176
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:538
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:539
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:540
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:541
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:542
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -2736,9 +2726,9 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:543
msgid ""
-"By accosiating an email address with your key pair, you will enable WinPT to "
+"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
"key when communicating with you."
msgstr ""
@@ -2747,17 +2737,17 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: Src/wptKeygenDlg.cpp:543 Src/wptKeygenDlg.cpp:561 Src/wptKeygenDlg.cpp:566
-#: Src/wptKeygenDlg.cpp:573 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:599
-#: Src/wptKeyManagerDlg.cpp:1794
+#: Src/wptKeygenDlg.cpp:544 Src/wptKeygenDlg.cpp:562 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:580 Src/wptKeygenDlg.cpp:601
+#: Src/wptKeyManagerDlg.cpp:1796
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:546
msgid "E&xpert"
msgstr "E&xperte"
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:579
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2842,12 +2832,12 @@
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:911
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "Vertrauen"
@@ -3065,217 +3055,217 @@
msgid "3. Key is no longer used"
msgstr "3. Der Schlüssel wird nicht mehr benutzt"
-#: Src/wptKeyManagerDlg.cpp:483 Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:486 Src/wptKeyManagerDlg.cpp:1023
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
-#: Src/wptKeyManagerDlg.cpp:504
+#: Src/wptKeyManagerDlg.cpp:507
#, c-format
msgid "Default Key: %s"
msgstr "Standardschlüssel: %s"
-#: Src/wptKeyManagerDlg.cpp:506
+#: Src/wptKeyManagerDlg.cpp:509
#, c-format
msgid "Default Key: 0x%s"
msgstr "Standardschlüssel: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:527
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d secret keys"
msgstr "%d geheime Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:528
+#: Src/wptKeyManagerDlg.cpp:531
#, c-format
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:968
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:966 Src/wptKeyManagerDlg.cpp:1348
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:974
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:980
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:981 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:983 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:989
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:995
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:997
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:999 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:1015
+#: Src/wptKeyManagerDlg.cpp:1018
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:1016
+#: Src/wptKeyManagerDlg.cpp:1019
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:1017
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1033
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Revoker..."
msgstr "Widerrufer..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1043
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1320
+#: Src/wptKeyManagerDlg.cpp:1323
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3283,98 +3273,94 @@
"Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
"Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
-#: Src/wptKeyManagerDlg.cpp:1331
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Could not set keylist window procedure."
msgstr "Konnte \"keylist window procedure\" nicht setzen."
-#: Src/wptKeyManagerDlg.cpp:1349
+#: Src/wptKeyManagerDlg.cpp:1352
msgid "&Show"
msgstr "&Anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1353
msgid "&New..."
msgstr "&Neu..."
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1464
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1465
+#: Src/wptKeyManagerDlg.cpp:1468
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1469
+#: Src/wptKeyManagerDlg.cpp:1472
msgid "Delete key from keyring"
msgstr "Schlüssel aus Keyring löschen"
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1476
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1480
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1484
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1488
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1492
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1496
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1622
+#: Src/wptKeyManagerDlg.cpp:1628
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1634
+#: Src/wptKeyManagerDlg.cpp:1640
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1665 Src/wptKeysignDlg.cpp:323
-#: Src/wptKeysignDlg.cpp:337 Src/wptKeysignDlg.cpp:399
-#: Src/wptKeysignDlg.cpp:415 Src/wptKeysignDlg.cpp:432
-#: Src/wptKeysignDlg.cpp:437 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
+#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
+#: Src/wptKeysignDlg.cpp:439
msgid "Key Signing"
msgstr "Schlüsselsignierung"
-#: Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1688
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1695 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1702 Src/wptKeyRevokeDlg.cpp:70
#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:164
#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:177
-#: Src/wptKeyRevokeDlg.cpp:186 Src/wptKeyRevokeDlg.cpp:192
+#: Src/wptKeyRevokeDlg.cpp:187 Src/wptKeyRevokeDlg.cpp:193
msgid "Key Revocation Cert"
msgstr "Schlüsselwiderruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:1705
-msgid "It does not make any sense with a key pair!"
-msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
-
-#: Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1724
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1739 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1741 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1749
+#: Src/wptKeyManagerDlg.cpp:1751
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3383,27 +3369,27 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1779
+#: Src/wptKeyManagerDlg.cpp:1781
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1802 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
-#: Src/wptKeyManagerDlg.cpp:1819
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
-#: Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManagerDlg.cpp:1863
msgid "There is no corresponding secret key for this key."
msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel vorhanden."
-#: Src/wptKeyManagerDlg.cpp:1866
+#: Src/wptKeyManagerDlg.cpp:1868
msgid "You can only export one secret key."
msgstr "Sie können nur einen geheimen Schlüssel exportieren."
-#: Src/wptKeyManagerDlg.cpp:1871
+#: Src/wptKeyManagerDlg.cpp:1873
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3421,15 +3407,15 @@
"\n"
"Wirklich den Schlüssel exportieren?"
-#: Src/wptKeyManagerDlg.cpp:1876
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1937
+#: Src/wptKeyManagerDlg.cpp:1939
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
-#: Src/wptKeyManagerDlg.cpp:1942
+#: Src/wptKeyManagerDlg.cpp:1944
msgid "Keyserver refresh finished."
msgstr "Erneuerung von Keyserver abgeschlossen."
@@ -3556,7 +3542,7 @@
msgid "Please select a reason."
msgstr "Bitte geben Sie einen Grund an."
-#: Src/wptKeyRevokeDlg.cpp:191
+#: Src/wptKeyRevokeDlg.cpp:192
msgid "Revocation certificate generated."
msgstr "Widerrufzertifikat wurde erstellt."
@@ -3578,39 +3564,39 @@
msgid "Do you want to retrieve %s via the default keyserver?"
msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
-#: Src/wptKeyserver.cpp:402
+#: Src/wptKeyserver.cpp:435
msgid "Network unreachable"
msgstr "Netzwerk unerreichbar"
-#: Src/wptKeyserver.cpp:405
+#: Src/wptKeyserver.cpp:438
msgid "Host unreachable"
msgstr "Rechner unerreichbar"
-#: Src/wptKeyserver.cpp:408
+#: Src/wptKeyserver.cpp:441
msgid "Could not resolve host name"
msgstr "Konnte Rechnernamen nicht auflösen"
-#: Src/wptKeyserver.cpp:411
+#: Src/wptKeyserver.cpp:444
msgid "Connection refused"
msgstr "Verbindung abgelehnt"
-#: Src/wptKeyserver.cpp:415
+#: Src/wptKeyserver.cpp:448
msgid "Connection timeout"
msgstr "Verbindung Time-Out"
-#: Src/wptKeyserver.cpp:419
+#: Src/wptKeyserver.cpp:452
msgid "Connection resetted by peer"
msgstr "Verbindung wurde zurückgesetzt"
-#: Src/wptKeyserver.cpp:422
+#: Src/wptKeyserver.cpp:455
msgid "Socket has been shutdown"
msgstr "Socket wurde runtergefahren"
-#: Src/wptKeyserver.cpp:600
+#: Src/wptKeyserver.cpp:633
msgid "Could not save keyserver.conf file"
msgstr "Konnte keyserver.conf Datei nicht speichern"
-#: Src/wptKeyserver.cpp:645
+#: Src/wptKeyserver.cpp:678
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -3618,11 +3604,11 @@
"Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
"Passwort setzen, um Proxy-Authentifizierung nutzen zu können!"
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:681
msgid "Proxy Error"
msgstr "Proxyfehler"
-#: Src/wptKeyserver.cpp:673
+#: Src/wptKeyserver.cpp:706
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3630,16 +3616,16 @@
"Alle Eintraäge in dieser Datei müssen über einen gültigen Präfix verfügen.\n"
"Aktuell werden HKP/HTTP, LDAP and FINGER unterstützt.\n"
-#: Src/wptKeyserver.cpp:675
+#: Src/wptKeyserver.cpp:708
msgid "Keyserver Error"
msgstr "Schlüsselserver-Fehler"
# c:\oss\winpt-gpgme\src\wptKeyserver.cpp:548
-#: Src/wptKeyserver.cpp:694
+#: Src/wptKeyserver.cpp:727
msgid "The keyserver limit is exceeded"
msgstr "Das Limit der Keyserver wurde erreicht"
-#: Src/wptKeyserver.cpp:695
+#: Src/wptKeyserver.cpp:728
msgid "Keyserver Warning"
msgstr "Keyserver Warnung"
@@ -3933,22 +3919,22 @@
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
-#: Src/wptKeysignDlg.cpp:77
+#: Src/wptKeysignDlg.cpp:78
#, c-format
msgid "%d-bit %s key, ID 0x%s"
msgstr "%d-bit %s Schlüssel, ID 0x%s"
-#: Src/wptKeysignDlg.cpp:179
+#: Src/wptKeysignDlg.cpp:180
#, c-format
msgid "Photo of %s"
msgstr "Foto von %s"
-#: Src/wptKeysignDlg.cpp:219 Src/wptKeysignDlg.cpp:382
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
msgid "Choose Signature Class"
msgstr "Signaturklasse auswählen"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:221
+#: Src/wptKeysignDlg.cpp:224
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -3957,30 +3943,30 @@
"gehört? Wenn Sie nicht antworten wollen, bitte \"0\" benutzen."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:223
+#: Src/wptKeysignDlg.cpp:226
msgid "(0) I will not answer (default)"
msgstr "(0) Ich möchte nicht darauf antworten"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:158
-#: Src/wptKeysignDlg.cpp:225
+#: Src/wptKeysignDlg.cpp:228
msgid "(1) I have not checked at all."
msgstr "(1) Ich habe keine Überprüfung gemacht."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:159
-#: Src/wptKeysignDlg.cpp:227
+#: Src/wptKeysignDlg.cpp:230
msgid "(2) I have done causal checking."
msgstr "(2) Ich habe einige Überprüfungen gemacht."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:160
-#: Src/wptKeysignDlg.cpp:229
+#: Src/wptKeysignDlg.cpp:232
msgid "(3) I have done very careful checkings."
msgstr "(3) Ich habe gründliche Überprüfungen gemacht."
-#: Src/wptKeysignDlg.cpp:268
+#: Src/wptKeysignDlg.cpp:271
msgid "never"
msgstr "niemals"
-#: Src/wptKeysignDlg.cpp:311
+#: Src/wptKeysignDlg.cpp:313
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -4001,47 +3987,43 @@
"\n"
"Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
-#: Src/wptKeysignDlg.cpp:323
+#: Src/wptKeysignDlg.cpp:325
msgid "No valid secret key found."
msgstr "Keine gültigen geheimen Schlüssel gefunden."
-#: Src/wptKeysignDlg.cpp:329
+#: Src/wptKeysignDlg.cpp:331
msgid "Sign local only (non exportable signature)"
msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
-#: Src/wptKeysignDlg.cpp:330
+#: Src/wptKeysignDlg.cpp:332
msgid "Signature expires on"
msgstr "Signatur läuft ab am"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:333
msgid "Sign non-revocably"
msgstr "Nicht-widerrufbar signieren"
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:334
msgid "&Ask for certification level"
msgstr "Zertifizierungslevel erfragen"
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:337
msgid "&Show photo"
msgstr "&Photo anzeigen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:101
+#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "&Maskiere Eingabe"
-#: Src/wptKeysignDlg.cpp:398
+#: Src/wptKeysignDlg.cpp:399
msgid "You cannot select today as the expiration date."
msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
-#: Src/wptKeysignDlg.cpp:415
-msgid "Could not get Key ID from key."
-msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
-
-#: Src/wptKeysignDlg.cpp:436
+#: Src/wptKeysignDlg.cpp:433
msgid "This key is already signed by your key"
msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
@@ -4062,54 +4044,54 @@
msgid "Do you want to delete the contents from the clipboard?"
msgstr "Wollen Sie den Inhalt der Zwischenablage löschen?"
-#: Src/wptMainProc.cpp:202
+#: Src/wptMainProc.cpp:197
msgid "Could not access secret keyring."
msgstr "Auf denn geheimen Schlüsselbund konnte nicht zugegriffen werden."
-#: Src/wptMainProc.cpp:256 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:245 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Texteingabe"
-#: Src/wptMainProc.cpp:277
+#: Src/wptMainProc.cpp:266
msgid "Unknown OpenPGP type."
msgstr "Unbekannter OpenPGP-Typ."
-#: Src/wptMainProc.cpp:354
+#: Src/wptMainProc.cpp:344
msgid "Could not set current window mode hooks."
msgstr "Konnte \"Current Window\" Hooks nicht setzen."
-#: Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:404
msgid "Edit Clipboard"
msgstr "Zwischenablage bearbeiten"
-#: Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:405
msgid "About..."
msgstr "Über..."
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:411 Src/wptMainProc.cpp:415
msgid "Decrypt/Verify"
msgstr "Entschlüsseln/Überprüfen"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:425
msgid "Current Window"
msgstr "Aktuelles Fenster"
-#: Src/wptMainProc.cpp:490
+#: Src/wptMainProc.cpp:482
msgid "Remove all passphrases from cache?"
msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
-#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:483 Src/wptProgressDlg.cpp:131 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:493
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
"WinPT beenden?"
-#: Src/wptMainProc.cpp:534
+#: Src/wptMainProc.cpp:526
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4118,7 +4100,7 @@
"Stellen Sie sicher, dass das Fenster Text enthält.\n"
"%s."
-#: Src/wptMainProc.cpp:588 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:580 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "WinPT Einstellungen"
@@ -4211,7 +4193,7 @@
"Symmetrisch verschlüsselt.\n"
"%s verschlüsselte Daten."
-#: Src/wptPassphraseCB.cpp:303
+#: Src/wptPassphraseCB.cpp:306
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4222,7 +4204,7 @@
"Benutzer: \"%s\"\n"
"%s Schlüssel, ID %s (Hauptschlüssel ID %s)\n"
-#: Src/wptPassphraseCB.cpp:309
+#: Src/wptPassphraseCB.cpp:312
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4233,7 +4215,7 @@
"Benutzer: \"%s\"\n"
"%s key, ID %s\n"
-#: Src/wptPassphraseCB.cpp:397
+#: Src/wptPassphraseCB.cpp:400
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -4243,23 +4225,23 @@
"Schlüssel\n"
"Karte: %s"
-#: Src/wptPassphraseDlg.cpp:89 Src/wptPassphraseDlg.cpp:135
+#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
msgid "Passphrase Dialog"
msgstr "Passwort Dialog"
-#: Src/wptPassphraseDlg.cpp:94
+#: Src/wptPassphraseDlg.cpp:96
msgid "Repeat Passphrase"
msgstr "Passwort erneut eingeben"
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:98
msgid "Enter Passphrase"
msgstr "Passwort eingeben"
-#: Src/wptPassphraseDlg.cpp:134
+#: Src/wptPassphraseDlg.cpp:136
msgid "Please enter a passphrase."
msgstr "Bitte ein Passwort eingeben."
-#: Src/wptPassphraseDlg.cpp:142
+#: Src/wptPassphraseDlg.cpp:144
msgid ""
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
@@ -4271,6 +4253,16 @@
"\n"
"Möchten Sie trotzdem fortfahren?"
+#: Src/wptPassphraseDlg.cpp:154
+msgid ""
+"The passphrase contains 8-bit characters.\n"
+"It is not suggested to use charset specific characters.\n"
+"Still proceed?"
+msgstr ""
+"Das Passwort enthält 8-bit Zeichen.\n"
+"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
+"Trotzdem fortfahren?"
+
#: Src/wptPINDlg.cpp:74
msgid "Please enter a PIN."
msgstr "Bitte geben Sie eine PIN ein."
@@ -4401,7 +4393,7 @@
msgid "Hotkeys"
msgstr "Tastenkürzel"
-#: Src/wptProgressDlg.cpp:122
+#: Src/wptProgressDlg.cpp:131
msgid "Could not create progress thread."
msgstr "Konnte Fortschrittsthread nicht erstellen."
@@ -4551,6 +4543,12 @@
msgid "Signed"
msgstr "Signiert"
+#~ msgid "It does not make any sense with a key pair!"
+#~ msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
+
+#~ msgid "Could not get Key ID from key."
+#~ msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
+
#~ msgid "No subkey(s) found."
#~ msgstr "Kein(e) Unterschlüssel gefunden."
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Po/jp.po 2006-06-19 14:04:31 UTC (rev 229)
@@ -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-06-15 09:09+0200\n"
+"POT-Creation-Date: 2006-06-18 18:43+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"
@@ -35,7 +35,7 @@
#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:355 Src/wptMainProc.cpp:533
+#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:525
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
@@ -86,7 +86,7 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyserver.cpp:601
+#: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
@@ -218,8 +218,8 @@
# c:\oss\winpt\src\wptAboutDlgs.cpp:78
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
# c:\oss\winpt\src\wptMainProc.cpp:560
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1888
-#: Src/wptMainProc.cpp:582
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1890
+#: Src/wptMainProc.cpp:574
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -274,14 +274,14 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2129
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2122
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
# c:\oss\winpt\src\WinPT.cpp:340 c:\oss\winpt\src\wptCardDlg.cpp:98
# c:\oss\winpt\src\wptCardDlg.cpp:125 c:\oss\winpt\src\wptMainProc.cpp:389
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:410
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:401
msgid "Card Manager"
msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
@@ -318,7 +318,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:295
+#: Src/wptMainProc.cpp:284
msgid "Card Edit"
msgstr "ƒJ[ƒh•ÒW"
@@ -428,7 +428,7 @@
msgstr "ˆÃ†‰»ƒL[‚̃J[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1784
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1786
msgid "Card Key Generation"
msgstr "ƒJ[ƒhƒL[ì¬"
@@ -464,7 +464,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:1378 Src/wptKeygenDlg.cpp:453
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1371 Src/wptKeygenDlg.cpp:453
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -508,7 +508,7 @@
msgstr "ƒJ[ƒh‚̈ÃؔԆ‚ð•ÏX‚·‚é"
# c:\oss\winpt\src\wptPassphraseDlg.cpp:146
-#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:241
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:256
msgid "Passphrases do not match. Please try again."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ªƒ}ƒbƒ`‚µ‚Ü‚¹‚ñB‚à‚¤ˆê“xƒgƒ‰ƒC‚µ‚Ä‚‚¾‚³‚¢B"
@@ -550,39 +550,43 @@
"Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:130
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
msgid "user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:117
-msgid "Signature Status: Created with a fully trusted key"
+#: Src/wptClipDecryptDlg.cpp:104
+#, fuzzy
+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:119
-msgid "Signature Status: Created with a marginal trusted key"
+#: Src/wptClipDecryptDlg.cpp:106
+#, fuzzy
+msgid "Signature status: created with a marginal trusted key"
msgstr "–¼‚Ìó‘ÔF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:122
-msgid "Signature Status: Created with an UNTRUSTED key"
+#: Src/wptClipDecryptDlg.cpp:109
+#, fuzzy
+msgid "Signature status: created with an UNTRUSTED key"
msgstr "–¼‚Ìó‘ÔFM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:125
-msgid "Signature Status: Created with an undefined trusted key"
+#: Src/wptClipDecryptDlg.cpp:112
+#, fuzzy
+msgid "Signature status: created with an undefined trusted key"
msgstr "–¼‚Ìó‘ÔF’è‹`‚³‚ê‚Ä‚¢‚È‚¢Š®‘S‚ÉM—p‚Å‚«‚éƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptClipDecryptDlg.cpp:133
+#: Src/wptClipDecryptDlg.cpp:172
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:134
+#: Src/wptClipDecryptDlg.cpp:173
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -611,14 +615,14 @@
# c:\oss\winpt\src\wptMainProc.cpp:191 c:\oss\winpt\src\wptMainProc.cpp:259
# c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
# c:\oss\winpt\src\wptMainProc.cpp:406
-#: Src/wptClipDecryptDlg.cpp:169 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
#: Src/wptFileManager.cpp:1622 Src/wptFileManagerDlg.cpp:590
#: Src/wptFileVerifyDlg.cpp:82 Src/wptFileVerifyDlg.cpp:149
-#: Src/wptMainProc.cpp:184 Src/wptMainProc.cpp:250 Src/wptMainProc.cpp:264
-#: Src/wptMainProc.cpp:272 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
+#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:412
msgid "Verify"
msgstr "Šm”F‚·‚é"
@@ -628,16 +632,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:176 Src/wptClipDecryptDlg.cpp:189
-#: Src/wptClipDecryptDlg.cpp:197 Src/wptClipDecryptDlg.cpp:204
-#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
+#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
#: Src/wptFileManager.cpp:1327
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -646,17 +650,17 @@
" %s‚ňƉ»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
"•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:236
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
-#: Src/wptClipDecryptDlg.cpp:203
+#: Src/wptClipDecryptDlg.cpp:242
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:211
+#: Src/wptClipDecryptDlg.cpp:250
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -671,7 +675,7 @@
"‚Ü‚½‚Í‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:216
+#: Src/wptClipDecryptDlg.cpp:255
msgid "*** IMPORTANT ***"
msgstr "*** d—v ***"
@@ -683,7 +687,7 @@
# 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:219 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
@@ -700,23 +704,23 @@
# c:\oss\winpt\src\wptMainProc.cpp:171 c:\oss\winpt\src\wptMainProc.cpp:241
# c:\oss\winpt\src\wptMainProc.cpp:284 c:\oss\winpt\src\wptMainProc.cpp:489
# c:\oss\winpt\src\wptMainProc.cpp:493
-#: Src/wptClipEditDlg.cpp:59 Src/wptClipEditDlg.cpp:112
-#: Src/wptClipEditDlg.cpp:120 Src/wptClipEditDlg.cpp:159
-#: Src/wptClipEditDlg.cpp:168 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:232 Src/wptMainProc.cpp:277
-#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:519
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
+#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
+#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
+#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
msgid "Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
# c:\oss\winpt\src\wptClipEditDlg.cpp:114
# c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
msgid "File Open"
msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
# c:\oss\winpt\src\wptClipEditDlg.cpp:122
-#: Src/wptClipEditDlg.cpp:111
+#: Src/wptClipEditDlg.cpp:128
msgid ""
"The file you want to add is very large.\n"
"Still proceed?"
@@ -725,12 +729,12 @@
"‚»‚ê‚Å‚à‘±‚¯‚Ü‚·‚©H"
# c:\oss\winpt\src\wptClipEditDlg.cpp:149
-#: Src/wptClipEditDlg.cpp:150
+#: Src/wptClipEditDlg.cpp:167
msgid "File Save"
msgstr "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚é"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
-#: Src/wptClipEditDlg.cpp:160 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -741,30 +745,29 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:45 c:\oss\winpt\src\wptMainProc.cpp:181
# c:\oss\winpt\src\wptMainProc.cpp:249 c:\oss\winpt\src\wptMainProc.cpp:554
-#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:174 Src/wptMainProc.cpp:240
-#: Src/wptMainProc.cpp:576
+#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
msgid "Clipboard Editor"
msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
# c:\oss\winpt\src\wptClipEditDlg.cpp:46
-#: Src/wptClipEditDlg.cpp:196
+#: Src/wptClipEditDlg.cpp:218
msgid "&Copy"
msgstr "ƒRƒs[(&C)"
# c:\oss\winpt\src\wptClipEditDlg.cpp:47
-#: Src/wptClipEditDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:219
msgid "Clea&r"
msgstr "‰Šú‰»(&R)"
# c:\oss\winpt\src\wptClipEditDlg.cpp:48 c:\oss\winpt\src\wptGPGOptDlg.cpp:49
# c:\oss\winpt\src\wptTextInputDlg.cpp:83
-#: Src/wptClipEditDlg.cpp:198 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
#: Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "ƒ[ƒh(&L)"
# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptClipEditDlg.cpp:199 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
msgid "&Save"
msgstr "•Û‘¶(&S)"
@@ -774,11 +777,11 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptClipEditDlg.cpp:200
+#: Src/wptClipEditDlg.cpp:222
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:201 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -803,7 +806,7 @@
#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:154
#: Src/wptClipEncryptDlg.cpp:200 Src/wptClipEncryptDlg.cpp:207
#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:146
-#: Src/wptMainProc.cpp:214
+#: Src/wptMainProc.cpp:209
msgid "Encryption"
msgstr "ˆÃ†‰»"
@@ -822,10 +825,10 @@
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
#: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:544 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:334 Src/wptPassphraseCB.cpp:93
-#: Src/wptPassphraseDlg.cpp:102 Src/wptPINDlg.cpp:54
+#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)"
@@ -876,7 +879,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1086
#: Src/wptFileManager.cpp:1102 Src/wptFileManager.cpp:1392
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:220
+#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
msgid "Signing"
msgstr "–¼"
@@ -902,7 +905,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:159 c:\oss\winpt\src\wptMainProc.cpp:235
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:226
+#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:221
msgid "Sign & Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1026,31 +1029,30 @@
#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1011
-#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1036
-#: Src/wptKeyEditDlgs.cpp:1047 Src/wptKeyEditDlgs.cpp:1298
-#: Src/wptKeyEditDlgs.cpp:1303 Src/wptKeyEditDlgs.cpp:1307
-#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1364
-#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1383
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1427
-#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1440
-#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1347
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1415
+#: Src/wptKeyEditDlgs.cpp:1420 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1438
+#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1510
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1556
-#: Src/wptKeyEditDlgs.cpp:1571 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1603 Src/wptKeyEditDlgs.cpp:1712
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1785
-#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1800
-#: Src/wptKeyEditDlgs.cpp:1905 Src/wptKeyEditDlgs.cpp:1907
-#: Src/wptKeyEditDlgs.cpp:1923 Src/wptKeyEditDlgs.cpp:1925
-#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1968
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1998
-#: Src/wptKeyEditDlgs.cpp:2002 Src/wptKeyEditDlgs.cpp:2069
-#: Src/wptKeyEditDlgs.cpp:2106 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2173
-#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:1025
-#: Src/wptKeyManagerDlg.cpp:1912
+#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1541
+#: Src/wptKeyEditDlgs.cpp:1549 Src/wptKeyEditDlgs.cpp:1564
+#: Src/wptKeyEditDlgs.cpp:1585 Src/wptKeyEditDlgs.cpp:1596
+#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyEditDlgs.cpp:1743
+#: Src/wptKeyEditDlgs.cpp:1778 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1793 Src/wptKeyEditDlgs.cpp:1898
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1977
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeyEditDlgs.cpp:1995
+#: Src/wptKeyEditDlgs.cpp:2062 Src/wptKeyEditDlgs.cpp:2099
+#: Src/wptKeyEditDlgs.cpp:2112 Src/wptKeyEditDlgs.cpp:2126
+#: Src/wptKeyEditDlgs.cpp:2166 Src/wptKeyEditDlgs.cpp:2171
+#: Src/wptKeyManagerDlg.cpp:1028 Src/wptKeyManagerDlg.cpp:1914
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1080,7 +1082,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:103 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
msgid "&OK"
msgstr "&OK"
@@ -1325,7 +1327,7 @@
#: Src/wptFileManager.cpp:1524 Src/wptFileManager.cpp:1774
#: Src/wptFileManager.cpp:1836 Src/wptFileManagerDlg.cpp:536
#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:408 Src/wptMDSumDlg.cpp:184
+#: Src/wptMainProc.cpp:399 Src/wptMDSumDlg.cpp:184
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1361,7 +1363,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:384 Src/wptKeyEditDlgs.cpp:1081
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1074
#: Src/wptVerifyList.cpp:162
msgid "Status"
msgstr "ó‹µ"
@@ -1370,7 +1372,7 @@
# 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:385 Src/wptKeyEditDlgs.cpp:1171
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1164
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:112
#: Src/wptVerifyList.cpp:161
msgid "Name"
@@ -1426,8 +1428,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
#: Src/wptFileManager.cpp:1116 Src/wptFileManager.cpp:1428
-#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:202
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
+#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:197
+#: Src/wptMainProc.cpp:409 Src/wptMainProc.cpp:416
msgid "Sign"
msgstr "–¼"
@@ -1435,7 +1437,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:401
# c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
#: Src/wptFileManager.cpp:1129 Src/wptFileManagerDlg.cpp:586
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:408 Src/wptMainProc.cpp:413
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1449,7 +1451,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
#: Src/wptFileManager.cpp:1189 Src/wptFileManager.cpp:1194
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:407
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
@@ -1583,8 +1585,8 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1848
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1850
+#: Src/wptKeyManagerDlg.cpp:1882
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1593,8 +1595,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1061
-#: Src/wptKeyEditDlgs.cpp:1329 Src/wptKeyEditDlgs.cpp:1401
+#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1394
#: Src/wptKeyserverDlg.cpp:104
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
@@ -1672,7 +1674,7 @@
# c:\oss\winpt\src\wptGPGOptDlg.cpp:90 c:\oss\winpt\src\wptGPGOptDlg.cpp:96
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:580
#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:299
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Options"
msgstr "ƒIƒvƒVƒ‡ƒ“"
@@ -1702,7 +1704,7 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:505
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
@@ -1760,13 +1762,13 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1303
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1347 Src/wptKeyEditDlgs.cpp:1420
#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:784
-#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeyManagerDlg.cpp:1700
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1838 Src/wptKeyManagerDlg.cpp:1857
+#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1663
+#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1718 Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptKeyManagerDlg.cpp:1840 Src/wptKeyManagerDlg.cpp:1859
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1781,17 +1783,17 @@
msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:546
+#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:538
msgid "File Manager (use drag & drop to add files)"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:963
-#: Src/wptKeyManagerDlg.cpp:968 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:964
+#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:967
msgid "View"
msgstr "ƒrƒ…["
@@ -1822,8 +1824,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:357
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:980
-#: Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1031
msgid "&Sign"
msgstr "–¼(&S)"
@@ -1831,7 +1833,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:404
# c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:589
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:414
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1858,7 +1860,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:415
+#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:406
msgid "Exit"
msgstr "I—¹"
@@ -2094,8 +2096,8 @@
#: Src/wptGPGPrefsDlg.cpp:223 Src/wptGPGPrefsDlg.cpp:229
#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:239
#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:990
-#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:225
+#: Src/wptKeyEditDlgs.cpp:1710 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptMainProc.cpp:426 Src/wptPreferencesDlg.cpp:225
#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
#: Src/wptRegistry.cpp:596
@@ -2261,8 +2263,8 @@
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:61
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
# c:\oss\winpt\src\wptMainProc.cpp:572
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1810
-#: Src/wptMainProc.cpp:594
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1812
+#: Src/wptMainProc.cpp:586
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2443,20 +2445,19 @@
#: Src/wptKeyManager.cpp:835 Src/wptKeyManager.cpp:892
#: Src/wptKeyManager.cpp:897 Src/wptKeyManager.cpp:953
#: Src/wptKeyManager.cpp:983 Src/wptKeyManager.cpp:1070
-#: Src/wptKeyManagerDlg.cpp:1311 Src/wptKeyManagerDlg.cpp:1322
-#: Src/wptKeyManagerDlg.cpp:1332 Src/wptKeyManagerDlg.cpp:1635
-#: Src/wptKeyManagerDlg.cpp:1657 Src/wptKeyManagerDlg.cpp:1672
-#: Src/wptKeyManagerDlg.cpp:1682 Src/wptKeyManagerDlg.cpp:1690
-#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1706
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1780
-#: Src/wptKeyManagerDlg.cpp:1839 Src/wptKeyManagerDlg.cpp:1857
-#: Src/wptKeyManagerDlg.cpp:1862 Src/wptKeyManagerDlg.cpp:1867
-#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptKeyManagerDlg.cpp:2056 Src/wptKeysigDlg.cpp:94
-#: Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309 Src/wptKeysigDlg.cpp:381
-#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:557 Src/wptMainProc.cpp:565
+#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
+#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1641
+#: Src/wptKeyManagerDlg.cpp:1664 Src/wptKeyManagerDlg.cpp:1679
+#: Src/wptKeyManagerDlg.cpp:1689 Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1707 Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptKeyManagerDlg.cpp:1841
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptKeyManagerDlg.cpp:1864
+#: Src/wptKeyManagerDlg.cpp:1869 Src/wptKeyManagerDlg.cpp:1940
+#: Src/wptKeyManagerDlg.cpp:1945 Src/wptKeyManagerDlg.cpp:2058
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
+#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:549 Src/wptMainProc.cpp:557
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2555,11 +2556,11 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:256
-#: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeyEditDlgs.cpp:1194
-#: Src/wptKeyEditDlgs.cpp:1439 Src/wptKeyEditDlgs.cpp:1459
-#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1529
-#: Src/wptKeyEditDlgs.cpp:1596 Src/wptKeyEditDlgs.cpp:1762
-#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
+#: Src/wptKeyEditDlgs.cpp:1137 Src/wptKeyEditDlgs.cpp:1187
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1452
+#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1589 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1957 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
#: Src/wptKeysigDlg.cpp:207
msgid "Revoked"
@@ -2571,7 +2572,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeyEditDlgs.cpp:1135 Src/wptKeyEditDlgs.cpp:1354
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
msgid "Expired"
@@ -2589,7 +2590,7 @@
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1202
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1195
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2600,7 +2601,7 @@
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:907 Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:979
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
@@ -2611,7 +2612,7 @@
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2621,9 +2622,9 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:908
-#: Src/wptKeyManagerDlg.cpp:999 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1071
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
@@ -2634,16 +2635,16 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
# c:\oss\winpt\src\wptSigList.cpp:44
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1079
-#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeyEditDlgs.cpp:1166 Src/wptKeylist.cpp:594
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1005
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "ì¬"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:909 Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1004
msgid "Type"
msgstr "Ží—Þ"
@@ -2685,7 +2686,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
# c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1132
#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:385
msgid "Never"
msgstr "‚Í‚¸‚Í‚È‚¢"
@@ -2693,7 +2694,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1139
msgid "OK"
msgstr "OK"
@@ -2733,7 +2734,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:335
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2804,9 +2805,9 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:468
#: Src/wptKeyEditDlgs.cpp:550 Src/wptKeyEditDlgs.cpp:721
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1531
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1816
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1809
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
#: Src/wptKeyPropsDlg.cpp:379 Src/wptOwnertrustDlg.cpp:119
#: Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
@@ -2836,10 +2837,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1324
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1365
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1790
-#: Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1585
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1953
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2962,9 +2963,9 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:817
#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
-#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyManagerDlg.cpp:1689
+#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyManagerDlg.cpp:1696
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -3007,61 +3008,50 @@
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1028
msgid "New Passphrase"
msgstr "V‚µ‚¢ƒpƒXƒtƒŒ[ƒY"
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1036
msgid ""
"Are you sure that you really don't want a passphrase?\n"
"This is propably a bad idea, still proceed?"
msgstr ""
-# c:\oss\winpt\src\wptKeyEditDlgs.cpp:771
-# c:\oss\winpt\src\wptKeygenDlg.cpp:250
-# c:\oss\winpt\src\wptPassphraseDlg.cpp:153
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptPassphraseDlg.cpp:248
-msgid ""
-"The passphrase contains 8-bit characters.\n"
-"It is not suggested to use charset specific characters."
-msgstr ""
-"ƒpƒXƒtƒŒ[ƒY‚É‚Í8-bit•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B\n"
-"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
-
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1059
+#: Src/wptKeyEditDlgs.cpp:1052
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyEditDlgs.cpp:1070 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1080
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
# c:\oss\winpt\src\wptKeylist.cpp:53
-#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:912
+#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1172
+#: Src/wptKeyEditDlgs.cpp:1165
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1260
+#: Src/wptKeyEditDlgs.cpp:1253
#, fuzzy
msgid ""
"ADDUID \t\tadd a user ID\r\n"
@@ -3108,17 +3098,17 @@
"CLEAN \t\t•sˆÀ’è‚Ì–¼‚ðƒL[‚©‚çŠO‚·\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1275
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1298 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1300
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1315
+#: Src/wptKeyEditDlgs.cpp:1308
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3136,16 +3126,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1325
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1329
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1355
msgid ""
"Key already expired.\n"
"\n"
@@ -3158,22 +3148,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:1371 Src/wptKeyEditDlgs.cpp:1374
+#: Src/wptKeyEditDlgs.cpp:1364 Src/wptKeyEditDlgs.cpp:1367
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1388
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1400
+#: Src/wptKeyEditDlgs.cpp:1393
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1424
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3186,37 +3176,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1433
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1457
+#: Src/wptKeyEditDlgs.cpp:1450
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1461
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1476
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1492
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1505
+#: Src/wptKeyEditDlgs.cpp:1498
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3228,55 +3218,55 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1571
+#: Src/wptKeyEditDlgs.cpp:1564
msgid "Could not set user ID preferences"
msgstr "ƒ†[ƒU[IDƒIƒvƒVƒ‡ƒ“‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1615
+#: Src/wptKeyEditDlgs.cpp:1608
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1618
+#: Src/wptKeyEditDlgs.cpp:1611
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1712
+#: Src/wptKeyEditDlgs.cpp:1705
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1716
+#: Src/wptKeyEditDlgs.cpp:1709
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1718
+#: Src/wptKeyEditDlgs.cpp:1711
msgid "user ID:"
msgstr "ƒ†[ƒU[IDF"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1712 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1784
+#: Src/wptKeyEditDlgs.cpp:1777
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1795
+#: Src/wptKeyEditDlgs.cpp:1788
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3292,31 +3282,31 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1812
+#: Src/wptKeyEditDlgs.cpp:1805
#, fuzzy
msgid "Delete User ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1816
+#: Src/wptKeyEditDlgs.cpp:1809
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1907 Src/wptKeyEditDlgs.cpp:1925
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1918
msgid "Finished to compact key."
msgstr "ƒL[‚ðƒRƒ“ƒpƒNƒg‚·‚邱‚Æ‚ªŠ®¬‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1960
msgid "Do you really want to make this sig exportable?"
msgstr "‚±‚Ì–¼‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeysignDlg.cpp:439
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:2061
+#: Src/wptKeyEditDlgs.cpp:2054
#, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
@@ -3328,33 +3318,33 @@
msgstr ""
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:2105
+#: Src/wptKeyEditDlgs.cpp:2098
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:2118
+#: Src/wptKeyEditDlgs.cpp:2111
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:2127
+#: Src/wptKeyEditDlgs.cpp:2120
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyEditDlgs.cpp:2130
+#: Src/wptKeyEditDlgs.cpp:2123
#, fuzzy
msgid "&Revoke..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2173
+#: Src/wptKeyEditDlgs.cpp:2166
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2177
+#: Src/wptKeyEditDlgs.cpp:2170
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3414,8 +3404,8 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:81
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:86
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:1904 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:1906 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -3452,8 +3442,9 @@
#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:410 Src/wptKeygenDlg.cpp:415
#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:432
#: Src/wptKeygenDlg.cpp:440 Src/wptKeygenDlg.cpp:454 Src/wptKeygenDlg.cpp:461
-#: Src/wptKeygenDlg.cpp:470 Src/wptKeygenDlg.cpp:491 Src/wptKeygenDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1771 Src/wptPassphraseDlg.cpp:145
+#: Src/wptKeygenDlg.cpp:471 Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1773 Src/wptPassphraseDlg.cpp:147
+#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
@@ -3561,17 +3552,17 @@
msgstr "‚±‚̂悤‚È’·‚¢ƒL[‚ð–{“–‚É‚¢‚è‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:560
+#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:561
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:566
msgid "Please do not enter the email address in the name field."
msgstr "–¼‘O‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:572
+#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
@@ -3583,37 +3574,37 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeygenDlg.cpp:469 Src/wptKeyRevokeDlg.cpp:176
+#: Src/wptKeygenDlg.cpp:470 Src/wptKeyRevokeDlg.cpp:176
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:292 c:\oss\winpt\src\wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:538
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:539
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:540
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:541
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:542
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -3624,9 +3615,10 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:543
+#, fuzzy
msgid ""
-"By accosiating an email address with your key pair, you will enable WinPT to "
+"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
"key when communicating with you."
msgstr ""
@@ -3637,19 +3629,19 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1057
# c:\oss\winpt\src\wptKeygenDlg.cpp:378 c:\oss\winpt\src\wptKeygenDlg.cpp:383
# c:\oss\winpt\src\wptKeygenDlg.cpp:389 c:\oss\winpt\src\wptKeygenDlg.cpp:413
-#: Src/wptKeygenDlg.cpp:543 Src/wptKeygenDlg.cpp:561 Src/wptKeygenDlg.cpp:566
-#: Src/wptKeygenDlg.cpp:573 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:599
-#: Src/wptKeyManagerDlg.cpp:1794
+#: Src/wptKeygenDlg.cpp:544 Src/wptKeygenDlg.cpp:562 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:580 Src/wptKeygenDlg.cpp:601
+#: Src/wptKeyManagerDlg.cpp:1796
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:546
msgid "E&xpert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:579
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3752,14 +3744,14 @@
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:911
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Cipher"
msgstr "ˆÃ†"
# c:\oss\winpt\src\wptKeylist.cpp:54 c:\oss\winpt\src\wptVerifyList.cpp:78
# c:\oss\winpt\src\wptVerifyList.cpp:86
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "M—p"
@@ -4017,29 +4009,29 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:483 Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:486 Src/wptKeyManagerDlg.cpp:1023
msgid "Paste Key from Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:504
+#: Src/wptKeyManagerDlg.cpp:507
#, c-format
msgid "Default Key: %s"
msgstr "‹K’èƒL[‚Í: %s"
# c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:506
+#: Src/wptKeyManagerDlg.cpp:509
#, c-format
msgid "Default Key: 0x%s"
msgstr "‹K’èƒL[‚Í: 0x%s"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:527
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:528
+#: Src/wptKeyManagerDlg.cpp:531
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4050,71 +4042,71 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:968
msgid "Key"
msgstr "ƒL["
# c:\oss\winpt\src\wptGroupsDlg.cpp:49
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:966 Src/wptKeyManagerDlg.cpp:1348
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:974
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:980
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Normal"
msgstr "•’Ê(&N)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:981 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:983 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
msgid "&List Signatures"
msgstr "–¼‚̈ꗗ‚Ђ傤(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:578
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:958
# c:\oss\winpt\src\wptKeyTrustPathDlg.cpp:126
-#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4122,112 +4114,112 @@
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:989
msgid "&Export..."
msgstr "ƒGƒLƒXƒ|[ƒg(&E)..."
# c:\oss\winpt\src\wptClipImportDlg.cpp:181
# c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Import..."
msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "‘®«(&P)"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:995
msgid "E&xport Secret Key"
msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&load Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:997
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Refresh &Keys (Keyserver)"
msgstr "ƒL[‚ðƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&K)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:586
# c:\oss\winpt\src\wptTextInputDlg.cpp:47
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:999 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:1015
+#: Src/wptKeyManagerDlg.cpp:1018
msgid "Copy User ID to Clipboard"
msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1016
+#: Src/wptKeyManagerDlg.cpp:1019
msgid "Copy Key ID to Clipboard"
msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1017
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy Fingerprint to Clipboard"
msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key Info to Clipboard"
msgstr "ƒL[ƒCƒ“ƒtƒH‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Key to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1033
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "Re&fresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Key..."
msgstr "ƒL[..."
@@ -4237,24 +4229,24 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:45
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:1043
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Add"
msgstr "’ljÁ"
@@ -4273,11 +4265,11 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1320
+#: Src/wptKeyManagerDlg.cpp:1323
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -4287,73 +4279,73 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:608
# c:\oss\winpt\src\wptKeysigDlg.cpp:349
-#: Src/wptKeyManagerDlg.cpp:1331
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Could not set keylist window procedure."
msgstr "ƒL[ƒŠƒXƒgƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeyManagerDlg.cpp:1349
+#: Src/wptKeyManagerDlg.cpp:1352
#, fuzzy
msgid "&Show"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1353
#, fuzzy
msgid "&New..."
msgstr "ŠJ‚(&O)..."
# c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1464
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1465
+#: Src/wptKeyManagerDlg.cpp:1468
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1469
+#: Src/wptKeyManagerDlg.cpp:1472
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1476
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1480
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1484
msgid "Copy key to clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1488
msgid "Paste key from clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1492
msgid "Import key to keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1496
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1622
+#: Src/wptKeyManagerDlg.cpp:1628
msgid "New"
msgstr "V‹Kì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1634
+#: Src/wptKeyManagerDlg.cpp:1640
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4365,15 +4357,15 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
# c:\oss\winpt\src\wptKeysignDlg.cpp:320
# c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1665 Src/wptKeysignDlg.cpp:323
-#: Src/wptKeysignDlg.cpp:337 Src/wptKeysignDlg.cpp:399
-#: Src/wptKeysignDlg.cpp:415 Src/wptKeysignDlg.cpp:432
-#: Src/wptKeysignDlg.cpp:437 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
+#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
+#: Src/wptKeysignDlg.cpp:439
msgid "Key Signing"
msgstr "ƒL[‚𖼂·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1688
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4384,31 +4376,26 @@
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:140
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:151
-#: Src/wptKeyManagerDlg.cpp:1695 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1702 Src/wptKeyRevokeDlg.cpp:70
#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:164
#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:177
-#: Src/wptKeyRevokeDlg.cpp:186 Src/wptKeyRevokeDlg.cpp:192
+#: Src/wptKeyRevokeDlg.cpp:187 Src/wptKeyRevokeDlg.cpp:193
msgid "Key Revocation Cert"
msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
-# c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
-#: Src/wptKeyManagerDlg.cpp:1705
-msgid "It does not make any sense with a key pair!"
-msgstr "ƒL[ƒyƒA‚Ƃ̈Ӗ¡‚ª•s–¾‚Å‚·I"
-
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1724
msgid "Key Signature List"
msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1739 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1741 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1749
+#: Src/wptKeyManagerDlg.cpp:1751
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4417,34 +4404,34 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1779
+#: Src/wptKeyManagerDlg.cpp:1781
msgid "Smart Card support is not available."
msgstr "ƒXƒ}[ƒgƒJ[ƒh‚ɑΉž‚µ‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
# c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1802 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
msgid "Keyserver Access"
msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
-#: Src/wptKeyManagerDlg.cpp:1819
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "GnuPG Options"
msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManagerDlg.cpp:1863
msgid "There is no corresponding secret key for this key."
msgstr "‚±‚̃L[‚ɑ΂µ‚Ă̔閧Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1866
+#: Src/wptKeyManagerDlg.cpp:1868
msgid "You can only export one secret key."
msgstr "ˆêŒÂ‚̔閧Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1871
+#: Src/wptKeyManagerDlg.cpp:1873
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -4463,17 +4450,17 @@
"‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1876
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "WARNING"
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1937
+#: Src/wptKeyManagerDlg.cpp:1939
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyManagerDlg.cpp:1942
+#: Src/wptKeyManagerDlg.cpp:1944
#, fuzzy
msgid "Keyserver refresh finished."
msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
@@ -4615,7 +4602,7 @@
msgstr "——R‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:148
-#: Src/wptKeyRevokeDlg.cpp:191
+#: Src/wptKeyRevokeDlg.cpp:192
msgid "Revocation certificate generated."
msgstr "–³Œø‰»Ø–¾‘‚ªì¬‚³‚ê‚Ü‚µ‚½B"
@@ -4641,44 +4628,44 @@
msgid "Do you want to retrieve %s via the default keyserver?"
msgstr "‹K’èƒL[ƒT[ƒo[Œo—R‚Å 0x%s ‚ðŽæ‚èo‚µ‚½‚¢‚Å‚·‚©H"
-#: Src/wptKeyserver.cpp:402
+#: Src/wptKeyserver.cpp:435
msgid "Network unreachable"
msgstr ""
-#: Src/wptKeyserver.cpp:405
+#: Src/wptKeyserver.cpp:438
#, fuzzy
msgid "Host unreachable"
msgstr "ƒzƒXƒg"
# c:\oss\winpt\src\wptErrors.cpp:84
-#: Src/wptKeyserver.cpp:408
+#: Src/wptKeyserver.cpp:441
#, fuzzy
msgid "Could not resolve host name"
msgstr "ƒzƒXƒg–¼‚ð‘ÅŠJ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptKeyserver.cpp:411
+#: Src/wptKeyserver.cpp:444
msgid "Connection refused"
msgstr ""
-#: Src/wptKeyserver.cpp:415
+#: Src/wptKeyserver.cpp:448
msgid "Connection timeout"
msgstr ""
-#: Src/wptKeyserver.cpp:419
+#: Src/wptKeyserver.cpp:452
msgid "Connection resetted by peer"
msgstr ""
-#: Src/wptKeyserver.cpp:422
+#: Src/wptKeyserver.cpp:455
msgid "Socket has been shutdown"
msgstr ""
# c:\oss\winpt\src\wptPreferencesDlg.cpp:221
-#: Src/wptKeyserver.cpp:600
+#: Src/wptKeyserver.cpp:633
msgid "Could not save keyserver.conf file"
msgstr "keyserver.confƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyserver.cpp:436
-#: Src/wptKeyserver.cpp:645
+#: Src/wptKeyserver.cpp:678
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -4687,12 +4674,12 @@
"ƒvƒƒNƒV[‚Ì”FØI"
# c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:681
msgid "Proxy Error"
msgstr "ƒvƒƒNƒV[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:462
-#: Src/wptKeyserver.cpp:673
+#: Src/wptKeyserver.cpp:706
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -4715,17 +4702,17 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserver.cpp:675
+#: Src/wptKeyserver.cpp:708
msgid "Keyserver Error"
msgstr "ƒL[ƒT[ƒo[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserver.cpp:473
-#: Src/wptKeyserver.cpp:694
+#: Src/wptKeyserver.cpp:727
msgid "The keyserver limit is exceeded"
msgstr "ƒL[ƒT[ƒo[‚̧ŒÀ‚ª’´‚¦‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserver.cpp:695
+#: Src/wptKeyserver.cpp:728
msgid "Keyserver Warning"
msgstr "ƒL[ƒT[ƒo[Œx"
@@ -5131,24 +5118,24 @@
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
# c:\oss\winpt\src\wptFileManager.cpp:1026
-#: Src/wptKeysignDlg.cpp:77
+#: Src/wptKeysignDlg.cpp:78
#, fuzzy, c-format
msgid "%d-bit %s key, ID 0x%s"
msgstr "%s ƒL[ID‚ðŽg—p 0x%s"
-#: Src/wptKeysignDlg.cpp:179
+#: Src/wptKeysignDlg.cpp:180
#, c-format
msgid "Photo of %s"
msgstr ""
# c:\oss\winpt\src\wptKeysignDlg.cpp:152
# c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:219 Src/wptKeysignDlg.cpp:382
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
msgid "Choose Signature Class"
msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeysignDlg.cpp:153
-#: Src/wptKeysignDlg.cpp:221
+#: Src/wptKeysignDlg.cpp:224
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -5157,34 +5144,34 @@
"‚ð”»‚ç‚È‚¢ê‡‚͈ȉº‚ðŽg—p‚µ‚ĉº‚³‚¢B\"0\""
# c:\oss\winpt\src\wptKeysignDlg.cpp:154
-#: Src/wptKeysignDlg.cpp:223
+#: Src/wptKeysignDlg.cpp:226
msgid "(0) I will not answer (default)"
msgstr "(0)‚Í•ÔŽ–‚ð‚µ‚Ü‚¹‚ñ(‹K’è)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:225
+#: Src/wptKeysignDlg.cpp:228
msgid "(1) I have not checked at all."
msgstr "(1) ‚Ü‚Á‚½‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:227
+#: Src/wptKeysignDlg.cpp:230
msgid "(2) I have done causal checking."
msgstr "(2) ‚³‚è‚°‚È‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:229
+#: Src/wptKeysignDlg.cpp:232
msgid "(3) I have done very careful checkings."
msgstr "(3) Td‚Ƀ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
# 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/wptKeysignDlg.cpp:268
+#: Src/wptKeysignDlg.cpp:271
msgid "never"
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:311
+#: Src/wptKeysignDlg.cpp:313
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -5206,52 +5193,47 @@
"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
# c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:323
+#: Src/wptKeysignDlg.cpp:325
msgid "No valid secret key found."
msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:329
+#: Src/wptKeysignDlg.cpp:331
msgid "Sign local only (non exportable signature)"
msgstr "ƒ[ƒJƒ‹—pƒVƒOƒjƒ`ƒƒ[(ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢ƒVƒOƒjƒ`ƒƒ[)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptKeysignDlg.cpp:330
+#: Src/wptKeysignDlg.cpp:332
msgid "Signature expires on"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
# c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:333
msgid "Sign non-revocably"
msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚É–¼‚·‚é"
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:334
msgid "&Ask for certification level"
msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:337
msgid "&Show photo"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:101
+#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "“ü—Í‚ð‰B‚·(&H)"
-#: Src/wptKeysignDlg.cpp:398
+#: Src/wptKeysignDlg.cpp:399
msgid "You cannot select today as the expiration date."
msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
-# c:\oss\winpt\src\wptKeysignDlg.cpp:288
-#: Src/wptKeysignDlg.cpp:415
-msgid "Could not get Key ID from key."
-msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:436
+#: Src/wptKeysignDlg.cpp:433
msgid "This key is already signed by your key"
msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
@@ -5274,66 +5256,66 @@
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì“à—e‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptMainProc.cpp:211
-#: Src/wptMainProc.cpp:202
+#: Src/wptMainProc.cpp:197
msgid "Could not access secret keyring."
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMainProc.cpp:265
# c:\oss\winpt\src\wptTextInputDlg.cpp:76
-#: Src/wptMainProc.cpp:256 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:245 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "ƒeƒLƒXƒg“ü—Í"
# c:\oss\winpt\src\wptMainProc.cpp:284
-#: Src/wptMainProc.cpp:277
+#: Src/wptMainProc.cpp:266
msgid "Unknown OpenPGP type."
msgstr "–¢’m‚ÌOpenPGPƒ^ƒCƒv"
# c:\oss\winpt\src\wptMainProc.cpp:336
-#: Src/wptMainProc.cpp:354
+#: Src/wptMainProc.cpp:344
msgid "Could not set current window mode hooks."
msgstr ""
"Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMainProc.cpp:398
-#: Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:404
msgid "Edit Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì•ÒW"
# c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:405
msgid "About..."
msgstr "WinPT‚ɂ‚¢‚Ä..."
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:411 Src/wptMainProc.cpp:415
msgid "Decrypt/Verify"
msgstr "•œ†/Šm”F"
-#: Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:425
msgid "Current Window"
msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
# c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:490
+#: Src/wptMainProc.cpp:482
msgid "Remove all passphrases from cache?"
msgstr "‚·‚ׂẴpƒXƒtƒŒ[ƒY‚ðƒLƒƒƒbƒVƒ…‚©‚çŠO‚¹‚Ü‚·B"
# c:\oss\winpt\src\wptClipImportDlg.cpp:112
# c:\oss\winpt\src\wptMainProc.cpp:466 c:\oss\winpt\src\wptProgressDlg.cpp:98
# c:\oss\winpt\src\wptRegistry.cpp:133
-#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:483 Src/wptProgressDlg.cpp:131 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
# c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:493
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BWinPT‚ðI—¹‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptMainProc.cpp:510
-#: Src/wptMainProc.cpp:534
+#: Src/wptMainProc.cpp:526
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -5344,7 +5326,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:566
# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptMainProc.cpp:588 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:580 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
@@ -5451,7 +5433,7 @@
"%s ‚ªˆÃ†‰»ƒf[ƒ^‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:224
-#: Src/wptPassphraseCB.cpp:303
+#: Src/wptPassphraseCB.cpp:306
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5463,7 +5445,7 @@
"%s ƒL[, ID %s (ƒ[ƒ“ƒL[ ID %s)\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:231
-#: Src/wptPassphraseCB.cpp:309
+#: Src/wptPassphraseCB.cpp:312
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5475,7 +5457,7 @@
"%s ƒL[, ID %s\n"
# c:\oss\winpt\src\wptPassphraseCB.cpp:283
-#: Src/wptPassphraseCB.cpp:397
+#: Src/wptPassphraseCB.cpp:400
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -5485,27 +5467,27 @@
"ƒJ[ƒhF %s"
# c:\oss\winpt\src\wptPassphraseDlg.cpp:56
-#: Src/wptPassphraseDlg.cpp:89 Src/wptPassphraseDlg.cpp:135
+#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
msgid "Passphrase Dialog"
msgstr "ƒpƒXƒtƒŒ[ƒYƒ_ƒCƒ„ƒƒO"
# c:\oss\winpt\src\wptPassphraseDlg.cpp:62
-#: Src/wptPassphraseDlg.cpp:94
+#: Src/wptPassphraseDlg.cpp:96
msgid "Repeat Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY‚ðÄ“x“ü—Í‚·‚é"
# c:\oss\winpt\src\wptPassphraseDlg.cpp:64
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:98
msgid "Enter Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptPassphraseDlg.cpp:134
+#: Src/wptPassphraseDlg.cpp:136
msgid "Please enter a passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:227
-#: Src/wptPassphraseDlg.cpp:142
+#: Src/wptPassphraseDlg.cpp:144
msgid ""
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
@@ -5517,6 +5499,19 @@
"\n"
"Œp‘±‚µ‚Ü‚·‚©H"
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:771
+# c:\oss\winpt\src\wptKeygenDlg.cpp:250
+# c:\oss\winpt\src\wptPassphraseDlg.cpp:153
+#: Src/wptPassphraseDlg.cpp:154
+#, fuzzy
+msgid ""
+"The passphrase contains 8-bit characters.\n"
+"It is not suggested to use charset specific characters.\n"
+"Still proceed?"
+msgstr ""
+"ƒpƒXƒtƒŒ[ƒY‚É‚Í8-bit•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B\n"
+"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
+
# c:\oss\winpt\src\wptPINDlg.cpp:59
#: Src/wptPINDlg.cpp:74
msgid "Please enter a PIN."
@@ -5689,7 +5684,7 @@
msgstr "ƒzƒbƒgƒL["
# c:\oss\winpt\src\wptProgressDlg.cpp:98
-#: Src/wptProgressDlg.cpp:122
+#: Src/wptProgressDlg.cpp:131
msgid "Could not create progress thread."
msgstr "isƒXƒŒƒbƒh‚ð쬂»‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -5857,6 +5852,14 @@
msgid "Signed"
msgstr "–¼‚µ‚Ü‚µ‚½"
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:951
+#~ msgid "It does not make any sense with a key pair!"
+#~ msgstr "ƒL[ƒyƒA‚Ƃ̈Ӗ¡‚ª•s–¾‚Å‚·I"
+
+# c:\oss\winpt\src\wptKeysignDlg.cpp:288
+#~ msgid "Could not get Key ID from key."
+#~ msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
#~ msgid "No subkey(s) found."
#~ msgstr "ƒTƒuƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB"
Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Po/pt_BR.po 2006-06-19 14:04:31 UTC (rev 229)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: WinPT 1.0.0\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-15 09:09+0200\n"
+"POT-Creation-Date: 2006-06-18 18:43+0200\n"
"PO-Revision-Date: 2006-06-14 22:00-0300\n"
"Last-Translator: Eduardo S. Dobay <edudobay at gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar.conectiva.com.br>\n"
@@ -24,7 +24,7 @@
#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:355 Src/wptMainProc.cpp:533
+#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:525
msgid "WinPT Error"
msgstr "Erro WinPT"
@@ -54,7 +54,7 @@
msgstr "Não foi possível criar o diretório do WinPT"
#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyserver.cpp:601
+#: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
@@ -168,8 +168,8 @@
msgid "About GnuPG"
msgstr "Sobre o GnuPG"
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1888
-#: Src/wptMainProc.cpp:582
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1890
+#: Src/wptMainProc.cpp:574
msgid "About WinPT"
msgstr "Sobre o WinPT"
@@ -223,12 +223,12 @@
msgid "&About GPG..."
msgstr "&Sobre o GPG..."
-#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2129
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2122
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "&Help"
msgstr "A&juda"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:410
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:401
msgid "Card Manager"
msgstr "Gerenciador de cartões"
@@ -252,7 +252,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:295
+#: Src/wptMainProc.cpp:284
msgid "Card Edit"
msgstr "Editar cartão"
@@ -340,7 +340,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Fazer backup da chave de cifragem fora do cartão"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1784
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1786
msgid "Card Key Generation"
msgstr "Geração da chave do cartão"
@@ -368,7 +368,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Por favor use caracteres ASCII puros para os campos."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1378 Src/wptKeygenDlg.cpp:453
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1371 Src/wptKeygenDlg.cpp:453
msgid "The date you have chosen lies in the past."
msgstr "A data escolhida está no passado."
@@ -404,7 +404,7 @@
msgid "Change Card PIN"
msgstr "Mudar PIN do cartão"
-#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:241
+#: Src/wptCardDlg.cpp:799 Src/wptPassphraseDlg.cpp:256
msgid "Passphrases do not match. Please try again."
msgstr "Frases não coincidem. Por favor tente de novo."
@@ -428,33 +428,37 @@
"Por favor insira o smart card do OpenPGP\n"
"Pressione OK para continuar ou Cancelar"
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:130
+#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
msgid "user ID not found"
msgstr "ID de usuário não encontrada"
-#: Src/wptClipDecryptDlg.cpp:117
-msgid "Signature Status: Created with a fully trusted key"
+#: Src/wptClipDecryptDlg.cpp:104
+#, fuzzy
+msgid "Signature status: created with a fully trusted key"
msgstr "Estado da assinatura: criada com uma chave totalmente confiável"
-#: Src/wptClipDecryptDlg.cpp:119
-msgid "Signature Status: Created with a marginal trusted key"
+#: Src/wptClipDecryptDlg.cpp:106
+#, fuzzy
+msgid "Signature status: created with a marginal trusted key"
msgstr "Estado da assinatura: criada com uma chave pouco confiável"
-#: Src/wptClipDecryptDlg.cpp:122
-msgid "Signature Status: Created with an UNTRUSTED key"
+#: Src/wptClipDecryptDlg.cpp:109
+#, fuzzy
+msgid "Signature status: created with an UNTRUSTED key"
msgstr "Estado da assinatura: criada com uma chave NÃO CONFIÁVEL"
-#: Src/wptClipDecryptDlg.cpp:125
-msgid "Signature Status: Created with an undefined trusted key"
+#: Src/wptClipDecryptDlg.cpp:112
+#, fuzzy
+msgid "Signature status: created with an undefined trusted key"
msgstr "Estado da assinatura: criada com uma chave de confiança indefinida"
-#: Src/wptClipDecryptDlg.cpp:133
+#: Src/wptClipDecryptDlg.cpp:172
msgid "Decrypt Verify"
msgstr "Verificação de decifragem"
-#: Src/wptClipDecryptDlg.cpp:134
+#: Src/wptClipDecryptDlg.cpp:173
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -468,25 +472,25 @@
"Assinatura faita: %s\n"
"De \"%s\" usando chave de ID 0x%s%s %s"
-#: Src/wptClipDecryptDlg.cpp:169 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
#: Src/wptFileManager.cpp:1622 Src/wptFileManagerDlg.cpp:590
#: Src/wptFileVerifyDlg.cpp:82 Src/wptFileVerifyDlg.cpp:149
-#: Src/wptMainProc.cpp:184 Src/wptMainProc.cpp:250 Src/wptMainProc.cpp:264
-#: Src/wptMainProc.cpp:272 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
+#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:412
msgid "Verify"
msgstr "Verificar"
-#: Src/wptClipDecryptDlg.cpp:176 Src/wptClipDecryptDlg.cpp:189
-#: Src/wptClipDecryptDlg.cpp:197 Src/wptClipDecryptDlg.cpp:204
-#: Src/wptClipDecryptDlg.cpp:206 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
+#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
+#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
#: Src/wptFileManager.cpp:1327
msgid "Decryption"
msgstr "Decifragem"
-#: Src/wptClipDecryptDlg.cpp:190 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -495,18 +499,18 @@
"Cifrado com chave %s, ID %s.%s\n"
"Decifragem falhou: chave privada indisponível."
-#: Src/wptClipDecryptDlg.cpp:197
+#: Src/wptClipDecryptDlg.cpp:236
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Algoritmo não suportado: %s"
-#: Src/wptClipDecryptDlg.cpp:203
+#: Src/wptClipDecryptDlg.cpp:242
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Mensagem OpenPGP quebrada (possivelmente: caracteres quoted-printable em "
"guarda)."
-#: Src/wptClipDecryptDlg.cpp:211
+#: Src/wptClipDecryptDlg.cpp:250
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -520,31 +524,31 @@
"É possível que os dados tenham sidos corrompidos durante o transporte\n"
"mas também é possível que isso seja parte de um ataque."
-#: Src/wptClipDecryptDlg.cpp:216
+#: Src/wptClipDecryptDlg.cpp:255
msgid "*** IMPORTANT ***"
msgstr "*** IMPORTANTE ***"
-#: Src/wptClipDecryptDlg.cpp:219 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
#: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "Estado do GnuPG: Concluído"
-#: Src/wptClipEditDlg.cpp:59 Src/wptClipEditDlg.cpp:112
-#: Src/wptClipEditDlg.cpp:120 Src/wptClipEditDlg.cpp:159
-#: Src/wptClipEditDlg.cpp:168 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:232 Src/wptMainProc.cpp:277
-#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:519
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
+#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
+#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
+#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
msgid "Clipboard"
msgstr "Área de transferência"
-#: Src/wptClipEditDlg.cpp:102 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
msgid "File Open"
msgstr "Abrir arquivo"
-#: Src/wptClipEditDlg.cpp:111
+#: Src/wptClipEditDlg.cpp:128
msgid ""
"The file you want to add is very large.\n"
"Still proceed?"
@@ -552,11 +556,11 @@
"O arquivo que você deseja adicionar é muito grande.\n"
"Prosseguir?"
-#: Src/wptClipEditDlg.cpp:150
+#: Src/wptClipEditDlg.cpp:167
msgid "File Save"
msgstr "Salvar arquivo"
-#: Src/wptClipEditDlg.cpp:160 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -565,34 +569,33 @@
"\"%s\" já existe.\n"
"Substituir arquivo existente?"
-#: Src/wptClipEditDlg.cpp:195 Src/wptMainProc.cpp:174 Src/wptMainProc.cpp:240
-#: Src/wptMainProc.cpp:576
+#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
msgid "Clipboard Editor"
msgstr "Editor da área de transferência"
-#: Src/wptClipEditDlg.cpp:196
+#: Src/wptClipEditDlg.cpp:218
msgid "&Copy"
msgstr "&Copiar"
-#: Src/wptClipEditDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:219
msgid "Clea&r"
msgstr "&Limpar"
-#: Src/wptClipEditDlg.cpp:198 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
#: Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "Ca&rregar"
-#: Src/wptClipEditDlg.cpp:199 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
msgid "&Save"
msgstr "&Salvar"
-#: Src/wptClipEditDlg.cpp:200
+#: Src/wptClipEditDlg.cpp:222
msgid "Add quotes"
msgstr "Adicionar aspas"
-#: Src/wptClipEditDlg.cpp:201 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -610,7 +613,7 @@
#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:154
#: Src/wptClipEncryptDlg.cpp:200 Src/wptClipEncryptDlg.cpp:207
#: Src/wptClipEncryptDlg.cpp:236 Src/wptMainProc.cpp:146
-#: Src/wptMainProc.cpp:214
+#: Src/wptMainProc.cpp:209
msgid "Encryption"
msgstr "Cifragem"
@@ -626,10 +629,10 @@
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
#: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:544 Src/wptKeyRevokeDlg.cpp:81
+#: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:334 Src/wptPassphraseCB.cpp:93
-#: Src/wptPassphraseDlg.cpp:102 Src/wptPINDlg.cpp:54
+#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
msgstr "&Cancelar"
@@ -659,7 +662,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1086
#: Src/wptFileManager.cpp:1102 Src/wptFileManager.cpp:1392
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:220
+#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
msgid "Signing"
msgstr "Assinar"
@@ -678,7 +681,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:226
+#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:221
msgid "Sign & Encrypt"
msgstr "Assinar e cifrar"
@@ -743,31 +746,30 @@
#: Src/wptKeyEditDlgs.cpp:876 Src/wptKeyEditDlgs.cpp:878
#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:934
#: Src/wptKeyEditDlgs.cpp:967 Src/wptKeyEditDlgs.cpp:1011
-#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1036
-#: Src/wptKeyEditDlgs.cpp:1047 Src/wptKeyEditDlgs.cpp:1298
-#: Src/wptKeyEditDlgs.cpp:1303 Src/wptKeyEditDlgs.cpp:1307
-#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1364
-#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1383
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1427
-#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1440
-#: Src/wptKeyEditDlgs.cpp:1445 Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1018 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1342 Src/wptKeyEditDlgs.cpp:1347
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1372
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1415
+#: Src/wptKeyEditDlgs.cpp:1420 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptKeyEditDlgs.cpp:1433 Src/wptKeyEditDlgs.cpp:1438
+#: Src/wptKeyEditDlgs.cpp:1481 Src/wptKeyEditDlgs.cpp:1486
#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1507 Src/wptKeyEditDlgs.cpp:1510
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1556
-#: Src/wptKeyEditDlgs.cpp:1571 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1603 Src/wptKeyEditDlgs.cpp:1712
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1785
-#: Src/wptKeyEditDlgs.cpp:1790 Src/wptKeyEditDlgs.cpp:1800
-#: Src/wptKeyEditDlgs.cpp:1905 Src/wptKeyEditDlgs.cpp:1907
-#: Src/wptKeyEditDlgs.cpp:1923 Src/wptKeyEditDlgs.cpp:1925
-#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeyEditDlgs.cpp:1968
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1998
-#: Src/wptKeyEditDlgs.cpp:2002 Src/wptKeyEditDlgs.cpp:2069
-#: Src/wptKeyEditDlgs.cpp:2106 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyEditDlgs.cpp:2173
-#: Src/wptKeyEditDlgs.cpp:2178 Src/wptKeyManagerDlg.cpp:1025
-#: Src/wptKeyManagerDlg.cpp:1912
+#: Src/wptKeyEditDlgs.cpp:1503 Src/wptKeyEditDlgs.cpp:1541
+#: Src/wptKeyEditDlgs.cpp:1549 Src/wptKeyEditDlgs.cpp:1564
+#: Src/wptKeyEditDlgs.cpp:1585 Src/wptKeyEditDlgs.cpp:1596
+#: Src/wptKeyEditDlgs.cpp:1705 Src/wptKeyEditDlgs.cpp:1743
+#: Src/wptKeyEditDlgs.cpp:1778 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1793 Src/wptKeyEditDlgs.cpp:1898
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1918 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1977
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeyEditDlgs.cpp:1995
+#: Src/wptKeyEditDlgs.cpp:2062 Src/wptKeyEditDlgs.cpp:2099
+#: Src/wptKeyEditDlgs.cpp:2112 Src/wptKeyEditDlgs.cpp:2126
+#: Src/wptKeyEditDlgs.cpp:2166 Src/wptKeyEditDlgs.cpp:2171
+#: Src/wptKeyManagerDlg.cpp:1028 Src/wptKeyManagerDlg.cpp:1914
msgid "Key Edit"
msgstr "Editar chave"
@@ -791,7 +793,7 @@
msgid "Please select a language"
msgstr "Por favor selecione uma língua"
-#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:103 Src/wptPINDlg.cpp:55
+#: Src/wptCommonDlg.cpp:252 Src/wptPassphraseDlg.cpp:105 Src/wptPINDlg.cpp:55
msgid "&OK"
msgstr "&OX"
@@ -982,7 +984,7 @@
#: Src/wptFileManager.cpp:1524 Src/wptFileManager.cpp:1774
#: Src/wptFileManager.cpp:1836 Src/wptFileManagerDlg.cpp:536
#: Src/wptFileManagerDlg.cpp:635 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:408 Src/wptMDSumDlg.cpp:184
+#: Src/wptMainProc.cpp:399 Src/wptMDSumDlg.cpp:184
msgid "File Manager"
msgstr "Gerenciador de arquivos"
@@ -1011,12 +1013,12 @@
"É possível desativar a compressão para esses arquivos.\n"
"Você deseja desabilitá-la?"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1081
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1074
#: Src/wptVerifyList.cpp:162
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1171
+#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1164
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:112
#: Src/wptVerifyList.cpp:161
msgid "Name"
@@ -1059,13 +1061,13 @@
msgstr "Não foi possível obter a chave secreta padrão."
#: Src/wptFileManager.cpp:1116 Src/wptFileManager.cpp:1428
-#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:202
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
+#: Src/wptFileManagerDlg.cpp:588 Src/wptMainProc.cpp:197
+#: Src/wptMainProc.cpp:409 Src/wptMainProc.cpp:416
msgid "Sign"
msgstr "Assinar"
#: Src/wptFileManager.cpp:1129 Src/wptFileManagerDlg.cpp:586
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:408 Src/wptMainProc.cpp:413
msgid "Encrypt"
msgstr "Cifrar"
@@ -1074,7 +1076,7 @@
msgstr "Cifragem simétrica"
#: Src/wptFileManager.cpp:1189 Src/wptFileManager.cpp:1194
-#: Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:407
msgid "Symmetric"
msgstr "Simétrica"
@@ -1172,13 +1174,13 @@
msgid "Export"
msgstr "Exportar"
-#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1848
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptFileManager.cpp:1710 Src/wptKeyManagerDlg.cpp:1850
+#: Src/wptKeyManagerDlg.cpp:1882
msgid "Choose Name for Key File"
msgstr "Escolher nome para arquivo de chaves"
-#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1061
-#: Src/wptKeyEditDlgs.cpp:1329 Src/wptKeyEditDlgs.cpp:1401
+#: Src/wptFileManager.cpp:1729 Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1394
#: Src/wptKeyserverDlg.cpp:104
msgid "GnuPG status"
msgstr "Estado do GnuPG"
@@ -1238,7 +1240,7 @@
msgstr "&Selecione chave para assinar"
#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:299
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:992
msgid "Options"
msgstr "Opções"
@@ -1262,7 +1264,7 @@
msgstr "%s contém(êm) %d chave(s)."
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:505
-#: Src/wptKeyManagerDlg.cpp:962 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Arquivo"
@@ -1298,13 +1300,13 @@
msgid "Signature mode"
msgstr "Modo de assinatura"
-#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1303
-#: Src/wptKeyEditDlgs.cpp:1354 Src/wptKeyEditDlgs.cpp:1427
+#: Src/wptFileManagerDlg.cpp:345 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1347 Src/wptKeyEditDlgs.cpp:1420
#: Src/wptKeyManager.cpp:683 Src/wptKeyManager.cpp:784
-#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeyManagerDlg.cpp:1700
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1838 Src/wptKeyManagerDlg.cpp:1857
+#: Src/wptKeyManager.cpp:818 Src/wptKeyManagerDlg.cpp:1663
+#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1707
+#: Src/wptKeyManagerDlg.cpp:1718 Src/wptKeyManagerDlg.cpp:1733
+#: Src/wptKeyManagerDlg.cpp:1840 Src/wptKeyManagerDlg.cpp:1859
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "Por favor selecione uma chave."
@@ -1318,16 +1320,16 @@
msgid "%d Object(s) marked"
msgstr "%d Objeto(s) marcado(s)"
-#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:546
+#: Src/wptFileManagerDlg.cpp:503 Src/wptMainProc.cpp:538
msgid "File Manager (use drag & drop to add files)"
msgstr "Gerenciados de arquivos (arrastar & soltar para adicionar arquivos)"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:963
-#: Src/wptKeyManagerDlg.cpp:968 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:966
+#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
msgid "Edit"
msgstr "Editar"
-#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:964
+#: Src/wptFileManagerDlg.cpp:507 Src/wptKeyManagerDlg.cpp:967
msgid "View"
msgstr "Exibir"
@@ -1347,13 +1349,13 @@
msgid "&Decrypt"
msgstr "&Decifrar"
-#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:980
-#: Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptFileManagerDlg.cpp:512 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:1031
msgid "&Sign"
msgstr "As&sinar"
#: Src/wptFileManagerDlg.cpp:513 Src/wptFileManagerDlg.cpp:589
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:414
msgid "Sign && Encrypt"
msgstr "Assinar e cifrar"
@@ -1373,7 +1375,7 @@
msgid "E&xport"
msgstr "E&xportar"
-#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:415
+#: Src/wptFileManagerDlg.cpp:518 Src/wptMainProc.cpp:406
msgid "Exit"
msgstr "Sair"
@@ -1542,8 +1544,8 @@
#: Src/wptGPGPrefsDlg.cpp:223 Src/wptGPGPrefsDlg.cpp:229
#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:239
#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:259
-#: Src/wptKeyEditDlgs.cpp:1717 Src/wptKeyManagerDlg.cpp:990
-#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:225
+#: Src/wptKeyEditDlgs.cpp:1710 Src/wptKeyManagerDlg.cpp:993
+#: Src/wptMainProc.cpp:426 Src/wptPreferencesDlg.cpp:225
#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
#: Src/wptRegistry.cpp:596
@@ -1680,8 +1682,8 @@
"Dados atuais serão perdidos!\n"
"Tem certeza?"
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1810
-#: Src/wptMainProc.cpp:594
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1812
+#: Src/wptMainProc.cpp:586
msgid "GnuPG Preferences"
msgstr "Preferências do GnuPG"
@@ -1779,20 +1781,19 @@
#: Src/wptKeyManager.cpp:835 Src/wptKeyManager.cpp:892
#: Src/wptKeyManager.cpp:897 Src/wptKeyManager.cpp:953
#: Src/wptKeyManager.cpp:983 Src/wptKeyManager.cpp:1070
-#: Src/wptKeyManagerDlg.cpp:1311 Src/wptKeyManagerDlg.cpp:1322
-#: Src/wptKeyManagerDlg.cpp:1332 Src/wptKeyManagerDlg.cpp:1635
-#: Src/wptKeyManagerDlg.cpp:1657 Src/wptKeyManagerDlg.cpp:1672
-#: Src/wptKeyManagerDlg.cpp:1682 Src/wptKeyManagerDlg.cpp:1690
-#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1706
-#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1731
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1780
-#: Src/wptKeyManagerDlg.cpp:1839 Src/wptKeyManagerDlg.cpp:1857
-#: Src/wptKeyManagerDlg.cpp:1862 Src/wptKeyManagerDlg.cpp:1867
-#: Src/wptKeyManagerDlg.cpp:1938 Src/wptKeyManagerDlg.cpp:1943
-#: Src/wptKeyManagerDlg.cpp:2056 Src/wptKeysigDlg.cpp:94
-#: Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309 Src/wptKeysigDlg.cpp:381
-#: Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434 Src/wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:557 Src/wptMainProc.cpp:565
+#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
+#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1641
+#: Src/wptKeyManagerDlg.cpp:1664 Src/wptKeyManagerDlg.cpp:1679
+#: Src/wptKeyManagerDlg.cpp:1689 Src/wptKeyManagerDlg.cpp:1697
+#: Src/wptKeyManagerDlg.cpp:1707 Src/wptKeyManagerDlg.cpp:1718
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1750
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptKeyManagerDlg.cpp:1841
+#: Src/wptKeyManagerDlg.cpp:1859 Src/wptKeyManagerDlg.cpp:1864
+#: Src/wptKeyManagerDlg.cpp:1869 Src/wptKeyManagerDlg.cpp:1940
+#: Src/wptKeyManagerDlg.cpp:1945 Src/wptKeyManagerDlg.cpp:2058
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
+#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:549 Src/wptMainProc.cpp:557
msgid "Key Manager"
msgstr "Gerenciador de chaves"
@@ -1867,18 +1868,18 @@
msgstr "Tecla de atalho desconhecida"
#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:256
-#: Src/wptKeyEditDlgs.cpp:1144 Src/wptKeyEditDlgs.cpp:1194
-#: Src/wptKeyEditDlgs.cpp:1439 Src/wptKeyEditDlgs.cpp:1459
-#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1529
-#: Src/wptKeyEditDlgs.cpp:1596 Src/wptKeyEditDlgs.cpp:1762
-#: Src/wptKeyEditDlgs.cpp:1964 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
+#: Src/wptKeyEditDlgs.cpp:1137 Src/wptKeyEditDlgs.cpp:1187
+#: Src/wptKeyEditDlgs.cpp:1432 Src/wptKeyEditDlgs.cpp:1452
+#: Src/wptKeyEditDlgs.cpp:1491 Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1589 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1957 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
#: Src/wptKeysigDlg.cpp:207
msgid "Revoked"
msgstr "Revogada"
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeyEditDlgs.cpp:1361
+#: Src/wptKeyEditDlgs.cpp:1135 Src/wptKeyEditDlgs.cpp:1354
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
msgid "Expired"
@@ -1892,39 +1893,39 @@
msgid "public key"
msgstr "chave pública"
-#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1202
+#: Src/wptImportList.cpp:304 Src/wptKeyEditDlgs.cpp:1195
msgid "Invalid user ID"
msgstr "ID de usuário inválida"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:907 Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:979
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
msgstr "ID de usuário"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "Tamanho"
-#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1078
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:908
-#: Src/wptKeyManagerDlg.cpp:999 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1071
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
msgstr "ID da chave"
-#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1079
-#: Src/wptKeyEditDlgs.cpp:1173 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1072
+#: Src/wptKeyEditDlgs.cpp:1166 Src/wptKeylist.cpp:594
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1005
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Criação"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:909 Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1004
msgid "Type"
msgstr "Tipo"
@@ -1956,12 +1957,12 @@
msgid "Ultimate"
msgstr "Definitiva"
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1132
#: Src/wptKeylist.cpp:244 Src/wptKeylist.cpp:385
msgid "Never"
msgstr "Nunca"
-#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1146
+#: Src/wptKeyEditDlgs.cpp:260 Src/wptKeyEditDlgs.cpp:1139
msgid "OK"
msgstr "OK"
@@ -1997,7 +1998,7 @@
"A imagem deve ser um arquivo JPEG."
#: Src/wptKeyEditDlgs.cpp:357 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:335
msgid "Passphrase"
msgstr "Frase secreta"
@@ -2038,9 +2039,9 @@
#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:468
#: Src/wptKeyEditDlgs.cpp:550 Src/wptKeyEditDlgs.cpp:721
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1531
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyEditDlgs.cpp:1816
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeyEditDlgs.cpp:1454 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1611 Src/wptKeyEditDlgs.cpp:1809
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
#: Src/wptKeyPropsDlg.cpp:379 Src/wptOwnertrustDlg.cpp:119
#: Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
@@ -2059,10 +2060,10 @@
msgid "Add Revoker"
msgstr "Adicionar revogador"
-#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1493
-#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1592
-#: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1790
-#: Src/wptKeyEditDlgs.cpp:1960
+#: Src/wptKeyEditDlgs.cpp:449 Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1585
+#: Src/wptKeyEditDlgs.cpp:1743 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1953
msgid "Please select a user ID."
msgstr "Por favor selecione uma ID de usuário."
@@ -2145,9 +2146,9 @@
#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:817
#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:929
-#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1349
-#: Src/wptKeyEditDlgs.cpp:1422 Src/wptKeyEditDlgs.cpp:1482
-#: Src/wptKeyManagerDlg.cpp:1689
+#: Src/wptKeyEditDlgs.cpp:1010 Src/wptKeyEditDlgs.cpp:1342
+#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyManagerDlg.cpp:1696
msgid "There is no secret key available!"
msgstr "Não há chave secreta disponível!"
@@ -2180,50 +2181,42 @@
msgid "Current (old) Passphrase"
msgstr "Atual (velha) frase secreta"
-#: Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:1028
msgid "New Passphrase"
msgstr "Nova frase secreta"
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1036
msgid ""
"Are you sure that you really don't want a passphrase?\n"
"This is propably a bad idea, still proceed?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1045 Src/wptPassphraseDlg.cpp:248
-msgid ""
-"The passphrase contains 8-bit characters.\n"
-"It is not suggested to use charset specific characters."
-msgstr ""
-"A frase secreta contém caracteres de 8 bits.\n"
-"Não é sugerito usar caracteres específicos a um conjunto."
-
-#: Src/wptKeyEditDlgs.cpp:1059
+#: Src/wptKeyEditDlgs.cpp:1052
msgid "Change Passwd"
msgstr "Alterar senha"
-#: Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "Passphrase successfully changed."
msgstr "Frase secreta alterada com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1077 Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyEditDlgs.cpp:1070 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Descrição"
-#: Src/wptKeyEditDlgs.cpp:1080
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Expires"
msgstr "Expira"
-#: Src/wptKeyEditDlgs.cpp:1170 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:912
+#: Src/wptKeyEditDlgs.cpp:1163 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "Validade"
-#: Src/wptKeyEditDlgs.cpp:1172
+#: Src/wptKeyEditDlgs.cpp:1165
msgid "Email"
msgstr "E-mail"
-#: Src/wptKeyEditDlgs.cpp:1260
+#: Src/wptKeyEditDlgs.cpp:1253
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2269,15 +2262,15 @@
"CLEAN \t\tremover assinaturas inutilizáveis da chave\r\n"
"MINIMIZE \t\tremover todas as assinaturas da chave\r\n"
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1275
msgid "Key Edit Help"
msgstr "Ajuda de edição de chave"
-#: Src/wptKeyEditDlgs.cpp:1298 Src/wptKeyEditDlgs.cpp:1307
+#: Src/wptKeyEditDlgs.cpp:1291 Src/wptKeyEditDlgs.cpp:1300
msgid "Primary key can not be deleted!"
msgstr "A chave primária não pode ser deletada!"
-#: Src/wptKeyEditDlgs.cpp:1315
+#: Src/wptKeyEditDlgs.cpp:1308
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2294,15 +2287,15 @@
"\n"
"Você realmente deseja excluir essa subchave?"
-#: Src/wptKeyEditDlgs.cpp:1325
+#: Src/wptKeyEditDlgs.cpp:1318
msgid "Delete Subkey"
msgstr "Excluir subchave"
-#: Src/wptKeyEditDlgs.cpp:1329
+#: Src/wptKeyEditDlgs.cpp:1322
msgid "Subkey successfully deleted."
msgstr "Subchave excluída com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1362
+#: Src/wptKeyEditDlgs.cpp:1355
msgid ""
"Key already expired.\n"
"\n"
@@ -2312,19 +2305,19 @@
"\n"
"Você deseja alterar a data de expiração?"
-#: Src/wptKeyEditDlgs.cpp:1371 Src/wptKeyEditDlgs.cpp:1374
+#: Src/wptKeyEditDlgs.cpp:1364 Src/wptKeyEditDlgs.cpp:1367
msgid "Key Expiration Date"
msgstr "Data de expiração da chave"
-#: Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1388
msgid "Expire Subkey"
msgstr "Expirar subchave"
-#: Src/wptKeyEditDlgs.cpp:1400
+#: Src/wptKeyEditDlgs.cpp:1393
msgid "Subkey expire date successfully set."
msgstr "Data de expiração da subchave definida com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1431
+#: Src/wptKeyEditDlgs.cpp:1424
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2337,31 +2330,31 @@
"\n"
"Este comando está disponível apenas para revogar subchaves sozinhas"
-#: Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptKeyEditDlgs.cpp:1433
msgid "Key already revoked."
msgstr "Chave já revogada."
-#: Src/wptKeyEditDlgs.cpp:1457
+#: Src/wptKeyEditDlgs.cpp:1450
msgid "Revoke Subkey"
msgstr "Revogar subchave"
-#: Src/wptKeyEditDlgs.cpp:1461
+#: Src/wptKeyEditDlgs.cpp:1454
msgid "Subkey successfully revoked."
msgstr "Subchave revogada com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1483
+#: Src/wptKeyEditDlgs.cpp:1476
msgid "Revoke user ID"
msgstr "Revogar ID de usuário"
-#: Src/wptKeyEditDlgs.cpp:1488
+#: Src/wptKeyEditDlgs.cpp:1481
msgid "Key has only one user ID."
msgstr "A chave tem apenas uma ID de usuário."
-#: Src/wptKeyEditDlgs.cpp:1499
+#: Src/wptKeyEditDlgs.cpp:1492
msgid "This user ID has been already revoked."
msgstr "Esta ID de usuário já foi revogada."
-#: Src/wptKeyEditDlgs.cpp:1505
+#: Src/wptKeyEditDlgs.cpp:1498
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2372,47 +2365,47 @@
"\n"
"Você realmente deseja revogar essa ID de usuário?"
-#: Src/wptKeyEditDlgs.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr "Revogar ID de usuário"
-#: Src/wptKeyEditDlgs.cpp:1531
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr "ID de usuário revogada com sucesso"
-#: Src/wptKeyEditDlgs.cpp:1571
+#: Src/wptKeyEditDlgs.cpp:1564
msgid "Could not set user ID preferences"
msgstr "Não foi possível definir as preferências da ID de usuário"
-#: Src/wptKeyEditDlgs.cpp:1615
+#: Src/wptKeyEditDlgs.cpp:1608
msgid "Primary"
msgstr "Primária"
-#: Src/wptKeyEditDlgs.cpp:1618
+#: Src/wptKeyEditDlgs.cpp:1611
msgid "User ID successfully flagged"
msgstr "ID de usuário marcada com sucesso"
-#: Src/wptKeyEditDlgs.cpp:1712
+#: Src/wptKeyEditDlgs.cpp:1705
msgid "No preferences available."
msgstr "Nenhuma preferência disponível."
-#: Src/wptKeyEditDlgs.cpp:1716
+#: Src/wptKeyEditDlgs.cpp:1709
msgid "MDC feature"
msgstr "Funcionalidade MDC"
-#: Src/wptKeyEditDlgs.cpp:1718
+#: Src/wptKeyEditDlgs.cpp:1711
msgid "user ID:"
msgstr "ID do usuário"
-#: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1712 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Preferências da chave"
-#: Src/wptKeyEditDlgs.cpp:1784
+#: Src/wptKeyEditDlgs.cpp:1777
msgid "Primary user ID can not be deleted!"
msgstr "A ID de usuário primária não pode ser excluída!"
-#: Src/wptKeyEditDlgs.cpp:1795
+#: Src/wptKeyEditDlgs.cpp:1788
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2427,28 +2420,28 @@
"\n"
"Você realmente deseja excluir esta ID de usuário?"
-#: Src/wptKeyEditDlgs.cpp:1812
+#: Src/wptKeyEditDlgs.cpp:1805
#, fuzzy
msgid "Delete User ID"
msgstr "Excluir ID de usuário"
-#: Src/wptKeyEditDlgs.cpp:1816
+#: Src/wptKeyEditDlgs.cpp:1809
msgid "User ID successfully deleted"
msgstr "ID de usuário excluída com sucesso"
-#: Src/wptKeyEditDlgs.cpp:1907 Src/wptKeyEditDlgs.cpp:1925
+#: Src/wptKeyEditDlgs.cpp:1900 Src/wptKeyEditDlgs.cpp:1918
msgid "Finished to compact key."
msgstr "Compactação da chave concluída."
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1960
msgid "Do you really want to make this sig exportable?"
msgstr "Você realmente deseja tornar esta assinatura exportável?"
-#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyEditDlgs.cpp:1991 Src/wptKeysignDlg.cpp:439
msgid "Key successfully signed."
msgstr "Chave assinada com sucesso."
-#: Src/wptKeyEditDlgs.cpp:2061
+#: Src/wptKeyEditDlgs.cpp:2054
#, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
@@ -2465,27 +2458,27 @@
"Você tem certeza de que deseja criar um certificado de revogação\n"
"que permita revogar a chave listada acima?"
-#: Src/wptKeyEditDlgs.cpp:2105
+#: Src/wptKeyEditDlgs.cpp:2098
msgid "Could not set subkey window procedure."
msgstr "Não foi possível definir a função de janela de subchave."
-#: Src/wptKeyEditDlgs.cpp:2118
+#: Src/wptKeyEditDlgs.cpp:2111
msgid "Could not set user ID window procedure."
msgstr "Não foi possível definir a função de janela de ID de usuário."
-#: Src/wptKeyEditDlgs.cpp:2127
+#: Src/wptKeyEditDlgs.cpp:2120
msgid "Command>"
msgstr "Comando>"
-#: Src/wptKeyEditDlgs.cpp:2130
+#: Src/wptKeyEditDlgs.cpp:2123
msgid "&Revoke..."
msgstr "&Revogar..."
-#: Src/wptKeyEditDlgs.cpp:2173
+#: Src/wptKeyEditDlgs.cpp:2166
msgid "Please select a command."
msgstr "Por favor selecione um comando."
-#: Src/wptKeyEditDlgs.cpp:2177
+#: Src/wptKeyEditDlgs.cpp:2170
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "Esse comando não pode ser usado com chaves PGP 2 (v3).\n"
@@ -2524,8 +2517,8 @@
msgstr "Por favor escolha uma entrada."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:1904 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:1906 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2547,8 +2540,9 @@
#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:410 Src/wptKeygenDlg.cpp:415
#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:432
#: Src/wptKeygenDlg.cpp:440 Src/wptKeygenDlg.cpp:454 Src/wptKeygenDlg.cpp:461
-#: Src/wptKeygenDlg.cpp:470 Src/wptKeygenDlg.cpp:491 Src/wptKeygenDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1771 Src/wptPassphraseDlg.cpp:145
+#: Src/wptKeygenDlg.cpp:471 Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:584
+#: Src/wptKeyManagerDlg.cpp:1773 Src/wptPassphraseDlg.cpp:147
+#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Geração de chave"
@@ -2639,15 +2633,15 @@
msgid "Do you really need such a large key?"
msgstr "Você realmente precisa de uma chave tão grande?"
-#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:560
+#: Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:561
msgid "Please enter the name."
msgstr "Por favor insira o nome."
-#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:566
msgid "Please do not enter the email address in the name field."
msgstr "Por favor não insira o e-mail no campo nome."
-#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:572
+#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr "Por favor insira um e-mail válido."
@@ -2655,31 +2649,31 @@
msgid "Please do NOT enter the email address in the comment field."
msgstr "Por favor NÃO insira o e-mail no campo comentário."
-#: Src/wptKeygenDlg.cpp:469 Src/wptKeyRevokeDlg.cpp:176
+#: Src/wptKeygenDlg.cpp:470 Src/wptKeyRevokeDlg.cpp:176
msgid "Please enter the passphrase."
msgstr "Por favor insira a frase secreta."
-#: Src/wptKeygenDlg.cpp:494 Src/wptKeygenDlg.cpp:603
+#: Src/wptKeygenDlg.cpp:495 Src/wptKeygenDlg.cpp:605
msgid "Key Generation completed"
msgstr "Geração de chaves concluída"
-#: Src/wptKeygenDlg.cpp:537
+#: Src/wptKeygenDlg.cpp:538
msgid "&Prefer RSA keys"
msgstr "&Preferir chaves RSA"
-#: Src/wptKeygenDlg.cpp:538
+#: Src/wptKeygenDlg.cpp:539
msgid "Real name:"
msgstr "Nome real:"
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:540
msgid "Email address:"
msgstr "Endereço de e-mail:"
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:541
msgid "Name and E-Mail Assignment"
msgstr "Atribuição de nome e e-mail"
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:542
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -2689,9 +2683,10 @@
"e-mail permitem a seus correspondentes saber que a chave pública que\n"
"estão usando pertence a nós."
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:543
+#, fuzzy
msgid ""
-"By accosiating an email address with your key pair, you will enable WinPT to "
+"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
"key when communicating with you."
msgstr ""
@@ -2699,17 +2694,17 @@
"seus correspondentes a selecionar a chave pública\n"
"correta ao comunicar-se com você."
-#: Src/wptKeygenDlg.cpp:543 Src/wptKeygenDlg.cpp:561 Src/wptKeygenDlg.cpp:566
-#: Src/wptKeygenDlg.cpp:573 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:599
-#: Src/wptKeyManagerDlg.cpp:1794
+#: Src/wptKeygenDlg.cpp:544 Src/wptKeygenDlg.cpp:562 Src/wptKeygenDlg.cpp:567
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:580 Src/wptKeygenDlg.cpp:601
+#: Src/wptKeyManagerDlg.cpp:1796
msgid "Key Generation Wizard"
msgstr "Assistente de geração de chave"
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:546
msgid "E&xpert"
msgstr "A&vançado"
-#: Src/wptKeygenDlg.cpp:578
+#: Src/wptKeygenDlg.cpp:579
msgid "Please do not add '<' or '>' to the email address."
msgstr "Por favor não adicione '<' ou '>' ao endereço de e-mail."
@@ -2793,12 +2788,12 @@
msgid "key pair"
msgstr "par de chaves"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:911
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1003
msgid "Cipher"
msgstr "Cifragem"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "Confiança"
@@ -3012,202 +3007,202 @@
msgid "3. Key is no longer used"
msgstr "3. Chave não é mais usada"
-#: Src/wptKeyManagerDlg.cpp:483 Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:486 Src/wptKeyManagerDlg.cpp:1023
msgid "Paste Key from Clipboard"
msgstr "Colar chave da área de transferência"
-#: Src/wptKeyManagerDlg.cpp:504
+#: Src/wptKeyManagerDlg.cpp:507
#, c-format
msgid "Default Key: %s"
msgstr "Chave padrão: %s"
-#: Src/wptKeyManagerDlg.cpp:506
+#: Src/wptKeyManagerDlg.cpp:509
#, c-format
msgid "Default Key: 0x%s"
msgstr "Chave padrão: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:527
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d secret keys"
msgstr "%d chaves privadas"
-#: Src/wptKeyManagerDlg.cpp:528
+#: Src/wptKeyManagerDlg.cpp:531
#, c-format
msgid "%d keys"
msgstr "%d chaves"
-#: Src/wptKeyManagerDlg.cpp:965
+#: Src/wptKeyManagerDlg.cpp:968
msgid "Key"
msgstr "Chave"
-#: Src/wptKeyManagerDlg.cpp:966 Src/wptKeyManagerDlg.cpp:1348
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
msgid "Groups"
msgstr "Grupos"
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Send Mail..."
msgstr "Enviar mensagem..."
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:974
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Paste\tCtrl+V"
msgstr "Co&lar\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Search...\tCtrl+F"
msgstr "Localizar...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Select All\tCtrl+A"
msgstr "Selecionar tudo\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Quit"
msgstr "Sai&r"
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:980
msgid "&Expert"
msgstr "&Avançado"
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:981 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "&Delete"
msgstr "E&xcluir"
-#: Src/wptKeyManagerDlg.cpp:983 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
msgid "&Revoke Cert"
msgstr "Certificado de &Revogação"
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
msgid "&List Signatures"
msgstr "&Listar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Listar caminho de confiança"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:989
msgid "&Export..."
msgstr "&Exportar..."
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Import..."
msgstr "&Importar..."
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "&Propriedades"
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:995
msgid "E&xport Secret Key"
msgstr "Exportar &chave privada"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Re&load Key Cache"
msgstr "&Recarregar cache de chaves"
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:997
msgid "R&everify Signatures"
msgstr "Re&verificar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Refresh &Keys (Keyserver)"
msgstr "Recarregar c&haves (servidor)"
-#: Src/wptKeyManagerDlg.cpp:996 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:999 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Sobre o WinPT"
-#: Src/wptKeyManagerDlg.cpp:1015
+#: Src/wptKeyManagerDlg.cpp:1018
msgid "Copy User ID to Clipboard"
msgstr "Copiar ID de usuário para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1016
+#: Src/wptKeyManagerDlg.cpp:1019
msgid "Copy Key ID to Clipboard"
msgstr "Copiar ID da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1017
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy Fingerprint to Clipboard"
msgstr "Copiar impressão digital para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key Info to Clipboard"
msgstr "Copiar informações da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Key to Clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Refresh from Keyserver"
msgstr "Atualizar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Set Implicit &Trust"
msgstr "Definir confiança implíci&ta"
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Enable"
msgstr "&Ativar"
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1033
msgid "&Disable"
msgstr "&Desativar"
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "Re&fresh from Keyserver"
msgstr "Atuali&zar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "Set preferred Keyserver URL"
msgstr "Definir URL do servidor preferido"
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "Send Key to Mail Recipient"
msgstr "Enviar chave a destinatário de correio"
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Set as Default Key"
msgstr "Definir como chave padrão"
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Key..."
msgstr "Chave..."
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "User ID..."
msgstr "ID de usuário..."
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Photo ID..."
msgstr "Foto-ID..."
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Revoker..."
msgstr "Revogador..."
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Key Attributes"
msgstr "Atributos da chave"
-#: Src/wptKeyManagerDlg.cpp:1043
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Add"
msgstr "Adicionar"
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Send to Keyserver"
msgstr "Enviar a servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1320
+#: Src/wptKeyManagerDlg.cpp:1323
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3215,95 +3210,91 @@
"Nenhuma chave com confiança definitiva encontrada.\n"
"Por favor marque ao menos uma chave privada com confiança definitiva."
-#: Src/wptKeyManagerDlg.cpp:1331
+#: Src/wptKeyManagerDlg.cpp:1334
msgid "Could not set keylist window procedure."
msgstr "Não foi possível definir a função de janela da lista de chaves."
-#: Src/wptKeyManagerDlg.cpp:1349
+#: Src/wptKeyManagerDlg.cpp:1352
#, fuzzy
msgid "&Show"
msgstr "&Mostrar a fotografia"
-#: Src/wptKeyManagerDlg.cpp:1350
+#: Src/wptKeyManagerDlg.cpp:1353
#, fuzzy
msgid "&New..."
msgstr "&Abrir..."
-#: Src/wptKeyManagerDlg.cpp:1461
+#: Src/wptKeyManagerDlg.cpp:1464
msgid "Generate new key pair"
msgstr "Gerar novo par de chaves"
-#: Src/wptKeyManagerDlg.cpp:1465
+#: Src/wptKeyManagerDlg.cpp:1468
msgid "Search for a specific key"
msgstr "Localizar chave específica"
-#: Src/wptKeyManagerDlg.cpp:1469
+#: Src/wptKeyManagerDlg.cpp:1472
msgid "Delete key from keyring"
msgstr "Excluir chave do chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1473
+#: Src/wptKeyManagerDlg.cpp:1476
msgid "Show key properties"
msgstr "Exibir propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1480
msgid "Sign key"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1484
msgid "Copy key to clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1488
msgid "Paste key from clipboard"
msgstr "Colar chave da área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1492
msgid "Import key to keyring"
msgstr "Importar chave para o chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1496
msgid "Export key to a file"
msgstr "Exportar chave para um arquivo"
-#: Src/wptKeyManagerDlg.cpp:1622
+#: Src/wptKeyManagerDlg.cpp:1628
msgid "New"
msgstr "Nova"
-#: Src/wptKeyManagerDlg.cpp:1634
+#: Src/wptKeyManagerDlg.cpp:1640
msgid "Could not access public keyring"
msgstr "Não foi possível acessar o chaveiro público"
-#: Src/wptKeyManagerDlg.cpp:1665 Src/wptKeysignDlg.cpp:323
-#: Src/wptKeysignDlg.cpp:337 Src/wptKeysignDlg.cpp:399
-#: Src/wptKeysignDlg.cpp:415 Src/wptKeysignDlg.cpp:432
-#: Src/wptKeysignDlg.cpp:437 Src/wptKeysignDlg.cpp:442
+#: Src/wptKeyManagerDlg.cpp:1672 Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
+#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
+#: Src/wptKeysignDlg.cpp:439
msgid "Key Signing"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1681
+#: Src/wptKeyManagerDlg.cpp:1688
msgid "Key already revoked!"
msgstr "Chave já revogada!"
-#: Src/wptKeyManagerDlg.cpp:1695 Src/wptKeyRevokeDlg.cpp:70
+#: Src/wptKeyManagerDlg.cpp:1702 Src/wptKeyRevokeDlg.cpp:70
#: Src/wptKeyRevokeDlg.cpp:80 Src/wptKeyRevokeDlg.cpp:164
#: Src/wptKeyRevokeDlg.cpp:169 Src/wptKeyRevokeDlg.cpp:177
-#: Src/wptKeyRevokeDlg.cpp:186 Src/wptKeyRevokeDlg.cpp:192
+#: Src/wptKeyRevokeDlg.cpp:187 Src/wptKeyRevokeDlg.cpp:193
msgid "Key Revocation Cert"
msgstr "Certificado de revogação da chave"
-#: Src/wptKeyManagerDlg.cpp:1705
-msgid "It does not make any sense with a key pair!"
-msgstr "Isso não faz nenhum sentido com um par de chaves!"
-
-#: Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1724
msgid "Key Signature List"
msgstr "Lista de assinaturas da chave"
-#: Src/wptKeyManagerDlg.cpp:1739 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1741 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "Propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1749
+#: Src/wptKeyManagerDlg.cpp:1751
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3312,27 +3303,27 @@
"chave...).\n"
"Você realmente quer recarregar o cache de chaves?"
-#: Src/wptKeyManagerDlg.cpp:1779
+#: Src/wptKeyManagerDlg.cpp:1781
msgid "Smart Card support is not available."
msgstr "Suporte a Smart Card indisponível."
-#: Src/wptKeyManagerDlg.cpp:1802 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
msgid "Keyserver Access"
msgstr "Acesso ao servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1819
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "GnuPG Options"
msgstr "Opções do GnuPG"
-#: Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManagerDlg.cpp:1863
msgid "There is no corresponding secret key for this key."
msgstr "Não há chave privada correspondente a essa chave."
-#: Src/wptKeyManagerDlg.cpp:1866
+#: Src/wptKeyManagerDlg.cpp:1868
msgid "You can only export one secret key."
msgstr "Você só pode exportar uma chave secreta."
-#: Src/wptKeyManagerDlg.cpp:1871
+#: Src/wptKeyManagerDlg.cpp:1873
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3350,15 +3341,15 @@
"\n"
"Você realmente deseja exportar essa chave?"
-#: Src/wptKeyManagerDlg.cpp:1876
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "WARNING"
msgstr "ATENÇÃO"
-#: Src/wptKeyManagerDlg.cpp:1937
+#: Src/wptKeyManagerDlg.cpp:1939
msgid "No key was selected, select all by default."
msgstr "Nenhuma chave selecionada, selecionando todas por padrão."
-#: Src/wptKeyManagerDlg.cpp:1942
+#: Src/wptKeyManagerDlg.cpp:1944
#, fuzzy
msgid "Keyserver refresh finished."
msgstr "Procurando no servidor de chaves"
@@ -3485,7 +3476,7 @@
msgid "Please select a reason."
msgstr "Por favor selecione uma razão."
-#: Src/wptKeyRevokeDlg.cpp:191
+#: Src/wptKeyRevokeDlg.cpp:192
msgid "Revocation certificate generated."
msgstr "Certificado de revogação gerado."
@@ -3507,41 +3498,41 @@
msgid "Do you want to retrieve %s via the default keyserver?"
msgstr "Você deseja obter %s pelo servidor de chaves padrão?"
-#: Src/wptKeyserver.cpp:402
+#: Src/wptKeyserver.cpp:435
msgid "Network unreachable"
msgstr ""
-#: Src/wptKeyserver.cpp:405
+#: Src/wptKeyserver.cpp:438
#, fuzzy
msgid "Host unreachable"
msgstr "Servidor:"
-#: Src/wptKeyserver.cpp:408
+#: Src/wptKeyserver.cpp:441
#, fuzzy
msgid "Could not resolve host name"
msgstr "Não foi possível resolver o nome de host"
-#: Src/wptKeyserver.cpp:411
+#: Src/wptKeyserver.cpp:444
msgid "Connection refused"
msgstr ""
-#: Src/wptKeyserver.cpp:415
+#: Src/wptKeyserver.cpp:448
msgid "Connection timeout"
msgstr ""
-#: Src/wptKeyserver.cpp:419
+#: Src/wptKeyserver.cpp:452
msgid "Connection resetted by peer"
msgstr ""
-#: Src/wptKeyserver.cpp:422
+#: Src/wptKeyserver.cpp:455
msgid "Socket has been shutdown"
msgstr ""
-#: Src/wptKeyserver.cpp:600
+#: Src/wptKeyserver.cpp:633
msgid "Could not save keyserver.conf file"
msgstr "Não foi possível salvar o arquivo keyserver.conf"
-#: Src/wptKeyserver.cpp:645
+#: Src/wptKeyserver.cpp:678
msgid ""
"Invalid proxy configuration.You need to set a user and a passwordto use "
"proxy authentication!"
@@ -3549,11 +3540,11 @@
"Configuração de proxy inválida. Você precisa definir um usuário e uma senha "
"para usar a autenticação de proxy!"
-#: Src/wptKeyserver.cpp:648
+#: Src/wptKeyserver.cpp:681
msgid "Proxy Error"
msgstr "Erro do proxy"
-#: Src/wptKeyserver.cpp:673
+#: Src/wptKeyserver.cpp:706
msgid ""
"All entries of this file must have a valid prefix.\n"
"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
@@ -3561,15 +3552,15 @@
"Todas as entradas deste arquivo devem ter um prefixo válido.\n"
"Atualmente, são suportados HKP/HTTP, LDAP e FINGER.\n"
-#: Src/wptKeyserver.cpp:675
+#: Src/wptKeyserver.cpp:708
msgid "Keyserver Error"
msgstr "Erro do servidor de chaves"
-#: Src/wptKeyserver.cpp:694
+#: Src/wptKeyserver.cpp:727
msgid "The keyserver limit is exceeded"
msgstr "O limite do servidor de chaves foi excedido"
-#: Src/wptKeyserver.cpp:695
+#: Src/wptKeyserver.cpp:728
msgid "Keyserver Warning"
msgstr "Aviso do servidor de chaves"
@@ -3860,21 +3851,21 @@
msgid "&Receive Key"
msgstr "&Receber chave"
-#: Src/wptKeysignDlg.cpp:77
+#: Src/wptKeysignDlg.cpp:78
#, c-format
msgid "%d-bit %s key, ID 0x%s"
msgstr ""
-#: Src/wptKeysignDlg.cpp:179
+#: Src/wptKeysignDlg.cpp:180
#, c-format
msgid "Photo of %s"
msgstr ""
-#: Src/wptKeysignDlg.cpp:219 Src/wptKeysignDlg.cpp:382
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
msgid "Choose Signature Class"
msgstr "Escolher classe da assinatura"
-#: Src/wptKeysignDlg.cpp:221
+#: Src/wptKeysignDlg.cpp:224
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -3882,27 +3873,27 @@
"Com quanto cuidado você verificou que a chave que você está para assinar "
"realmente pertence à pessoa? Se você não sabe o que responder, use \"0\"."
-#: Src/wptKeysignDlg.cpp:223
+#: Src/wptKeysignDlg.cpp:226
msgid "(0) I will not answer (default)"
msgstr "(0) Eu não responderei (padrão)"
-#: Src/wptKeysignDlg.cpp:225
+#: Src/wptKeysignDlg.cpp:228
msgid "(1) I have not checked at all."
msgstr "(1) Eu não verifiquei."
-#: Src/wptKeysignDlg.cpp:227
+#: Src/wptKeysignDlg.cpp:230
msgid "(2) I have done causal checking."
msgstr "(2) Eu realizei uma verificação trivial."
-#: Src/wptKeysignDlg.cpp:229
+#: Src/wptKeysignDlg.cpp:232
msgid "(3) I have done very careful checkings."
msgstr "(3) Eu verifiquei muito cuidadosamente."
-#: Src/wptKeysignDlg.cpp:268
+#: Src/wptKeysignDlg.cpp:271
msgid "never"
msgstr "nunca"
-#: Src/wptKeysignDlg.cpp:311
+#: Src/wptKeysignDlg.cpp:313
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -3924,45 +3915,41 @@
"Você tem realmente certeza de que você deseja assinar esta chave com a SUA "
"chave?\n"
-#: Src/wptKeysignDlg.cpp:323
+#: Src/wptKeysignDlg.cpp:325
msgid "No valid secret key found."
msgstr "Nenhuma chave privada válida encontrada."
-#: Src/wptKeysignDlg.cpp:329
+#: Src/wptKeysignDlg.cpp:331
msgid "Sign local only (non exportable signature)"
msgstr "Assinar apenas localmente (assinatura não-exportável)"
-#: Src/wptKeysignDlg.cpp:330
+#: Src/wptKeysignDlg.cpp:332
msgid "Signature expires on"
msgstr "Assinatura expira em"
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:333
msgid "Sign non-revocably"
msgstr "Assinar não-revogavelmente"
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:334
msgid "&Ask for certification level"
msgstr "&Perguntar por nível de certeza"
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:337
msgid "&Show photo"
msgstr "&Mostrar a fotografia"
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:101
+#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
+#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "&Esconder digitação"
-#: Src/wptKeysignDlg.cpp:398
+#: Src/wptKeysignDlg.cpp:399
msgid "You cannot select today as the expiration date."
msgstr "Você não pode selecionar o dia de hoje como data de expiração."
-#: Src/wptKeysignDlg.cpp:415
-msgid "Could not get Key ID from key."
-msgstr "Não foi possível obter o ID da chave."
-
-#: Src/wptKeysignDlg.cpp:436
+#: Src/wptKeysignDlg.cpp:433
msgid "This key is already signed by your key"
msgstr "Essa chave já está assinada pela sua chave"
@@ -3982,51 +3969,51 @@
msgid "Do you want to delete the contents from the clipboard?"
msgstr "Você deseja limpar o conteúdo da área de transferência?"
-#: Src/wptMainProc.cpp:202
+#: Src/wptMainProc.cpp:197
msgid "Could not access secret keyring."
msgstr "Não foi possível acessar o chaveiro secreto."
-#: Src/wptMainProc.cpp:256 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:245 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Entrada de texto"
-#: Src/wptMainProc.cpp:277
+#: Src/wptMainProc.cpp:266
msgid "Unknown OpenPGP type."
msgstr "Tipo desconhecido ao OpenPGP."
-#: Src/wptMainProc.cpp:354
+#: Src/wptMainProc.cpp:344
msgid "Could not set current window mode hooks."
msgstr ""
-#: Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:404
msgid "Edit Clipboard"
msgstr "Editar área de transferência"
-#: Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:405
msgid "About..."
msgstr "Sobre..."
-#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
+#: Src/wptMainProc.cpp:411 Src/wptMainProc.cpp:415
msgid "Decrypt/Verify"
msgstr "Decifrar/Verificar"
-#: Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:425
msgid "Current Window"
msgstr "Janela atual"
-#: Src/wptMainProc.cpp:490
+#: Src/wptMainProc.cpp:482
msgid "Remove all passphrases from cache?"
msgstr "Remover todas as frases secretas do cache?"
-#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:483 Src/wptProgressDlg.cpp:131 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr ""
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:493
msgid "Could not access public keyring, exit WinPT?"
msgstr "Não foi possível acessar o chaveiro público. Sair do WinPT?"
-#: Src/wptMainProc.cpp:534
+#: Src/wptMainProc.cpp:526
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4035,7 +4022,7 @@
"Verifique se a janela contém texto.\n"
"%s."
-#: Src/wptMainProc.cpp:588 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:580 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "Preferências do WinPT"
@@ -4127,7 +4114,7 @@
"Cifragem simétrica.\n"
"Dados cifrados por %s."
-#: Src/wptPassphraseCB.cpp:303
+#: Src/wptPassphraseCB.cpp:306
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4138,7 +4125,7 @@
"o usuário: \"%s\"\n"
"chave %s, ID %s (ID da chave principal %s)\n"
-#: Src/wptPassphraseCB.cpp:309
+#: Src/wptPassphraseCB.cpp:312
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4149,7 +4136,7 @@
"o usuário: \"%s\"\n"
"chave %s, ID %s\n"
-#: Src/wptPassphraseCB.cpp:397
+#: Src/wptPassphraseCB.cpp:400
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -4158,23 +4145,23 @@
"Por favor insira o PIN para destravar sua chave privada do cartão\n"
"Cartão: %s"
-#: Src/wptPassphraseDlg.cpp:89 Src/wptPassphraseDlg.cpp:135
+#: Src/wptPassphraseDlg.cpp:91 Src/wptPassphraseDlg.cpp:137
msgid "Passphrase Dialog"
msgstr "Frase secreta"
-#: Src/wptPassphraseDlg.cpp:94
+#: Src/wptPassphraseDlg.cpp:96
msgid "Repeat Passphrase"
msgstr "Repita a frase secreta"
-#: Src/wptPassphraseDlg.cpp:96
+#: Src/wptPassphraseDlg.cpp:98
msgid "Enter Passphrase"
msgstr "Insira a frase secreta"
-#: Src/wptPassphraseDlg.cpp:134
+#: Src/wptPassphraseDlg.cpp:136
msgid "Please enter a passphrase."
msgstr "Por favor insira uma frase secreta."
-#: Src/wptPassphraseDlg.cpp:142
+#: Src/wptPassphraseDlg.cpp:144
msgid ""
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
@@ -4186,6 +4173,16 @@
"\n"
"Proceder mesmo assim?"
+#: Src/wptPassphraseDlg.cpp:154
+#, fuzzy
+msgid ""
+"The passphrase contains 8-bit characters.\n"
+"It is not suggested to use charset specific characters.\n"
+"Still proceed?"
+msgstr ""
+"A frase secreta contém caracteres de 8 bits.\n"
+"Não é sugerito usar caracteres específicos a um conjunto."
+
#: Src/wptPINDlg.cpp:74
msgid "Please enter a PIN."
msgstr "Por favor insira um PIN"
@@ -4317,7 +4314,7 @@
msgid "Hotkeys"
msgstr "Teclas de atalho"
-#: Src/wptProgressDlg.cpp:122
+#: Src/wptProgressDlg.cpp:131
msgid "Could not create progress thread."
msgstr ""
@@ -4463,6 +4460,12 @@
msgid "Signed"
msgstr "Assinada"
+#~ msgid "It does not make any sense with a key pair!"
+#~ msgstr "Isso não faz nenhum sentido com um par de chaves!"
+
+#~ msgid "Could not get Key ID from key."
+#~ msgstr "Não foi possível obter o ID da chave."
+
#~ msgid "WinPT Verify"
#~ msgstr "Verificação do WinPT"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/ChangeLog 2006-06-19 14:04:31 UTC (rev 229)
@@ -1,3 +1,31 @@
+2006-06-18 Timo Schulz <ts at g10code.de>
+
+ * wptKeygenDlg.cpp (keygen_dlg_proc): Fix typo.
+ * wptClipDecryptDlg.cpp (verify_get_clip_info): New.
+ (verify_get_key_ownertrust): New.
+ (clip_decrypt_dlg_proc): New argument. Change all callers.
+ * wptClipEditDlg.cpp (clip_edit_dlg_proc): Handle the case
+ that the dialog was called with a param.
+ * wptMainProc.cpp (winpt_main_proc): Wait for thread in
+ case of dbl-click.
+
+2006-06-16 Timo Schulz <ts at g10code.de>
+
+ * wptProgressDlg.cpp (wait_for_progress_cb): New.
+ * wptMainProc.cpp (winpt_main_proc): Use this function
+ to disallow to access the cache during synchronisation.
+ * wptKeyManagerDlg.cpp (keymanager_dlg_proc): Likewise.
+ * wptKeyserver.cpp (check_hkp_response): Improved text
+ extraction.
+ (parse_keyserver_error): New.
+ * wptPassphraseDlg.cpp (request_passphrase): Support utf8
+ encoding.
+ * wptKeyEditDlgs.cpp (keyedit_change_passwd): Warn if passhrase
+ needs to be utf8 encoded but still allow it.
+ * wptPassphraseCBDlg.cpp (passphrase_callback_proc): Utf8 support.
+ * wptKeygenDlg.cpp (keygen_dlg_proc): Likewise.
+ * wptKeyRevokeDlg.cpp (keyrevoke_dlg_proc): Likewise.
+
2006-06-15 Timo Schulz <ts at g10code.de>
* wptVerList.cpp (verlist_build): Use icons.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/WinPT-en.rc 2006-06-19 14:04:31 UTC (rev 229)
@@ -88,7 +88,7 @@
GROUPBOX "",IDC_STATIC,3,51,264,9
LTEXT "&Real name:",IDC_KEYWIZARD_NAMEINF,15,69,37,8
EDITTEXT IDC_KEYWIZARD_NAME,67,67,189,12,ES_AUTOHSCROLL
- LTEXT "By accosiating an email address with your key pair, you will enable WinPT to assist your correspondents in selecting the correct public\nkey when communicating with you.",
+ LTEXT "By associating an email address with your key pair, you will enable WinPT to assist your correspondents in selecting the correct public\nkey when communicating with you.",
IDC_KEYWIZARD_TEXT2INF,15,91,217,24
LTEXT "&Email address:",IDC_KEYWIZARD_EMAILINF,15,125,46,8
EDITTEXT IDC_KEYWIZARD_EMAIL,67,123,190,12,ES_AUTOHSCROLL
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -93,6 +93,56 @@
}
+/* Return humand readable ownertrust description for verification info. */
+const char*
+verify_get_key_ownertrust (gpgme_validity_t key_ot, int *novalid)
+{
+ const char *s;
+
+ if (key_ot == GPGME_VALIDITY_FULL ||
+ key_ot == GPGME_VALIDITY_ULTIMATE)
+ s = _("Signature status: created with a fully trusted key");
+ else if (key_ot == GPGME_VALIDITY_MARGINAL)
+ s = _("Signature status: created with a marginal trusted key");
+ else if (key_ot == GPGME_VALIDITY_NEVER) {
+ if (novalid) *novalid = 1;
+ s = _("Signature status: created with an UNTRUSTED key");
+ }
+ else
+ s = _("Signature status: created with an undefined trusted key");
+ return s;
+}
+
+
+/* Return a signature specific header and footer for the clipboard. */
+void
+verify_get_clip_info (gpgme_signature_t sig, char **r_header, char **r_footer)
+{
+ struct winpt_key_s pk;
+ const char *head = "***** BEGIN PGP SIGNED TEXT *****\r\n"
+ "***** Signature made %s using key ID 0x%s\r\n"
+ "***** %s\r\n"
+ "***** \"%s\" from %s\r\n";
+ const char *foot = "***** END PGP SIGNED TEXT *****";
+ const char *s, *made, *ot;
+ char *p;
+
+ if (winpt_get_pubkey (sig->fpr, &pk))
+ BUG (0);
+ ot = verify_get_key_ownertrust (pk.ctx->owner_trust, NULL);
+ made = strtimestamp (sig->timestamp);
+ s = get_gpg_sigstat (sig->summary);
+ p = new char[strlen (head) + strlen (s) + strlen (made) +
+ strlen (sig->fpr) + strlen (ot) +
+ strlen (pk.ext->uids->uid) + 1];
+ if (!p)
+ BUG (0);
+ sprintf (p, head, made, get_keyid_from_fpr (sig->fpr), ot, s, pk.ext->uids->uid);
+ *r_header = p;
+ *r_footer = m_strdup (foot);
+}
+
+
/* Show a human readable description of the given signature @sig. */
void
verify_show_signature_state (gpgme_signature_t sig)
@@ -109,20 +159,8 @@
keyid = get_keyid_from_fpr (sig->fpr);
memset (&key, 0, sizeof (key));
- pka_info = get_pka_status (sig);
-
if (!winpt_get_pubkey (keyid, &key)) {
- if (key.ctx->owner_trust == GPGME_VALIDITY_FULL ||
- key.ctx->owner_trust == GPGME_VALIDITY_ULTIMATE)
- s = _("Signature Status: Created with a fully trusted key");
- else if (key.ctx->owner_trust == GPGME_VALIDITY_MARGINAL)
- s = _("Signature Status: Created with a marginal trusted key");
- else if (key.ctx->owner_trust == GPGME_VALIDITY_NEVER) {
- novalid = 1;
- s = _("Signature Status: Created with an UNTRUSTED key");
- }
- else
- s = _("Signature Status: Created with an undefined trusted key");
+ s = verify_get_key_ownertrust (key.ctx->owner_trust, &novalid);
uid = key.ext->uids->uid;
}
else {
@@ -130,6 +168,7 @@
uid = _("user ID not found");
}
+ pka_info = get_pka_status (sig);
log_box (_("Decrypt Verify"), novalid? MB_WARN : MB_OK,
_("%s\n"
"%s\n"
@@ -152,7 +191,7 @@
@hwnd is the parent window used for showing messsages.
Return value: 0 on success. */
gpgme_error_t
-clip_decrypt_dlg (HWND hwnd)
+clip_decrypt_dlg (HWND hwnd, int use_viewer)
{
gpgme_error_t err;
gpgme_ctx_t ctx = NULL;
@@ -219,9 +258,15 @@
show_msg (GetDesktopWindow (), 1500, _("GnuPG Status: Finished"));
sigres = gpgme_op_verify_result (ctx);
- if (sigres && sigres->signatures)
- verify_show_signature_state (sigres->signatures);
-
+ if (sigres && sigres->signatures) {
+ if (!use_viewer)
+ verify_show_signature_state (sigres->signatures);
+ else
+ DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_CLIPEDIT,
+ hwnd, clip_edit_dlg_proc,
+ (LPARAM)sigres->signatures);
+ }
+
leave:
release_gpg_passphrase_cb (&pwd);
gpgme_release (ctx);
Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptClipEditDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -31,6 +31,9 @@
#include "wptGPG.h"
#include "wptNLS.h"
#include "resource.h"
+#include "wptCommonCtl.h"
+#include "wptContext.h"
+#include "wptKeylist.h"
#ifdef _MSC_VER
#include "winpt_header.h"
@@ -46,13 +49,15 @@
/* Load the clipboard contents into the text field in @dlg.
+ Optinally @header and @footer can be used to set a header and footer.
Return value: 0 on success. */
static int
-load_clipboard (HWND dlg)
+load_clipboard (HWND dlg,
+ const char *header, const char *footer)
{
HANDLE clipmem;
char *cliptext;
- char *p;
+ char *p, *pp;
CloseClipboard (); /* make sure it is closed. */
if (OpenClipboard (NULL) == FALSE) {
@@ -78,9 +83,21 @@
GlobalUnlock (clipmem);
CloseClipboard ();
- SetDlgItemText (dlg, IDC_CLIPEDIT_CLIPTEXT2, p);
+
+ if (header && footer) {
+ const char *fmt = "%s\r\n%s\r\n%s";
+ int len = strlen (header) + strlen (footer) + strlen (fmt) + strlen (p);
+
+ pp = new char[len + 1];
+ if (!pp)
+ BUG (0);
+ _snprintf (pp, len, fmt, header, p, footer);
+ SetDlgItemText (dlg, IDC_CLIPEDIT_CLIPTEXT2, pp);
+ free_if_alloc (pp);
+ }
+ else
+ SetDlgItemText (dlg, IDC_CLIPEDIT_CLIPTEXT2, p);
free_if_alloc (p);
-
return 0;
}
@@ -186,10 +203,15 @@
}
+void verify_get_clip_info (gpgme_signature_t sig,
+ char **r_header, char **r_footer);
+
/* Dialog box procedure for the clipboard editor. */
BOOL CALLBACK
clip_edit_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
+ char *head=NULL, *foot=NULL;
+
switch (msg) {
case WM_INITDIALOG:
SetWindowText (dlg, _("Clipboard Editor"));
@@ -199,8 +221,13 @@
SetDlgItemText (dlg, IDC_CLIPEDIT_SAVE, _("&Save"));
SetDlgItemText (dlg, IDC_CLIPEDIT_QUOTE, _("Add quotes"));
SetDlgItemText (dlg, IDOK, _("&Close"));
-
- load_clipboard (dlg);
+ /* If there is a param, we expect a signature and initialize
+ the header and footer variable accordingly. */
+ if (lparam)
+ verify_get_clip_info ((gpgme_signature_t)lparam, &head, &foot);
+ load_clipboard (dlg, head, foot);
+ free_if_alloc (head);
+ free_if_alloc (foot);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
return TRUE;
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -1020,11 +1020,13 @@
}
if (k->is_protected) {
- old_pass = request_passphrase (_("Current (old) Passphrase"), 1, &cancel);
+ old_pass = request_passphrase (_("Current (old) Passphrase"),
+ PASSDLG_INIT, &cancel);
if (cancel)
return FALSE;
}
- new_pass = request_passphrase2 (_("New Passphrase" ), 1, &cancel);
+ new_pass = request_passphrase2 (_("New Passphrase" ),
+ PASSDLG_INIT|PASSDLG_WARN_UTF8, &cancel);
if (cancel) {
sfree_if_alloc (old_pass);
return FALSE;
@@ -1041,15 +1043,6 @@
}
}
- if (is_8bit_string (new_pass)) {
- msg_box (dlg, _("The passphrase contains 8-bit characters.\n"
- "It is not suggested to use charset specific characters."),
- _("Key Edit"), MB_ERR);
- sfree_if_alloc (old_pass);
- sfree_if_alloc (new_pass);
- return FALSE;
- }
-
ke = create_GpgKeyEdit (k->keyid);
ke->setPassphrase (k->is_protected? old_pass : NULL);
if (!k->is_protected)
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -172,11 +172,12 @@
}
-#define ico2idx(ico) imagelist_getindex((ico))
+#define ico2idx(ico) imagelist_getindex ((ico))
+/* Create a new toolbar window with a pre-defined list of buttons. */
static HWND
-load_toolbar (HWND dlg, struct km_info_s *kmi)
-{
+create_toolbar (HWND dlg, struct km_info_s *kmi)
+{
HWND tbwnd;
TBSAVEPARAMS tbsp;
TBBUTTON tb_buttons[] = {
@@ -190,26 +191,28 @@
{ico2idx (IMI_KEY_FILE_EXPORT), ID_KEYMISC_EXPORT, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
{ico2idx (IMI_KEY_IMPORT), ID_KEYCTX_PASTE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
{ico2idx (IMI_KEY_EXPORT), ID_KEYCTX_COPY, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
- };
-
+ };
+
tbwnd = CreateWindowEx (0, TOOLBARCLASSNAME, NULL,
WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT|CCS_ADJUSTABLE,
0, 0, 0, 0, dlg, (HMENU)IDR_WINPT_KMTB, glob_hinst, NULL);
- if (tbwnd) {
- SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
- SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
- SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
- ShowWindow (tbwnd, SW_SHOW);
+ if (!tbwnd)
+ BUG (0);
+ SendMessage (tbwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
+ SendMessage (tbwnd, TB_SETIMAGELIST, 0, (LPARAM)glob_imagelist);
+ SendMessage (tbwnd, TB_AUTOSIZE, 0, 0);
+ ShowWindow (tbwnd, SW_SHOW);
- /* Restore toolbar */
- tbsp.hkr = HKEY_CURRENT_USER;
- tbsp.pszSubKey = "Software\\WinPT";
- tbsp.pszValueName = "KM_toolbar";
- if (SendMessage(tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp ) == 0)
- SendMessage (tbwnd, TB_ADDBUTTONS, sizeof(tb_buttons) / sizeof(tb_buttons[0]),
- (LONG)&tb_buttons[0]);
- }
- return tbwnd;
+ /* Restore toolbar */
+ tbsp.hkr = HKEY_CURRENT_USER;
+ tbsp.pszSubKey = "Software\\WinPT";
+ tbsp.pszValueName = "KM_toolbar";
+ if (SendMessage (tbwnd, TB_SAVERESTORE, FALSE, (LPARAM)&tbsp) == 0)
+ SendMessage (tbwnd, TB_ADDBUTTONS,
+ sizeof (tb_buttons) / sizeof (tb_buttons[0]),
+ (LONG)&tb_buttons[0]);
+
+ return tbwnd;
}
@@ -1335,7 +1338,7 @@
}
kmi->statbar = setup_status_bar (dlg, kmi->lv);
SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
- kmi->toolbar = load_toolbar (dlg, kmi);
+ kmi->toolbar = create_toolbar (dlg, kmi);
kmi->dlg = dlg;
do_center_window (dlg, kmi);
@@ -1504,6 +1507,7 @@
break;
case NM_RCLICK:
+ wait_for_progress_cb ();
if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
l_idx =listview_get_curr_pos (kmi->lv);
if (l_idx == -1)
@@ -1572,6 +1576,8 @@
if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
NMLISTVIEW *nft = (LPNMLISTVIEW) lparam;
int sortby = 0;
+
+ wait_for_progress_cb ();
switch (nft->iSubItem) {
case 0: sortby = KEY_SORT_USERID; break;
case 1: sortby = KEY_SORT_KEYID; break;
@@ -1581,7 +1587,7 @@
case 6: sortby = KEY_SORT_OTRUST; break;
case 7: sortby = KEY_SORT_CREATED; break;
case 8: sortby = KEY_SORT_ALGO; break;
- default: return TRUE; //sortby = KEY_SORT_USERID; break;
+ default: return TRUE; /*sortby userid.*/
}
if ((kmi->keylist_sortby & ~KEYLIST_SORT_DESC) == sortby)
@@ -1636,6 +1642,7 @@
return FALSE;
}
+ /*wait_for_progress_cb ();*/
switch (LOWORD (wparam)) {
case ID_KEYMISC_QUIT:
EndDialog (dlg, TRUE);
@@ -1701,11 +1708,6 @@
return TRUE;
}
km_get_key (kmi->lv, kmi->lv_idx, &k);
- if (!k.key_pair) {
- msg_box (dlg, _("It does not make any sense with a key pair!"),
- _("Key Manager"), MB_ERR);
- return TRUE;
- }
dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg,
keytrust_dlg_proc, (LPARAM)&k,
_("List Trust Path"), IDS_WINPT_KEYTRUST);
@@ -2076,12 +2078,6 @@
case ID_GROUP_SHOW:
/* XXX: Implement group manager. */
return TRUE;
-
- /*
- case IDCANCEL:
- EndDialog (dlg, TRUE);
- return TRUE;
- */
}
break;
Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeyRevokeDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -129,7 +129,7 @@
HWND list;
int idx, use_desc;
char file[256];
- char pwd[256];
+ char *pwd=NULL;
char *desc=NULL;
char *inp_data = NULL, *revcert=NULL;
const char *warning =
@@ -172,7 +172,7 @@
use_desc = 1;
if (!GetDlgItemText_utf8 (dlg, IDC_KEYREVOKE_TEXT, &desc))
use_desc = 0;
- if (!GetDlgItemText (dlg, IDC_KEYREVOKE_PWD, pwd, sizeof (pwd)-1)) {
+ if (!GetDlgItemText_utf8 (dlg, IDC_KEYREVOKE_PWD, &pwd)) {
msg_box (dlg, _("Please enter the passphrase."),
_("Key Revocation Cert"), MB_ERR);
return TRUE;
@@ -182,6 +182,7 @@
err = gpg_revoke_cert (k->internal, inp_data, k->keyid, &revcert);
sfree_if_alloc (inp_data);
sfree_if_alloc (desc);
+ sfree_if_alloc (pwd);
if (err) {
msg_box (dlg, gpgme_strerror (err), _("Key Revocation Cert"), MB_ERR);
safe_free (revcert);
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeygenDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -1,5 +1,5 @@
/* wptKeygenDlg.cpp - Key Generation dialog
- * Copyright (C) 2000-2005 Timo Schulz
+ * Copyright (C) 2000-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -458,7 +458,8 @@
expire = t;
}
- pwd = request_passphrase2 (_("Key Generation"), PASSDLG_STRICT, &cancel);
+ pwd = request_passphrase2 (_("Key Generation"),
+ PASSDLG_STRICT|PASSDLG_WARN_UTF8, &cancel);
if (cancel) {
sfree_if_alloc (pwd);
free_if_alloc (utf8_name);
@@ -539,7 +540,7 @@
SetDlgItemText (dlg, IDC_KEYWIZARD_EMAILINF, _("Email address:"));
SetDlgItemText (dlg, IDC_KEYWIZARD_TITLEINF, _("Name and E-Mail Assignment"));
SetDlgItemText (dlg, IDC_KEYWIZARD_TEXT1INF, _("Every key pair must have a name associated with it. The name and\nemail address let your correspondents that your public key they are\nusing belongs to us."));
- SetDlgItemText (dlg, IDC_KEYWIZARD_TEXT2INF, _("By accosiating an email address with your key pair, you will enable WinPT to assist your correspondents in selecting the correct public\nkey when communicating with you."));
+ SetDlgItemText (dlg, IDC_KEYWIZARD_TEXT2INF, _("By associating an email address with your key pair, you will enable WinPT to assist your correspondents in selecting the correct public\nkey when communicating with you."));
SetWindowText (dlg, _("Key Generation Wizard"));
SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
SetDlgItemText (dlg, IDC_KEYWIZARD_EXPERT, _("E&xpert"));
@@ -580,7 +581,8 @@
free_if_alloc (utf8_name);
return FALSE;
}
- pass = request_passphrase2 (_("Key Generation"), PASSDLG_STRICT, &cancel);
+ pass = request_passphrase2 (_("Key Generation"),
+ PASSDLG_STRICT|PASSDLG_WARN_UTF8, &cancel);
if (cancel) {
free_if_alloc (utf8_name);
return FALSE;
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeyserver.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -160,32 +160,65 @@
return hostname;
}
+/* Parse the keyserver response and extract the human
+ readable text passages. */
+static int
+parse_keyserver_error (const char *resp, char *txt, size_t txtlen)
+{
+ char *p, *p2;
+ /* If we find no 'Error' substring, we assume a success. */
+ if (!stristr (resp, "Error"))
+ return 0;
+
+ memset (txt, 0, txtlen);
+ p = strstr (resp, "\r\n\r\n");
+ if (!p)
+ return -1;
+ resp += (p-resp);
+ p = strstr (resp, "<h1>");
+ if (!p)
+ return -1;
+ resp += (p-resp)+strlen ("<h1>");
+ p = strstr (resp, "</h1>");
+ if (!p)
+ return -1;
+ resp += (p-resp)+strlen ("</h1>");
+ p2 = strstr (resp, "</body>");
+ if (p2 != NULL)
+ memcpy (txt, resp, (p2-resp));
+ else {
+ if (!strnicmp (resp, "<p>", 3))
+ resp += 3;
+ while (resp && *resp == '\r' || *resp == '\n')
+ resp++;
+ memcpy (txt, resp, strlen (resp));
+ }
+ return 0;
+}
+
+
/* Check that the keyserver response indicates an OK.
Return 0 on success. */
static int
check_hkp_response (const char *resp, int recv)
-{
- char *p, *end;
- int ec, len;
+{
+ int ec;
log_debug ("check_hkp_response: '%s'\r\n", resp);
ec = recv ? WPTERR_WINSOCK_RECVKEY : WPTERR_WINSOCK_SENDKEY;
if (!strstr (resp, "HTTP/1.0 200 OK") &&
- !strstr (resp, "HTTP/1.1 200 OK")) /* http error */
+ !strstr (resp, "HTTP/1.1 200 OK") &&
+ !strstr (resp, "HTTP/1.0 500 OK") &&
+ !strstr (resp, "HTTP/1.1 500 OK"))
+ return ec; /* http error */
+
+ if (parse_keyserver_error (resp, hkp_errmsg, sizeof (hkp_errmsg)-2)) {
+ if (!strlen (hkp_errmsg))
+ _snprintf (hkp_errmsg, sizeof (hkp_errmsg)-1,
+ "Unknown keyserver error");
+ hkp_err = 1;
return ec;
- if (strstr (resp, "Public Key Server -- Error")
- || strstr (resp, "Public Key Server -- Error")
- || strstr (resp, "No matching keys in database")) {
- p = strstr (resp, "<p>");
- if (p && strlen (p) < sizeof (hkp_errmsg)-1) {
- end = strstr (p, "</p>");
- len = end? (end - p + 1) : strlen (p);
- memset (hkp_errmsg, 0, sizeof (hkp_errmsg));
- strncpy (hkp_errmsg, p, len);
- hkp_err = 1;
- }
- return ec;
}
return 0;
}
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptKeysignDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -24,6 +24,7 @@
#include <windows.h>
#include <commctrl.h>
#include <time.h>
+#include <assert.h>
#include "resource.h"
#include "wptGPG.h"
@@ -168,7 +169,7 @@
showphoto_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
static winpt_key_t key;
- char buf[100];
+ char buf[200];
switch (msg) {
case WM_INITDIALOG:
@@ -212,10 +213,12 @@
BOOL CALLBACK
sig_class_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
+ HWND parent;
int sig_class = 0;
switch (msg) {
case WM_INITDIALOG:
+ parent = (HWND)lparam;
SetWindowText (dlg, _("Choose Signature Class"));
SetDlgItemText (dlg, IDC_SIGCLASS_TITLEINF,
_("How carefully have you verified the key you are about to sign actually belongs to the person? If you don't know what to anwser, use \"0\"."));
@@ -229,7 +232,7 @@
_("(3) I have done very careful checkings."));
CheckDlgButton (dlg, IDC_SIGCLASS_CLASS0, BST_CHECKED);
SetForegroundWindow (dlg);
- center_window (dlg, NULL);
+ center_window (dlg, parent? parent : NULL);
return TRUE;
case WM_COMMAND:
@@ -296,8 +299,7 @@
gpgme_error_t err;
gpgme_key_t k;
SYSTEMTIME st;
- HWND h;
- char keymsg[2048], pwd[256];
+ char keymsg[2048], *pwd;
const char *keyid, *s;
int type, expires=0, idx;
int sig_class = 0;
@@ -349,8 +351,7 @@
EnableWindow (GetDlgItem (dlg, IDC_KEYSIGN_EXPSIG), FALSE);
CheckDlgButton (dlg, IDC_KEYSIGN_HIDE, BST_CHECKED);
SetForegroundWindow (dlg);
- h = GetDlgItem (dlg, IDC_KEYSIGN_PASSPHRASE);
- SetFocus (h);
+ SetFocus (GetDlgItem (dlg, IDC_KEYSIGN_PASSPHRASE));
return FALSE;
case WM_COMMAND:
@@ -378,7 +379,7 @@
if (IsDlgButtonChecked (dlg, IDC_KEYSIGN_ASKLEVEL))
sig_class = dialog_box_param (glob_hinst,
(LPCSTR)IDD_WINPT_SIGCLASS, dlg,
- sig_class_dlg_proc, (LPARAM)NULL,
+ sig_class_dlg_proc, (LPARAM)dlg,
_("Choose Signature Class"),
IDS_WINPT_SIGCLASS);
type = IsDlgButtonChecked (dlg, IDC_KEYSIGN_LOCAL);
@@ -408,13 +409,9 @@
if an advanced button is checked and offer to add it to the config
file. */
- GetDlgItemText (dlg, IDC_KEYSIGN_PASSPHRASE, pwd, DIM (pwd)-1);
+ GetDlgItemText_utf8 (dlg, IDC_KEYSIGN_PASSPHRASE, &pwd);
keyid = key->ctx->subkeys->keyid;
- if (!keyid) {
- wipememory (pwd, sizeof (pwd));
- msg_box (dlg, _("Could not get Key ID from key."), _("Key Signing"), MB_ERR);
- return TRUE;
- }
+ assert (keyid != NULL); /* should be always true. */
ke = new GpgKeyEdit (keyid);
if (!ke)
BUG (NULL);
@@ -426,7 +423,7 @@
ke->setLocalUser (k);
err = ke->signKey (type, sig_class, expires? keymsg : "0");
- wipememory (pwd, sizeof (pwd));
+ sfree_if_alloc (pwd);
if (err) {
delete ke;
msg_box (dlg, gpgme_strerror (err), _("Key Signing"), MB_ERR);
Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptMainProc.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -164,17 +164,12 @@
msg_box (hwnd, gpgme_strerror (err), _("Clipboard"), MB_ERR);
break;
}
- if( (type & PGP_MESSAGE) && !(type & PGP_CLEARSIG) ) {
+ if ((type & PGP_MESSAGE) && !(type & PGP_CLEARSIG)) {
/* It makes only sense to insert the data in the window if it's
really a ciphertext. Verfied data doesn't need this. */
- err = clip_decrypt_dlg (hwnd);
- if (!err && reg_prefs.use_viewer) {
- dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_CLIPEDIT,
- GetDesktopWindow(), clip_edit_dlg_proc, 0,
- _("Clipboard Editor"), IDS_WINPT_CLIPEDIT);
- if (ret_set)
- *ret_set = 0;
- }
+ err = clip_decrypt_dlg (hwnd, reg_prefs.use_viewer);
+ if (!err && ret_set)
+ *ret_set = 0;
}
else if ((type & PGP_PUBKEY) && !(type & PGP_CLEARSIG))
km_clip_import (GetDesktopWindow (), NULL, NULL);
@@ -232,15 +227,9 @@
msg_box( hwnd, gpgme_strerror( err ), _("Clipboard"), MB_ERR );
break;
}
- if( (type & PGP_MESSAGE) && !(type & PGP_CLEARSIG) ) {
- err = clip_decrypt_dlg (hwnd);
- if (!err && reg_prefs.use_viewer) {
- dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_CLIPEDIT,
- GetDesktopWindow(), clip_edit_dlg_proc, 0,
- _("Clipboard Editor"), IDS_WINPT_CLIPEDIT );
- }
- }
- else if( (type & PGP_SIG) && !(type & PGP_CLEARSIG) ) {
+ if((type & PGP_MESSAGE) && !(type & PGP_CLEARSIG))
+ err = clip_decrypt_dlg (hwnd, reg_prefs.use_viewer);
+ else if ((type & PGP_SIG) && !(type & PGP_CLEARSIG)) {
text_input_s input;
gpgme_data_t sig;
@@ -312,6 +301,7 @@
}
+/* Initialize all needed common controls. */
static void
init_common_controls (void)
{
@@ -400,6 +390,7 @@
gpg_read_only = gpg_check_permissions (0) == 0? 0 : 1;
+ wait_for_progress_cb ();
SetForegroundWindow (hwnd);
GetCursorPos (&p);
hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT));
@@ -441,6 +432,7 @@
break;
case WM_LBUTTONDBLCLK:
+ wait_for_progress_cb ();
gpg_read_only = gpg_check_permissions (0) == 0? 0 : 1;
SendMessage (hwnd, WM_COMMAND, ID_WINPT_KEY, 0);
break;
@@ -449,7 +441,7 @@
case WM_HOTKEY:
cmd = 0;
- switch( wparam ) {
+ switch (wparam) {
case WPT_CLIP_ENCRYPT_ID:
SendMessage( hwnd, WM_COMMAND, ID_WINPT_ENCRYPT, 0 );
break;
Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptPassphraseCB.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -213,11 +213,14 @@
strcpy (c->pwd, "");
}
else {
- c->pwd = new char[n+2];
- if (!c->pwd)
+ char *p = new char[n+2];
+ if (!p)
BUG (NULL);
- SafeGetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd),
- c->pwd, n+1);
+ /* Get the passphrase and convert it utf8.
+ This does not just the us-ascii charset. */
+ SafeGetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd), p, n+1);
+ c->pwd = native_to_utf8 (p);
+ sfree_if_alloc (p);
}
res = gpgme_op_decrypt_result (c->gpg);
if (!res)
Modified: trunk/Src/wptPassphraseDlg.cpp
===================================================================
--- trunk/Src/wptPassphraseDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptPassphraseDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -41,6 +41,7 @@
int strict; /* Do a simple check how good the passphrase is. */
int repeat; /* Indicate last try was wrong. */
int cancel; /* 1 if user cancelled operation. */
+ int warn_utf8;
int not_empty;
gpgme_key_t key;
};
@@ -80,6 +81,7 @@
{
static passphrase_s *pwd;
int nbytes;
+ int cancel;
switch (msg) {
case WM_INITDIALOG:
@@ -146,6 +148,18 @@
if (id == IDNO)
return TRUE;
}
+ if (pwd->warn_utf8 && !pwd->repeat &&
+ is_8bit_string (pwd->pwd)) {
+ cancel = msg_box (dlg,
+ _("The passphrase contains 8-bit characters.\n"
+ "It is not suggested to use charset specific characters.\n"
+ "Still proceed?"),
+ _("Key Generation"), MB_ICONWARNING|MB_YESNO);
+ if (cancel == IDNO) {
+ wipememory (pwd->pwd, sizeof (pwd->pwd));
+ return TRUE;
+ }
+ }
SetDlgItemText (dlg, IDC_PASSWD_PWD, "");
EndDialog (dlg, 1);
return TRUE;
@@ -204,6 +218,7 @@
pass.repeat = flags & PASSDLG_INIT? 0 : 1;
pass.strict = flags & PASSDLG_STRICT? 1 : 0;
pass.not_empty = flags & PASSDLG_NOTEMPTY? 1: 0;
+ pass.warn_utf8 = flags & PASSDLG_WARN_UTF8? 1 : 0;
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_PASSWD, glob_hwnd,
passwd_dlg_proc, (LPARAM)&pass);
free_if_alloc (pass.title);
@@ -211,7 +226,7 @@
*ret_cancel = 1;
return NULL;
}
- p = m_strdup (pass.pwd);
+ p = native_to_utf8 (pass.pwd);
wipememory (pass.pwd, sizeof (pass.pwd));
return p;
}
@@ -243,18 +258,8 @@
sfree_if_alloc (pass1);
sfree_if_alloc (pass2);
}
- else {
- if (is_8bit_string (pass1)) {
- msg_box (NULL, _("The passphrase contains 8-bit characters.\n"
- "It is not suggested to use charset specific characters."),
- title, MB_ERR);
- equal = 0;
- sfree_if_alloc (pass1);
- sfree_if_alloc (pass2);
- }
- else
- equal = 1;
- }
+ else
+ equal = 1;
}
sfree_if_alloc (pass2);
*ret_cancel = 0;
Modified: trunk/Src/wptProgressDlg.cpp
===================================================================
--- trunk/Src/wptProgressDlg.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptProgressDlg.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -17,7 +17,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -34,22 +33,21 @@
#include "wptVersion.h"
#include "wptErrors.h"
-/* Handle to the dialog window. */
-static HWND progress_dlg = NULL;
+/* It is not possible that there are two instance of a progress
+ thread, thus we use a 'const' handle for external synchronisation. */
+static HANDLE curr_thread = NULL;
-
/* Dialog procedure to show the progress of an operation. */
static BOOL CALLBACK
progress_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
- static progress_filter_s * pfx = NULL;
+ static progress_filter_s *pfx = NULL;
switch (msg) {
case WM_INITDIALOG:
pfx = (struct progress_filter_s *)lparam;
if (!pfx)
BUG (0);
- progress_dlg = dlg;
pfx->dlg = dlg;
SendDlgItemMessage (dlg, IDC_PROGRESS_BAR,
PBM_SETRANGE, 0, MAKELPARAM (0, 100));
@@ -84,7 +82,6 @@
void
progress_cleanup (progress_filter_s *pfx)
{
- EndDialog (progress_dlg, TRUE);
if (!pfx)
return;
if (pfx->dlg) {
@@ -95,13 +92,24 @@
CloseHandle (pfx->thread_hd);
pfx->thread_hd = NULL;
}
+ curr_thread = NULL;
pfx->curr = 0;
pfx->total = 0;
pfx->error = 0;
- memset (pfx, 0, sizeof *pfx); /*XXX: does this really work? */
+ memset (pfx, 0, sizeof *pfx);
}
+/* Wait until the progress thread terminates. */
+void
+wait_for_progress_cb (void)
+{
+ if (!curr_thread)
+ return;
+ WaitForSingleObject (curr_thread, INFINITE);
+}
+
+
/* Generic callback for operations with a progress bar. */
void
progress_callback (void *opaque, const char *what, int type, int off, int max)
@@ -117,20 +125,22 @@
pfx->curr = off;
pfx->total = max;
if (!off && !pfx->thread_hd) {
- pfx->thread_hd = CreateThread (NULL, 0, progress_cb_thread, (void *)pfx, 0, &tid);
+ pfx->thread_hd = CreateThread (NULL, 0, progress_cb_thread,
+ (void *)pfx, 0, &tid);
if (!pfx->thread_hd) {
msg_box (NULL, _("Could not create progress thread."), _("WinPT"), MB_ERR);
pfx->error = 1;
return;
}
+ curr_thread = pfx->thread_hd;
log_debug ("progress_callback: started thread %08lX\r\n", tid);
}
else if (pfx->dlg != NULL) {
size_t n = pfx->curr * 100 / pfx->total;
- SendDlgItemMessage (pfx->dlg, IDC_PROGRESS_BAR, PBM_SETPOS, (WPARAM)n, 0);
+ SendDlgItemMessage (pfx->dlg, IDC_PROGRESS_BAR,
+ PBM_SETPOS, (WPARAM)n, 0);
SetDlgItemInt (pfx->dlg, IDC_PROGRESS_CURR, pfx->curr, FALSE);
}
- if (off >= max) {
+ if (off >= max)
progress_cleanup (pfx);
- }
}
Modified: trunk/Src/wptSafeEditCtrl.cpp
===================================================================
--- trunk/Src/wptSafeEditCtrl.cpp 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/Src/wptSafeEditCtrl.cpp 2006-06-19 14:04:31 UTC (rev 229)
@@ -247,3 +247,5 @@
SendDlgItemMessage (dlg, id, WM_SAFE_GETTEXT, (WPARAM)buf, (LPARAM)buflen);
return strlen (buf);
}
+
+
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/THANKS 2006-06-19 14:04:31 UTC (rev 229)
@@ -35,6 +35,7 @@
David Vallier timemaster at sillydog.org
Dugan Chen
Ed Suominen ed at eepatents.com
+Eduardo S. Dobay edudobay at gmail.com
Emanuel de Jesus ejesus at bigfoot.com
Fabian Rodriguez Fabian.Rodriguez at toxik.com
Fernando Aversa aversa at unsl.edu.ar
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-06-15 11:37:53 UTC (rev 228)
+++ trunk/configure.ac 2006-06-19 14:04:31 UTC (rev 229)
@@ -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, 1.0.0pre1-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 1.0.0pre1, 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