[Winpt-commits] r201 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sat Apr 22 20:30:30 CEST 2006
Author: twoaday
Date: 2006-04-22 20:30:24 +0200 (Sat, 22 Apr 2006)
New Revision: 201
Modified:
trunk/Include/wptGPGOptSkel.h
trunk/NEWS
trunk/Po/ChangeLog
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/Src/ChangeLog
trunk/Src/wptClipEditDlg.cpp
trunk/Src/wptClipVerifyDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeysigDlg.cpp
trunk/Src/wptUTF8.cpp
trunk/THANKS
trunk/configure.ac
Log:
See ChangeLog.
Modified: trunk/Include/wptGPGOptSkel.h
===================================================================
--- trunk/Include/wptGPGOptSkel.h 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Include/wptGPGOptSkel.h 2006-04-22 18:30:24 UTC (rev 201)
@@ -51,7 +51,7 @@
"# If you have more than 1 secret key in your keyring, you may want to\r\n"
"# uncomment the following option and set your preferred keyid.\r\n"
"\r\n"
-"#default-key 621CC013\r\n"
+"#default-key DEADBEEF\r\n"
"\r\n"
"# If you do not pass a recipient to gpg, it will ask for one. Using\r\n"
"# this option you can encrypt to a default key. Key validation will\r\n"
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/NEWS 2006-04-22 18:30:24 UTC (rev 201)
@@ -793,3 +793,7 @@
(0.11.12)
* Fix problem with hanging process while editing the key.
+* Support to show the PKA status if possible.
+* Fix problem that the comment is not correctly utf8 encoded
+ in the key edit dialog.
+* Fix UTF8 problem in the designated revoker code.
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Po/ChangeLog 2006-04-22 18:30:24 UTC (rev 201)
@@ -1,3 +1,7 @@
+2006-04-21 Timo Schulz <ts at g10code.de>
+
+ * de.po: Updated.
+
2006-03-31 Timo Schulz <ts at g10code.de>
* de.po: Updated.
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Po/de.po 2006-04-22 18:30:24 UTC (rev 201)
@@ -12,9 +12,9 @@
# BUG: GetOpenFileName needs \0\0. gettext does not support it.
msgid ""
msgstr ""
-"Project-Id-Version: WinPT 0.11.9\n"
+"Project-Id-Version: WinPT 0.11.12\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-16 19:59+0200\n"
+"POT-Creation-Date: 2006-04-22 20:08+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"
@@ -235,7 +235,7 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2089
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Hilfe"
@@ -321,15 +321,15 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:517
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
msgid "&Name"
msgstr "&Name"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
msgid "&Comment (optional)"
msgstr "&Kommentar (optional)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
msgid "&Expire date"
msgstr "&Ablaufdatum"
@@ -337,11 +337,11 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
msgid "&Never"
msgstr "&Niemals"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
msgid "Email &address"
msgstr "E-Mail-&Adresse"
@@ -382,7 +382,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1414
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -446,7 +446,7 @@
"OK zum Fortfahren oder Abbrechen"
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -454,12 +454,12 @@
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
-#: Src/wptFileManager.cpp:1353
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
+#: Src/wptFileManager.cpp:1357
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -540,8 +540,8 @@
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
-#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
@@ -590,7 +590,7 @@
msgid "&Load"
msgstr "&Laden"
-#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:177
#: Src/wptFileVerifyDlg.cpp:52 Src/wptGPGOptDlg.cpp:52
msgid "&Save"
msgstr "&Speichern"
@@ -599,7 +599,7 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -626,10 +626,10 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:361 Src/wptKeyEditDlgs.cpp:449
-#: Src/wptKeyEditDlgs.cpp:520 Src/wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
-#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:83
+#: Src/wptKeyEditDlgs.cpp:367 Src/wptKeyEditDlgs.cpp:455
+#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
+#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
@@ -662,7 +662,7 @@
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signieren"
@@ -695,7 +695,7 @@
msgid "Signing key:"
msgstr "Signierer Schlüssel:"
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
msgid "No key was selected."
msgstr "Kein Schlüssel ausgewählt."
@@ -703,10 +703,15 @@
msgid "Signature Information"
msgstr "Signaturinformationen"
-#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
-#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
-#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptClipVerifyDlg.cpp:151
+#, c-format
+msgid "PKA: Verified signer's address is '%s'"
+msgstr "PKA: Überprüfte Adresse des Unterzeichners ist '%s'"
+
+#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
+#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
+#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
+#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -714,7 +719,7 @@
msgid "Verify"
msgstr "Überprüfen"
-#: Src/wptClipVerifyDlg.cpp:187
+#: Src/wptClipVerifyDlg.cpp:206
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -727,19 +732,19 @@
"\n"
"Möchten Sie versuchen, den Schlüssel vom Schlüsselserver zu importieren?"
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:244
msgid "Invalid signature state."
msgstr "Ungültige Signatur."
-#: Src/wptClipVerifyDlg.cpp:235
+#: Src/wptClipVerifyDlg.cpp:254
msgid "Could not extract key or signature information."
msgstr "Konnte Schlüssel- oder Signaturinfos nicht extrahieren."
-#: Src/wptClipVerifyDlg.cpp:239
+#: Src/wptClipVerifyDlg.cpp:258
msgid "The signature is expired!"
msgstr "Die Signatur ist abgelaufen!"
-#: Src/wptClipVerifyDlg.cpp:266 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -758,35 +763,35 @@
msgid "Enter URL to retrieve the public key"
msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:775
-#: Src/wptKeyEditDlgs.cpp:842 Src/wptKeyEditDlgs.cpp:882
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:897
-#: Src/wptKeyEditDlgs.cpp:923 Src/wptKeyEditDlgs.cpp:953
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyEditDlgs.cpp:1029
-#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyEditDlgs.cpp:1054
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1107
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeyEditDlgs.cpp:1204
-#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1343 Src/wptKeyEditDlgs.cpp:1350
-#: Src/wptKeyEditDlgs.cpp:1386 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1400 Src/wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1461
-#: Src/wptKeyEditDlgs.cpp:1466 Src/wptKeyEditDlgs.cpp:1473
-#: Src/wptKeyEditDlgs.cpp:1479 Src/wptKeyEditDlgs.cpp:1484
-#: Src/wptKeyEditDlgs.cpp:1529 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1548
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1591
-#: Src/wptKeyEditDlgs.cpp:1599 Src/wptKeyEditDlgs.cpp:1616
-#: Src/wptKeyEditDlgs.cpp:1636 Src/wptKeyEditDlgs.cpp:1644
-#: Src/wptKeyEditDlgs.cpp:1746 Src/wptKeyEditDlgs.cpp:1780
-#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1822 Src/wptKeyEditDlgs.cpp:1944
-#: Src/wptKeyEditDlgs.cpp:1946 Src/wptKeyEditDlgs.cpp:1979
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeyEditDlgs.cpp:2011
-#: Src/wptKeyEditDlgs.cpp:2066 Src/wptKeyEditDlgs.cpp:2079
-#: Src/wptKeyEditDlgs.cpp:2090 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2124 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
+#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
+#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
+#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
+#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
+#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1750
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -1000,9 +1005,9 @@
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
-#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
-#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
+#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
+#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Dateimanager"
@@ -1034,12 +1039,12 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1087
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1190
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
@@ -1080,7 +1085,7 @@
msgid "Could not get default secret key."
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1100,41 +1105,43 @@
msgid "Encryption failed."
msgstr "Verschlüsselung fehlgeschlagen."
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "Good signature"
msgstr "Korrekte Signatur"
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "BAD signature"
msgstr "Falsche Signatur"
-#: Src/wptFileManager.cpp:1233
+#: Src/wptFileManager.cpp:1236
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
-"%s from \"%s\""
+"%s from \"%s\"\n"
+"%s"
msgstr ""
"Signatur erstellt %s mit %s key ID %s\n"
-"%s von \"%s\""
+"%s von \"%s\"\n"
+"%s"
-#: Src/wptFileManager.cpp:1238
+#: Src/wptFileManager.cpp:1241
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptFileManager.cpp:1315
+#: Src/wptFileManager.cpp:1319
msgid "Choose Filename for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1324
+#: Src/wptFileManager.cpp:1328
msgid "Please enter filename for plaintext file"
msgstr "Wählen Sie einen Namen für die Klartext-Datei"
-#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: Src/wptFileManager.cpp:1368
+#: Src/wptFileManager.cpp:1372
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1143,7 +1150,7 @@
"Entshlüsselung fehlgeschlagen.\n"
"%s: existiert nicht."
-#: Src/wptFileManager.cpp:1375
+#: Src/wptFileManager.cpp:1379
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1154,32 +1161,32 @@
"\n"
"Wollen Sie diesen anstatt von '%s' benutzen?"
-#: Src/wptFileManager.cpp:1423
+#: Src/wptFileManager.cpp:1427
msgid "Enter filename for signed file"
msgstr "Wählen Sie einen Namen für die signierte Datei"
-#: Src/wptFileManager.cpp:1527
+#: Src/wptFileManager.cpp:1531
msgid "Could not find detached signature in the clipboard."
msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1547
+#: Src/wptFileManager.cpp:1551
msgid "No files to check."
msgstr "Keine Datei(en) zu pruefen."
-#: Src/wptFileManager.cpp:1564
+#: Src/wptFileManager.cpp:1568
msgid "Select Data File"
msgstr "Bitte Datendatei auswählen"
-#: Src/wptFileManager.cpp:1566
+#: Src/wptFileManager.cpp:1570
msgid "Selected Output File"
msgstr "Bitte Ausgabedatei auswählen"
-#: Src/wptFileManager.cpp:1594
+#: Src/wptFileManager.cpp:1598
msgid "Invalid file name. Exit"
msgstr "Ungültiger Dateiname. Abbruch"
-#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
+#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
@@ -1188,7 +1195,7 @@
msgid "Import"
msgstr "Importieren"
-#: Src/wptFileManager.cpp:1700
+#: Src/wptFileManager.cpp:1704
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1200,58 +1207,58 @@
"\n"
"Kann diese(n) Schlüssel nicht importieren!"
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:252
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
msgid "No key was selected for export."
msgstr "Kein Schlüssel zum Exportieren ausgewählt."
-#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1684
+#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
#: Src/wptKeyManagerDlg.cpp:1718
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1066
-#: Src/wptKeyEditDlgs.cpp:1367 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG Status"
-#: Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1757
#, c-format
msgid "Finished (Output: %s)"
msgstr "Fertig (Ausgabe: %s)"
-#: Src/wptFileManager.cpp:1799
+#: Src/wptFileManager.cpp:1803
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManager.cpp:1859
+#: Src/wptFileManager.cpp:1863
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "Verschlüsseln in eine ZIP-Datei macht nur mit mehreren Dateien Sinn"
-#: Src/wptFileManager.cpp:1864
+#: Src/wptFileManager.cpp:1868
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1934
+#: Src/wptFileManager.cpp:1938
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1937
+#: Src/wptFileManager.cpp:1941
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1948
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
@@ -1335,8 +1342,8 @@
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
@@ -1585,7 +1592,7 @@
#: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
#: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
#: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1753 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1762 Src/wptKeyManagerDlg.cpp:940
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1833,7 +1840,7 @@
#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412
+#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1908,18 +1915,18 @@
msgid "Unknown Hotkey"
msgstr "Unbekanntes Tastenkürzel"
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:255
-#: Src/wptKeyEditDlgs.cpp:1162 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1478 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1539 Src/wptKeyEditDlgs.cpp:1572
-#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
+#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
+#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
+#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr "Widerrufen"
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeyEditDlgs.cpp:1397
-#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
+#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
msgstr "Abgelaufen"
@@ -1928,42 +1935,42 @@
msgid "secret key"
msgstr "geheimer Schlüssel"
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:430
+#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1240
+#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
+#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr "Benutzerkennung"
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
+#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1084
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
+#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1085
-#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
+#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "Erstellung"
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:554
+#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
msgid "Type"
msgstr "Typ"
@@ -1994,24 +2001,24 @@
msgid "Key Cache"
msgstr "Schlüsselcache"
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:234
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1157
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
+#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
+#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1164
+#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
msgid "OK"
msgstr "OK"
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:288
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:289
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2021,7 +2028,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:358
+#: Src/wptKeyEditDlgs.cpp:364
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
@@ -2032,7 +2039,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2040,35 +2047,35 @@
"Bitte ein Bild auswählen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:360 Src/wptKeyEditDlgs.cpp:448
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:362
+#: Src/wptKeyEditDlgs.cpp:368
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyEditDlgs.cpp:391
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyEditDlgs.cpp:409
-#: Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
+#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
+#: Src/wptKeyEditDlgs.cpp:926
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:382
+#: Src/wptKeyEditDlgs.cpp:388
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:391 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:401
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2076,146 +2083,146 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:414
+#: Src/wptKeyEditDlgs.cpp:420
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:415 Src/wptKeyEditDlgs.cpp:484
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:742
-#: Src/wptKeyEditDlgs.cpp:1502 Src/wptKeyEditDlgs.cpp:1574
-#: Src/wptKeyEditDlgs.cpp:1659 Src/wptKeyEditDlgs.cpp:1841
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
+#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
+#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "GnuPG-Status"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:350
-#: Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:452
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
"Hinzufügen eines \"Widerrufers\" kann nicht mehr\n"
"rückgängig gemacht werden."
-#: Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:453
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:466
-#: Src/wptKeyEditDlgs.cpp:478 Src/wptKeyEditDlgs.cpp:948
+#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
+#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
msgid "Add Revoker"
msgstr "\"Wiederrufer\" hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:466 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1591 Src/wptKeyEditDlgs.cpp:1636
-#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1979
+#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
+#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1988
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:490
msgid "Revoker successfully addded."
msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:524
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:526
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:527
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:535 Src/wptKeyEditDlgs.cpp:539
-#: Src/wptKeyEditDlgs.cpp:544 Src/wptKeyEditDlgs.cpp:548
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:573
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:547
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
"Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
-#: Src/wptKeyEditDlgs.cpp:544
+#: Src/wptKeyEditDlgs.cpp:552
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:548
+#: Src/wptKeyEditDlgs.cpp:556
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:575
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:855
+#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:661
msgid "Key type"
msgstr "Schlüssel-Typ"
-#: Src/wptKeyEditDlgs.cpp:653
+#: Src/wptKeyEditDlgs.cpp:662
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:663
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:700
+#: Src/wptKeyEditDlgs.cpp:709
msgid "Please select one entry."
msgstr "Bitte wählen Sie einen Eintrag aus."
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:707
-#: Src/wptKeyEditDlgs.cpp:739 Src/wptKeyEditDlgs.cpp:838
+#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:706
+#: Src/wptKeyEditDlgs.cpp:715
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
-#: Src/wptKeyEditDlgs.cpp:741
+#: Src/wptKeyEditDlgs.cpp:750
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:769 Src/wptKeyEditDlgs.cpp:837
-#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeyEditDlgs.cpp:948
-#: Src/wptKeyEditDlgs.cpp:1028 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
+#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
#: Src/wptKeyManagerDlg.cpp:1527
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:770 Src/wptKeyEditDlgs.cpp:788
+#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:904
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
msgid "Key status changed."
msgstr "Schlüsselstatus geändert."
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1043
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2223,15 +2230,15 @@
"Kann das Passwort das Schlüssels nicht ändern, da der \n"
"Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1050
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:1045
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:1052 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2239,44 +2246,44 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1066
+#: Src/wptKeyEditDlgs.cpp:1075
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1083 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1086
+#: Src/wptKeyEditDlgs.cpp:1095
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
msgid "Could not find key."
msgstr "Konnte Schlüssel nicht finden."
-#: Src/wptKeyEditDlgs.cpp:1107
+#: Src/wptKeyEditDlgs.cpp:1116
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1189 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1191
+#: Src/wptKeyEditDlgs.cpp:1200
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1204
+#: Src/wptKeyEditDlgs.cpp:1213
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1298
+#: Src/wptKeyEditDlgs.cpp:1307
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2318,19 +2325,19 @@
"LSIGN\t \t\tBenutzerkennung signieren (nicht-exportierbar)\r\n"
"CLEAN \t\tEntferne unbrauchbare Signaturen vom Schlüssel\r\n"
-#: Src/wptKeyEditDlgs.cpp:1319
+#: Src/wptKeyEditDlgs.cpp:1328
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1335
+#: Src/wptKeyEditDlgs.cpp:1344
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptKeyEditDlgs.cpp:1352
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1351
+#: Src/wptKeyEditDlgs.cpp:1360
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2347,15 +2354,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeyEditDlgs.cpp:1372
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeyEditDlgs.cpp:1376
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1407
msgid ""
"Key already expired.\n"
"\n"
@@ -2365,19 +2372,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1410
+#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyEditDlgs.cpp:1442
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1479
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2389,31 +2396,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1488
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1502
+#: Src/wptKeyEditDlgs.cpp:1511
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1533
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1538
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1549
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1546
+#: Src/wptKeyEditDlgs.cpp:1555
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2423,47 +2430,47 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1570
+#: Src/wptKeyEditDlgs.cpp:1579
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1583
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1616
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1656
+#: Src/wptKeyEditDlgs.cpp:1665
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1659
+#: Src/wptKeyEditDlgs.cpp:1668
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1746
+#: Src/wptKeyEditDlgs.cpp:1755
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1752
+#: Src/wptKeyEditDlgs.cpp:1761
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1754
+#: Src/wptKeyEditDlgs.cpp:1763
msgid "user ID:"
msgstr "Benutzerkennung:"
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1815
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1826
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2478,44 +2485,44 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1846
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1841
+#: Src/wptKeyEditDlgs.cpp:1850
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1946
+#: Src/wptKeyEditDlgs.cpp:1955
msgid "Finished to compact key."
msgstr "Schlüssel erfolgreich bearbeitet."
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:1992
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:2065
+#: Src/wptKeyEditDlgs.cpp:2074
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2078
+#: Src/wptKeyEditDlgs.cpp:2087
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:2087
+#: Src/wptKeyEditDlgs.cpp:2096
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2119
+#: Src/wptKeyEditDlgs.cpp:2128
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2123
+#: Src/wptKeyEditDlgs.cpp:2132
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"
@@ -2573,16 +2580,16 @@
msgid "Key Generation - Progress Dialog"
msgstr "Schlüsselerzeugung - Fortschrittsdialog"
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
-#: Src/wptKeygenDlg.cpp:372 Src/wptKeygenDlg.cpp:411 Src/wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
-#: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
-#: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
+#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
-#: Src/wptKeygenDlg.cpp:289
+#: Src/wptKeygenDlg.cpp:285
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -2600,48 +2607,48 @@
"\n"
"Backup der Schlüsselbunde erstellen?"
-#: Src/wptKeygenDlg.cpp:294
+#: Src/wptKeygenDlg.cpp:290
msgid "WARNING - Important hint"
msgstr "WARNUNG - Wichtiger Hinweis"
-#: Src/wptKeygenDlg.cpp:296
+#: Src/wptKeygenDlg.cpp:292
msgid "Destination for Public Keyring"
msgstr "Speicherort für öff. Schlüsselbund"
-#: Src/wptKeygenDlg.cpp:302 Src/wptKeygenDlg.cpp:311
+#: Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
#, c-format
msgid "Could not copy %s -> %s"
msgstr "Konnte %s nicht -> %s kopieren"
-#: Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:301
msgid "Destination for Secret Keyring"
msgstr "Speicherort für geheimen Schlüsselbund"
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and ELG (default)"
msgstr "DSA und ELG (Standard)"
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA and RSA"
msgstr "DSA und RSA"
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:325
msgid "DSA sign only"
msgstr "DSA nur signieren"
-#: Src/wptKeygenDlg.cpp:330
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign only"
msgstr "RSA nur signieren"
-#: Src/wptKeygenDlg.cpp:331
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA sign and encrypt"
msgstr "RSA signieren + verschlüsseln"
-#: Src/wptKeygenDlg.cpp:332
+#: Src/wptKeygenDlg.cpp:328
msgid "RSA and RSA (PGP)"
msgstr "RSA und RSA (PGP)"
-#: Src/wptKeygenDlg.cpp:374
+#: Src/wptKeygenDlg.cpp:370
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
@@ -2649,70 +2656,70 @@
"Die Schlüsselerstellung kann eine Weile dauern! Bitte warten Sie, bis eine "
"Meldung über die Beendigung der Schlüsselerzeugung erscheint."
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:372
msgid "Subkey size in &bits"
msgstr "&Schlüsselgröße in Bits"
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:373
msgid "&Real name"
msgstr "&Ihr Name"
-#: Src/wptKeygenDlg.cpp:381
+#: Src/wptKeygenDlg.cpp:377
msgid "Key &type"
msgstr "Schlüssel &Typ"
-#: Src/wptKeygenDlg.cpp:410
+#: Src/wptKeygenDlg.cpp:406
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Ungültige Eingabe. Erlaubte Werte sind 1024-4096 Bit."
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:411
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:566
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
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:577
+#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
-#: Src/wptKeygenDlg.cpp:438
+#: Src/wptKeygenDlg.cpp:434
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:457 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:535
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:536
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:537
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:538
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:539
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -2723,7 +2730,7 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:540
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -2734,17 +2741,17 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
-#: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
#: Src/wptKeyManagerDlg.cpp:1630
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:543
msgid "E&xpert"
msgstr "E&xperte"
-#: Src/wptKeygenDlg.cpp:582
+#: Src/wptKeygenDlg.cpp:578
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2808,42 +2815,42 @@
msgid "Public Key"
msgstr "Öffentlicher Schlüssel"
-#: Src/wptKeylist.cpp:352
+#: Src/wptKeylist.cpp:353
msgid "None"
msgstr "Keine"
-#: Src/wptKeylist.cpp:356
+#: Src/wptKeylist.cpp:357
msgid "Marginal"
msgstr "Marginal"
# c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:359
+#: Src/wptKeylist.cpp:360
msgid "Full"
msgstr "Voll"
-#: Src/wptKeylist.cpp:396 Src/wptKeylist.cpp:422 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr "Inaktiv"
-#: Src/wptKeylist.cpp:432
+#: Src/wptKeylist.cpp:433
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
#: Src/wptKeyManagerDlg.cpp:950
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Vertrauen"
-#: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
msgid "Invalid User ID"
msgstr "Ungültige Benutzerkennung"
-#: Src/wptKeylist.cpp:1006
+#: Src/wptKeylist.cpp:1007
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2858,11 +2865,11 @@
"\n"
"\"%s\" trotzdem benutzen?"
-#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
+#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
msgid "Recipients"
msgstr "Empfänger"
-#: Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1080
#, c-format
msgid ""
"KeyID %s.\n"
@@ -2871,7 +2878,7 @@
"Schlüssel ID %s.\n"
"Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
-#: Src/wptKeylist.cpp:1181
+#: Src/wptKeylist.cpp:1182
msgid "Secret Key List"
msgstr "Liste der geheimen Schlüssel"
@@ -3149,7 +3156,7 @@
msgstr "&Importieren..."
#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:397
+#: Src/wptKeysigDlg.cpp:400
msgid "&Properties"
msgstr "&Eigenschaften"
@@ -3875,12 +3882,12 @@
msgid "Key not found in keyring."
msgstr "Schlüssel im Keyring nicht gefunden."
-#: Src/wptKeysigDlg.cpp:394
+#: Src/wptKeysigDlg.cpp:395
#, c-format
msgid "Signature List for \"%s\""
msgstr "Signaturliste für \"%s\""
-#: Src/wptKeysigDlg.cpp:396
+#: Src/wptKeysigDlg.cpp:399
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Po/fr.po 2006-04-22 18:30:24 UTC (rev 201)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.8\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-16 19:59+0200\n"
+"POT-Creation-Date: 2006-04-22 20:08+0200\n"
"PO-Revision-Date: 2006-03-04 21:32+0100\n"
"Last-Translator: Pascal Brochart <pbrochart at tuxfamily.org>\n"
"Language-Team: FR <winpt-dev at wald.intevation.org>\n"
@@ -190,7 +190,7 @@
msgid "&About GPG..."
msgstr ""
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2089
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Aide"
@@ -270,15 +270,15 @@
"Still proceed?"
msgstr ""
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:517
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
msgid "&Name"
msgstr "&Nom"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
msgid "&Comment (optional)"
msgstr "&Commentaire (optionnel)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
msgid "&Expire date"
msgstr "&Date d'expiration"
@@ -286,11 +286,11 @@
msgid "Off-card passphrase"
msgstr ""
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
msgid "&Never"
msgstr "&Jamais"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
msgid "Email &address"
msgstr "Adresse &email"
@@ -330,7 +330,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr ""
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1414
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
msgid "The date you have chosen lies in the past."
msgstr ""
@@ -387,7 +387,7 @@
msgstr ""
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -395,12 +395,12 @@
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
-#: Src/wptFileManager.cpp:1353
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
+#: Src/wptFileManager.cpp:1357
msgid "Decryption"
msgstr "Déchiffrement"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -469,8 +469,8 @@
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
-#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
@@ -515,7 +515,7 @@
msgid "&Load"
msgstr "&Charger"
-#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:177
#: Src/wptFileVerifyDlg.cpp:52 Src/wptGPGOptDlg.cpp:52
msgid "&Save"
msgstr "&Enregistrer"
@@ -524,7 +524,7 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -550,10 +550,10 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:361 Src/wptKeyEditDlgs.cpp:449
-#: Src/wptKeyEditDlgs.cpp:520 Src/wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
-#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:83
+#: Src/wptKeyEditDlgs.cpp:367 Src/wptKeyEditDlgs.cpp:455
+#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
+#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
@@ -585,7 +585,7 @@
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signer"
@@ -618,7 +618,7 @@
msgid "Signing key:"
msgstr ""
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
msgid "No key was selected."
msgstr "Aucune clé n'a été sélectionnée"
@@ -626,10 +626,15 @@
msgid "Signature Information"
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
-#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
-#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptClipVerifyDlg.cpp:151
+#, c-format
+msgid "PKA: Verified signer's address is '%s'"
+msgstr ""
+
+#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
+#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
+#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
+#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -637,7 +642,7 @@
msgid "Verify"
msgstr "Vérifier"
-#: Src/wptClipVerifyDlg.cpp:187
+#: Src/wptClipVerifyDlg.cpp:206
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -646,19 +651,19 @@
"Do you want to try to retrieve the key from the keyserver?"
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:244
msgid "Invalid signature state."
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:235
+#: Src/wptClipVerifyDlg.cpp:254
msgid "Could not extract key or signature information."
msgstr ""
-#: Src/wptClipVerifyDlg.cpp:239
+#: Src/wptClipVerifyDlg.cpp:258
msgid "The signature is expired!"
msgstr "La signature est expirée!"
-#: Src/wptClipVerifyDlg.cpp:266 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -677,35 +682,35 @@
msgid "Enter URL to retrieve the public key"
msgstr ""
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:775
-#: Src/wptKeyEditDlgs.cpp:842 Src/wptKeyEditDlgs.cpp:882
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:897
-#: Src/wptKeyEditDlgs.cpp:923 Src/wptKeyEditDlgs.cpp:953
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyEditDlgs.cpp:1029
-#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyEditDlgs.cpp:1054
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1107
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeyEditDlgs.cpp:1204
-#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1343 Src/wptKeyEditDlgs.cpp:1350
-#: Src/wptKeyEditDlgs.cpp:1386 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1400 Src/wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1461
-#: Src/wptKeyEditDlgs.cpp:1466 Src/wptKeyEditDlgs.cpp:1473
-#: Src/wptKeyEditDlgs.cpp:1479 Src/wptKeyEditDlgs.cpp:1484
-#: Src/wptKeyEditDlgs.cpp:1529 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1548
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1591
-#: Src/wptKeyEditDlgs.cpp:1599 Src/wptKeyEditDlgs.cpp:1616
-#: Src/wptKeyEditDlgs.cpp:1636 Src/wptKeyEditDlgs.cpp:1644
-#: Src/wptKeyEditDlgs.cpp:1746 Src/wptKeyEditDlgs.cpp:1780
-#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1822 Src/wptKeyEditDlgs.cpp:1944
-#: Src/wptKeyEditDlgs.cpp:1946 Src/wptKeyEditDlgs.cpp:1979
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeyEditDlgs.cpp:2011
-#: Src/wptKeyEditDlgs.cpp:2066 Src/wptKeyEditDlgs.cpp:2079
-#: Src/wptKeyEditDlgs.cpp:2090 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2124 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
+#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
+#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
+#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
+#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
+#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1750
msgid "Key Edit"
msgstr ""
@@ -917,9 +922,9 @@
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
-#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
-#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
+#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
+#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Gestionnaire de fichier"
@@ -943,12 +948,12 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1087
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1190
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
@@ -987,7 +992,7 @@
msgid "Could not get default secret key."
msgstr "Ne peut obtenir la clé secrète par défaut."
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1007,46 +1012,47 @@
msgid "Encryption failed."
msgstr "Erreur de chiffrement."
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "Good signature"
msgstr "Bonne signature"
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "BAD signature"
msgstr "MAUVAISE signature"
-#: Src/wptFileManager.cpp:1233
+#: Src/wptFileManager.cpp:1236
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
-"%s from \"%s\""
+"%s from \"%s\"\n"
+"%s"
msgstr ""
-#: Src/wptFileManager.cpp:1238
+#: Src/wptFileManager.cpp:1241
msgid "Decrypt Verify"
msgstr ""
-#: Src/wptFileManager.cpp:1315
+#: Src/wptFileManager.cpp:1319
msgid "Choose Filename for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1324
+#: Src/wptFileManager.cpp:1328
msgid "Please enter filename for plaintext file"
msgstr ""
-#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Déchiffrer"
-#: Src/wptFileManager.cpp:1368
+#: Src/wptFileManager.cpp:1372
#, c-format
msgid ""
"Decryption failed.\n"
"%s: does not exist."
msgstr ""
-#: Src/wptFileManager.cpp:1375
+#: Src/wptFileManager.cpp:1379
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1054,31 +1060,31 @@
"Do you want to use this instead of '%s'?"
msgstr ""
-#: Src/wptFileManager.cpp:1423
+#: Src/wptFileManager.cpp:1427
msgid "Enter filename for signed file"
msgstr ""
-#: Src/wptFileManager.cpp:1527
+#: Src/wptFileManager.cpp:1531
msgid "Could not find detached signature in the clipboard."
msgstr ""
-#: Src/wptFileManager.cpp:1547
+#: Src/wptFileManager.cpp:1551
msgid "No files to check."
msgstr "Aucun fichiers à vérifier."
-#: Src/wptFileManager.cpp:1564
+#: Src/wptFileManager.cpp:1568
msgid "Select Data File"
msgstr ""
-#: Src/wptFileManager.cpp:1566
+#: Src/wptFileManager.cpp:1570
msgid "Selected Output File"
msgstr ""
-#: Src/wptFileManager.cpp:1594
+#: Src/wptFileManager.cpp:1598
msgid "Invalid file name. Exit"
msgstr ""
-#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
+#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
@@ -1087,7 +1093,7 @@
msgid "Import"
msgstr "Importer"
-#: Src/wptFileManager.cpp:1700
+#: Src/wptFileManager.cpp:1704
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1095,58 +1101,58 @@
"Cannot import these key(s)!"
msgstr ""
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:252
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
msgid "No key was selected for export."
msgstr ""
-#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exporter"
-#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1684
+#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
#: Src/wptKeyManagerDlg.cpp:1718
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1066
-#: Src/wptKeyEditDlgs.cpp:1367 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "Status de GnuPG"
-#: Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1757
#, c-format
msgid "Finished (Output: %s)"
msgstr ""
-#: Src/wptFileManager.cpp:1799
+#: Src/wptFileManager.cpp:1803
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManager.cpp:1859
+#: Src/wptFileManager.cpp:1863
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr ""
-#: Src/wptFileManager.cpp:1864
+#: Src/wptFileManager.cpp:1868
msgid "Choose File Name for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1934
+#: Src/wptFileManager.cpp:1938
msgid "Choose a Name for the Archive"
msgstr ""
-#: Src/wptFileManager.cpp:1937
+#: Src/wptFileManager.cpp:1941
msgid "Invalid archive name. Exit."
msgstr ""
-#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
msgid "Encrypt Directory"
msgstr ""
-#: Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1948
msgid "Could not create zip archive."
msgstr ""
@@ -1226,8 +1232,8 @@
msgid "Options"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
@@ -1456,7 +1462,7 @@
#: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
#: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
#: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1753 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1762 Src/wptKeyManagerDlg.cpp:940
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -1701,7 +1707,7 @@
#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412
+#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "Gestionnaire de clés"
@@ -1770,18 +1776,18 @@
msgid "Unknown Hotkey"
msgstr ""
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:255
-#: Src/wptKeyEditDlgs.cpp:1162 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1478 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1539 Src/wptKeyEditDlgs.cpp:1572
-#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
+#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
+#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
+#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr ""
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeyEditDlgs.cpp:1397
-#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
+#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
msgstr ""
@@ -1790,42 +1796,42 @@
msgid "secret key"
msgstr "clé secrète"
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:430
+#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
msgid "public key"
msgstr "clé publique"
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1240
+#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
msgid "Invalid user ID"
msgstr ""
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
+#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:112
msgid "User ID"
msgstr ""
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
+#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Taille"
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1084
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
+#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:111
msgid "Key ID"
msgstr ""
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1085
-#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
+#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "Création"
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:554
+#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
msgid "Type"
msgstr ""
@@ -1852,270 +1858,270 @@
msgid "Key Cache"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:234
msgid "Ultimate"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1157
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
+#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
+#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
msgid "Never"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1164
+#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
msgid "OK"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:288
msgid "user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:289
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
"%s"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:358
+#: Src/wptKeyEditDlgs.cpp:364
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
"close to 240x288 is a good size to use."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:360 Src/wptKeyEditDlgs.cpp:448
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:362
+#: Src/wptKeyEditDlgs.cpp:368
msgid "Add Photo ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383
msgid "Select Image File"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyEditDlgs.cpp:391
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyEditDlgs.cpp:409
-#: Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
+#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
+#: Src/wptKeyEditDlgs.cpp:926
msgid "Add Photo"
msgstr "Ajouter une photo"
-#: Src/wptKeyEditDlgs.cpp:382
+#: Src/wptKeyEditDlgs.cpp:388
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:391 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
msgid "Please enter a file name."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:401
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:414
+#: Src/wptKeyEditDlgs.cpp:420
msgid "Photo successfully added."
msgstr "Photo ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:415 Src/wptKeyEditDlgs.cpp:484
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:742
-#: Src/wptKeyEditDlgs.cpp:1502 Src/wptKeyEditDlgs.cpp:1574
-#: Src/wptKeyEditDlgs.cpp:1659 Src/wptKeyEditDlgs.cpp:1841
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
+#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
+#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "Etat de GnuPG"
-#: Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:452
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:453
msgid "Public key"
msgstr "Clé publique"
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:466
-#: Src/wptKeyEditDlgs.cpp:478 Src/wptKeyEditDlgs.cpp:948
+#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
+#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
msgid "Add Revoker"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:466 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1591 Src/wptKeyEditDlgs.cpp:1636
-#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1979
+#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
+#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1988
msgid "Please select a user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:490
msgid "Revoker successfully addded."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:524
msgid "Add new User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:526
msgid "&Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:527
msgid "&Comment"
msgstr "&Commentaire"
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter a name (min. 5 chars.)"
msgstr "Entrer un nom (min. 5 caractères)"
-#: Src/wptKeyEditDlgs.cpp:535 Src/wptKeyEditDlgs.cpp:539
-#: Src/wptKeyEditDlgs.cpp:544 Src/wptKeyEditDlgs.cpp:548
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:573
msgid "UserID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:547
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:544
+#: Src/wptKeyEditDlgs.cpp:552
msgid "Please enter an email address."
msgstr "Entrer une adresse email"
-#: Src/wptKeyEditDlgs.cpp:548
+#: Src/wptKeyEditDlgs.cpp:556
msgid "Invalid email address."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:575
msgid "user ID successfully added."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:855
+#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
msgid "Add new Subkey"
msgstr "Ajouter la nouvelle clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:661
msgid "Key type"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:653
+#: Src/wptKeyEditDlgs.cpp:662
msgid "Size in bits"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:663
msgid "Key expiration"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:700
+#: Src/wptKeyEditDlgs.cpp:709
msgid "Please select one entry."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:707
-#: Src/wptKeyEditDlgs.cpp:739 Src/wptKeyEditDlgs.cpp:838
+#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
msgid "Add Subkey"
msgstr "Ajouter la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:706
+#: Src/wptKeyEditDlgs.cpp:715
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:741
+#: Src/wptKeyEditDlgs.cpp:750
msgid "Subkey successfully added."
msgstr "Clé secondaire ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:769 Src/wptKeyEditDlgs.cpp:837
-#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeyEditDlgs.cpp:948
-#: Src/wptKeyEditDlgs.cpp:1028 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
+#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
#: Src/wptKeyManagerDlg.cpp:1527
msgid "There is no secret key available!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:770 Src/wptKeyEditDlgs.cpp:788
+#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
msgid "Add user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:904
msgid "Preferred keyserver successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
msgid "Key status changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1043
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1050
msgid "Current (old) Passphrase"
msgstr "Actuel (ancienne) Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1045
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "New Passphrase"
msgstr "Nouvelle Passphrase"
-#: Src/wptKeyEditDlgs.cpp:1052 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Change Passwd"
msgstr "Changement de mot de passe"
-#: Src/wptKeyEditDlgs.cpp:1066
+#: Src/wptKeyEditDlgs.cpp:1075
msgid "Passphrase successfully changed."
msgstr "Passphrase modifiée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1083 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Déscription"
-#: Src/wptKeyEditDlgs.cpp:1086
+#: Src/wptKeyEditDlgs.cpp:1095
msgid "Expires"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
msgid "Could not find key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1107
+#: Src/wptKeyEditDlgs.cpp:1116
msgid "No subkey(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1189 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "Validité"
-#: Src/wptKeyEditDlgs.cpp:1191
+#: Src/wptKeyEditDlgs.cpp:1200
msgid "Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1204
+#: Src/wptKeyEditDlgs.cpp:1213
msgid "No user ID(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1298
+#: Src/wptKeyEditDlgs.cpp:1307
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2139,19 +2145,19 @@
"CLEAN \t\tremove unusable signatures from key\r\n"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1319
+#: Src/wptKeyEditDlgs.cpp:1328
msgid "Key Edit Help"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1335
+#: Src/wptKeyEditDlgs.cpp:1344
msgid "Primary key can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptKeyEditDlgs.cpp:1352
msgid "Primary subkey can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1351
+#: Src/wptKeyEditDlgs.cpp:1360
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2162,34 +2168,34 @@
"Do you really want to delete this subkey?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeyEditDlgs.cpp:1372
msgid "Delete Subkey"
msgstr "Effacer la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeyEditDlgs.cpp:1376
msgid "Subkey successfully deleted."
msgstr "Clé secondaire effacée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1407
msgid ""
"Key already expired.\n"
"\n"
"Do you want to change the expiration date?"
msgstr "Voulez-vous changer la date d'expiration?"
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1410
+#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
msgid "Key Expiration Date"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyEditDlgs.cpp:1442
msgid "Expire Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Subkey expire date successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1479
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2197,31 +2203,31 @@
"This command is only available to revoke single subkeys"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1488
msgid "Key already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1502
+#: Src/wptKeyEditDlgs.cpp:1511
msgid "Subkey successfully revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1533
msgid "Revoke user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1538
msgid "Key has only one user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1549
msgid "This user ID has been already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1546
+#: Src/wptKeyEditDlgs.cpp:1555
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2229,47 +2235,47 @@
"Do you really want to revoke this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1570
+#: Src/wptKeyEditDlgs.cpp:1579
msgid "Revoke User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1583
msgid "User ID successfully revoked"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1616
+#: Src/wptKeyEditDlgs.cpp:1625
msgid "Could not set user ID preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1656
+#: Src/wptKeyEditDlgs.cpp:1665
msgid "Primary"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1659
+#: Src/wptKeyEditDlgs.cpp:1668
msgid "User ID successfully flagged"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1746
+#: Src/wptKeyEditDlgs.cpp:1755
msgid "No preferences available."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1752
+#: Src/wptKeyEditDlgs.cpp:1761
msgid "MDC feature"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1754
+#: Src/wptKeyEditDlgs.cpp:1763
msgid "user ID:"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1815
msgid "Primary user ID can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1826
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2279,43 +2285,43 @@
"Do you really want to delete this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1846
msgid "Delete user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1841
+#: Src/wptKeyEditDlgs.cpp:1850
msgid "User ID successfully deleted"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1946
+#: Src/wptKeyEditDlgs.cpp:1955
msgid "Finished to compact key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:1992
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2065
+#: Src/wptKeyEditDlgs.cpp:2074
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2078
+#: Src/wptKeyEditDlgs.cpp:2087
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2087
+#: Src/wptKeyEditDlgs.cpp:2096
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2119
+#: Src/wptKeyEditDlgs.cpp:2128
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2123
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2370,16 +2376,16 @@
msgid "Key Generation - Progress Dialog"
msgstr ""
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
-#: Src/wptKeygenDlg.cpp:372 Src/wptKeygenDlg.cpp:411 Src/wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
-#: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
-#: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
+#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr ""
-#: Src/wptKeygenDlg.cpp:289
+#: Src/wptKeygenDlg.cpp:285
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -2397,138 +2403,138 @@
"disquette!\n"
"Sauvegarder votre porte-clés maintenant?"
-#: Src/wptKeygenDlg.cpp:294
+#: Src/wptKeygenDlg.cpp:290
msgid "WARNING - Important hint"
msgstr "AVERTISSEMENT - Conseil important"
-#: Src/wptKeygenDlg.cpp:296
+#: Src/wptKeygenDlg.cpp:292
msgid "Destination for Public Keyring"
msgstr ""
-#: Src/wptKeygenDlg.cpp:302 Src/wptKeygenDlg.cpp:311
+#: Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
#, c-format
msgid "Could not copy %s -> %s"
msgstr ""
-#: Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:301
msgid "Destination for Secret Keyring"
msgstr ""
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and ELG (default)"
msgstr ""
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA and RSA"
msgstr ""
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:325
msgid "DSA sign only"
msgstr ""
-#: Src/wptKeygenDlg.cpp:330
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign only"
msgstr ""
-#: Src/wptKeygenDlg.cpp:331
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA sign and encrypt"
msgstr ""
-#: Src/wptKeygenDlg.cpp:332
+#: Src/wptKeygenDlg.cpp:328
msgid "RSA and RSA (PGP)"
msgstr ""
-#: Src/wptKeygenDlg.cpp:374
+#: Src/wptKeygenDlg.cpp:370
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
msgstr ""
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:372
msgid "Subkey size in &bits"
msgstr ""
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:373
msgid "&Real name"
msgstr "&Nom réel"
-#: Src/wptKeygenDlg.cpp:381
+#: Src/wptKeygenDlg.cpp:377
msgid "Key &type"
msgstr ""
-#: Src/wptKeygenDlg.cpp:410
+#: Src/wptKeygenDlg.cpp:406
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr ""
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:411
msgid "Do you really need such a large key?"
msgstr ""
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:566
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
msgid "Please enter the name."
msgstr ""
-#: Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
msgid "Please do not enter the email address in the name field."
msgstr ""
-#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:577
+#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr ""
-#: Src/wptKeygenDlg.cpp:438
+#: Src/wptKeygenDlg.cpp:434
msgid "Please do NOT enter the email address in the comment field."
msgstr ""
-#: Src/wptKeygenDlg.cpp:457 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
msgid "Please enter the passphrase."
msgstr "Entrer la passphrase."
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
msgid "Key Generation completed"
msgstr "Génération des clés terminée"
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:535
msgid "&Prefer RSA keys"
msgstr ""
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:536
msgid "Real name:"
msgstr "Nom réel:"
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:537
msgid "Email address:"
msgstr "Adresse email:"
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:538
msgid "Name and E-Mail Assignment"
msgstr ""
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:539
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
"using belongs to us."
msgstr ""
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:540
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
"key when communicating with you."
msgstr ""
-#: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
-#: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
#: Src/wptKeyManagerDlg.cpp:1630
msgid "Key Generation Wizard"
msgstr ""
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:543
msgid "E&xpert"
msgstr ""
-#: Src/wptKeygenDlg.cpp:582
+#: Src/wptKeygenDlg.cpp:578
msgid "Please do not add '<' or '>' to the email address."
msgstr ""
@@ -2592,41 +2598,41 @@
msgid "Public Key"
msgstr ""
-#: Src/wptKeylist.cpp:352
+#: Src/wptKeylist.cpp:353
msgid "None"
msgstr ""
-#: Src/wptKeylist.cpp:356
+#: Src/wptKeylist.cpp:357
msgid "Marginal"
msgstr ""
-#: Src/wptKeylist.cpp:359
+#: Src/wptKeylist.cpp:360
msgid "Full"
msgstr ""
-#: Src/wptKeylist.cpp:396 Src/wptKeylist.cpp:422 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr ""
-#: Src/wptKeylist.cpp:432
+#: Src/wptKeylist.cpp:433
msgid "key pair"
msgstr ""
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
#: Src/wptKeyManagerDlg.cpp:950
msgid "Cipher"
msgstr ""
-#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "Confiance"
-#: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
msgid "Invalid User ID"
msgstr ""
-#: Src/wptKeylist.cpp:1006
+#: Src/wptKeylist.cpp:1007
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2636,18 +2642,18 @@
"Use \"%s\" anyway?"
msgstr ""
-#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
+#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
msgid "Recipients"
msgstr ""
-#: Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1080
#, c-format
msgid ""
"KeyID %s.\n"
"Do you really want to export a revoked key?"
msgstr ""
-#: Src/wptKeylist.cpp:1181
+#: Src/wptKeylist.cpp:1182
msgid "Secret Key List"
msgstr ""
@@ -2895,7 +2901,7 @@
msgstr "&Importer..."
#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:397
+#: Src/wptKeysigDlg.cpp:400
msgid "&Properties"
msgstr "&Propriétés"
@@ -3561,12 +3567,12 @@
msgid "Key not found in keyring."
msgstr "Clé non trouvée dans le porte-clés."
-#: Src/wptKeysigDlg.cpp:394
+#: Src/wptKeysigDlg.cpp:395
#, c-format
msgid "Signature List for \"%s\""
msgstr ""
-#: Src/wptKeysigDlg.cpp:396
+#: Src/wptKeysigDlg.cpp:399
msgid "&Receive Key"
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Po/jp.po 2006-04-22 18:30:24 UTC (rev 201)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-16 19:59+0200\n"
+"POT-Creation-Date: 2006-04-22 20:08+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -269,7 +269,7 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2089
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2098
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
@@ -380,12 +380,12 @@
"‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:517
+#: Src/wptCardDlg.cpp:580 Src/wptKeyEditDlgs.cpp:525
msgid "&Name"
msgstr "–¼‘O(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:374
msgid "&Comment (optional)"
msgstr "ƒIƒvƒVƒ‡ƒiƒ‹ƒRƒƒ“ƒg(&C)"
@@ -394,7 +394,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:380
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:376
msgid "&Expire date"
msgstr "—LŒøŠúŒÀ(&E)"
@@ -404,12 +404,12 @@
msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:655 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:664 Src/wptKeygenDlg.cpp:378
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:375
msgid "Email &address"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX(&A)"
@@ -459,7 +459,7 @@
# c:\oss\winpt\src\wptCardDlg.cpp:580
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
# c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1414
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1423
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -546,7 +546,7 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -560,14 +560,14 @@
# c:\oss\winpt\src\wptFileManager.cpp:996
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
-#: Src/wptFileManager.cpp:1353
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1310
+#: Src/wptFileManager.cpp:1357
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1358
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -671,8 +671,8 @@
# c:\oss\winpt\src\wptMainProc.cpp:493
#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
-#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
-#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
+#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:242
+#: Src/wptClipEditDlg.cpp:247 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:162 Src/wptMainProc.cpp:230 Src/wptMainProc.cpp:273
#: Src/wptMainProc.cpp:437 Src/wptMainProc.cpp:518 Src/wptMainProc.cpp:523
msgid "Clipboard"
@@ -733,7 +733,7 @@
msgstr "ƒ[ƒh(&L)"
# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipEditDlg.cpp:198 Src/wptClipVerifyDlg.cpp:177
#: Src/wptFileVerifyDlg.cpp:52 Src/wptGPGOptDlg.cpp:52
msgid "&Save"
msgstr "•Û‘¶(&S)"
@@ -747,7 +747,7 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2097
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -782,10 +782,10 @@
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:157
-#: Src/wptKeyEditDlgs.cpp:361 Src/wptKeyEditDlgs.cpp:449
-#: Src/wptKeyEditDlgs.cpp:520 Src/wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
-#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:83
+#: Src/wptKeyEditDlgs.cpp:367 Src/wptKeyEditDlgs.cpp:455
+#: Src/wptKeyEditDlgs.cpp:528 Src/wptKeyEditDlgs.cpp:665
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:379
+#: Src/wptKeygenDlg.cpp:542 Src/wptKeyRevokeDlg.cpp:83
#: Src/wptKeyserverDlg.cpp:526 Src/wptKeyserverSearchDlg.cpp:61
#: Src/wptKeysignDlg.cpp:287 Src/wptPassphraseCB.cpp:91
#: Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
@@ -838,7 +838,7 @@
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
-#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1414
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
@@ -882,7 +882,7 @@
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1182
msgid "No key was selected."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -891,6 +891,11 @@
msgid "Signature Information"
msgstr "ƒVƒOƒjƒ`ƒƒ[‚Ìî•ñ"
+#: Src/wptClipVerifyDlg.cpp:151
+#, c-format
+msgid "PKA: Verified signer's address is '%s'"
+msgstr ""
+
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:52
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:66
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:80
@@ -906,10 +911,10 @@
# 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/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
-#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
-#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptClipVerifyDlg.cpp:176 Src/wptClipVerifyDlg.cpp:189
+#: Src/wptClipVerifyDlg.cpp:205 Src/wptClipVerifyDlg.cpp:212
+#: Src/wptClipVerifyDlg.cpp:244 Src/wptClipVerifyDlg.cpp:255
+#: Src/wptFileManager.cpp:1598 Src/wptFileManager.cpp:1651
#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
@@ -918,7 +923,7 @@
msgstr "Šm”F‚·‚é"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:81
-#: Src/wptClipVerifyDlg.cpp:187
+#: Src/wptClipVerifyDlg.cpp:206
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -932,17 +937,17 @@
"ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:244
msgid "Invalid signature state."
msgstr "–¼‚Ì󋵂͖³Œø‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:118
-#: Src/wptClipVerifyDlg.cpp:235
+#: Src/wptClipVerifyDlg.cpp:254
msgid "Could not extract key or signature information."
msgstr "ƒL[‚Ü‚½‚Í–¼î•ñ‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptClipVerifyDlg.cpp:239
+#: Src/wptClipVerifyDlg.cpp:258
msgid "The signature is expired!"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚ª‰ß‚¬‚Ä‚¢‚Ü‚·I"
@@ -954,7 +959,7 @@
# c:\oss\winpt\src\wptFileSaveDlg.cpp:92
# c:\oss\winpt\src\wptFileSaveDlg.cpp:97
# c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipVerifyDlg.cpp:266 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:292 Src/wptFileSaveDlg.cpp:57
#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -1016,35 +1021,35 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1568
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1173
-#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:775
-#: Src/wptKeyEditDlgs.cpp:842 Src/wptKeyEditDlgs.cpp:882
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:897
-#: Src/wptKeyEditDlgs.cpp:923 Src/wptKeyEditDlgs.cpp:953
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyEditDlgs.cpp:1029
-#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyEditDlgs.cpp:1054
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1107
-#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeyEditDlgs.cpp:1204
-#: Src/wptKeyEditDlgs.cpp:1335 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1343 Src/wptKeyEditDlgs.cpp:1350
-#: Src/wptKeyEditDlgs.cpp:1386 Src/wptKeyEditDlgs.cpp:1390
-#: Src/wptKeyEditDlgs.cpp:1400 Src/wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1461
-#: Src/wptKeyEditDlgs.cpp:1466 Src/wptKeyEditDlgs.cpp:1473
-#: Src/wptKeyEditDlgs.cpp:1479 Src/wptKeyEditDlgs.cpp:1484
-#: Src/wptKeyEditDlgs.cpp:1529 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1548
-#: Src/wptKeyEditDlgs.cpp:1551 Src/wptKeyEditDlgs.cpp:1591
-#: Src/wptKeyEditDlgs.cpp:1599 Src/wptKeyEditDlgs.cpp:1616
-#: Src/wptKeyEditDlgs.cpp:1636 Src/wptKeyEditDlgs.cpp:1644
-#: Src/wptKeyEditDlgs.cpp:1746 Src/wptKeyEditDlgs.cpp:1780
-#: Src/wptKeyEditDlgs.cpp:1807 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1822 Src/wptKeyEditDlgs.cpp:1944
-#: Src/wptKeyEditDlgs.cpp:1946 Src/wptKeyEditDlgs.cpp:1979
-#: Src/wptKeyEditDlgs.cpp:1984 Src/wptKeyEditDlgs.cpp:1993
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeyEditDlgs.cpp:2011
-#: Src/wptKeyEditDlgs.cpp:2066 Src/wptKeyEditDlgs.cpp:2079
-#: Src/wptKeyEditDlgs.cpp:2090 Src/wptKeyEditDlgs.cpp:2119
-#: Src/wptKeyEditDlgs.cpp:2124 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptCommonDlg.cpp:135 Src/wptKeyEditDlgs.cpp:784
+#: Src/wptKeyEditDlgs.cpp:851 Src/wptKeyEditDlgs.cpp:891
+#: Src/wptKeyEditDlgs.cpp:904 Src/wptKeyEditDlgs.cpp:906
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditDlgs.cpp:962
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1045 Src/wptKeyEditDlgs.cpp:1063
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1116
+#: Src/wptKeyEditDlgs.cpp:1207 Src/wptKeyEditDlgs.cpp:1213
+#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1352 Src/wptKeyEditDlgs.cpp:1359
+#: Src/wptKeyEditDlgs.cpp:1395 Src/wptKeyEditDlgs.cpp:1399
+#: Src/wptKeyEditDlgs.cpp:1409 Src/wptKeyEditDlgs.cpp:1424
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1475 Src/wptKeyEditDlgs.cpp:1482
+#: Src/wptKeyEditDlgs.cpp:1488 Src/wptKeyEditDlgs.cpp:1493
+#: Src/wptKeyEditDlgs.cpp:1538 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1550 Src/wptKeyEditDlgs.cpp:1557
+#: Src/wptKeyEditDlgs.cpp:1560 Src/wptKeyEditDlgs.cpp:1600
+#: Src/wptKeyEditDlgs.cpp:1608 Src/wptKeyEditDlgs.cpp:1625
+#: Src/wptKeyEditDlgs.cpp:1645 Src/wptKeyEditDlgs.cpp:1653
+#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1789
+#: Src/wptKeyEditDlgs.cpp:1816 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1831 Src/wptKeyEditDlgs.cpp:1953
+#: Src/wptKeyEditDlgs.cpp:1955 Src/wptKeyEditDlgs.cpp:1988
+#: Src/wptKeyEditDlgs.cpp:1993 Src/wptKeyEditDlgs.cpp:2002
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeyEditDlgs.cpp:2020
+#: Src/wptKeyEditDlgs.cpp:2075 Src/wptKeyEditDlgs.cpp:2088
+#: Src/wptKeyEditDlgs.cpp:2099 Src/wptKeyEditDlgs.cpp:2128
+#: Src/wptKeyEditDlgs.cpp:2133 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1750
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1320,9 +1325,9 @@
#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
-#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
-#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
-#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:1505 Src/wptFileManager.cpp:1532
+#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1802
+#: Src/wptFileManager.cpp:1864 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1359,7 +1364,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:179
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
# c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1087
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1096
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1368,7 +1373,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:382 Src/wptKeyEditDlgs.cpp:1190
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1199
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
@@ -1422,7 +1427,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:296
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1450
#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
@@ -1451,50 +1456,51 @@
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1220
+#: Src/wptFileManager.cpp:1223
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1233
-#, c-format
+#: Src/wptFileManager.cpp:1236
+#, fuzzy, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
-"%s from \"%s\""
+"%s from \"%s\"\n"
+"%s"
msgstr ""
"–¼‚ª %s‚ð쬂µ‚Ü‚µ‚½BŽg—p‚µ‚½%s ƒL[ ID %s\n"
"%s ‚©‚ç \"%s\"‚Å‚·B"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1238
+#: Src/wptFileManager.cpp:1241
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1315
+#: Src/wptFileManager.cpp:1319
msgid "Choose Filename for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1324
+#: Src/wptFileManager.cpp:1328
msgid "Please enter filename for plaintext file"
msgstr "ƒvƒŒ[ƒ“ƒeƒLƒX—p‚̃gƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1006
# c:\oss\winpt\src\wptFileManager.cpp:1011
# c:\oss\winpt\src\wptFileManagerDlg.cpp:402
-#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManager.cpp:1366 Src/wptFileManager.cpp:1378
#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1368
+#: Src/wptFileManager.cpp:1372
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1503,7 +1509,7 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
-#: Src/wptFileManager.cpp:1375
+#: Src/wptFileManager.cpp:1379
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1512,32 +1518,32 @@
msgstr ""
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1423
+#: Src/wptFileManager.cpp:1427
msgid "Enter filename for signed file"
msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1527
+#: Src/wptFileManager.cpp:1531
msgid "Could not find detached signature in the clipboard."
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ÉŽæ‚èo‚µ‚½–¼‚ðŒ©‚Â‚¯‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1547
+#: Src/wptFileManager.cpp:1551
msgid "No files to check."
msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1564
+#: Src/wptFileManager.cpp:1568
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1566
+#: Src/wptFileManager.cpp:1570
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1594
+#: Src/wptFileManager.cpp:1598
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1552,7 +1558,7 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
+#: Src/wptFileManager.cpp:1696 Src/wptFileManager.cpp:1707
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:412
#: Src/wptImportList.cpp:418 Src/wptImportList.cpp:428
#: Src/wptImportList.cpp:436 Src/wptImportList.cpp:445
@@ -1563,7 +1569,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1285
# c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptFileManager.cpp:1700
+#: Src/wptFileManager.cpp:1704
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1579,7 +1585,7 @@
# c:\oss\winpt\src\wptKeyManager.cpp:262
# c:\oss\winpt\src\wptKeyManager.cpp:294
# c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:252
+#: Src/wptFileManager.cpp:1730 Src/wptKeyManager.cpp:252
#: Src/wptKeyManager.cpp:295 Src/wptKeyManager.cpp:330
msgid "No key was selected for export."
msgstr "ƒGƒLƒXƒ|[ƒg‚·‚邽‚߂̃L[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -1587,7 +1593,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1730 Src/wptFileManager.cpp:1753
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1595,7 +1601,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1684
+#: Src/wptFileManager.cpp:1738 Src/wptKeyManagerDlg.cpp:1684
#: Src/wptKeyManagerDlg.cpp:1718
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1605,51 +1611,51 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1066
-#: Src/wptKeyEditDlgs.cpp:1367 Src/wptKeyEditDlgs.cpp:1440
+#: Src/wptFileManager.cpp:1757 Src/wptKeyEditDlgs.cpp:1075
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1449
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1753
+#: Src/wptFileManager.cpp:1757
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1799
+#: Src/wptFileManager.cpp:1803
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1859
+#: Src/wptFileManager.cpp:1863
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "‘½”‚̃tƒ@ƒCƒ‹‚ðZipƒA[ƒJƒCƒu‚ɈƉ»‚·‚邱‚Æ‚ª—Ç‚¢‚±‚Æ‚Å‚·B"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1864
+#: Src/wptFileManager.cpp:1868
msgid "Choose File Name for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1934
+#: Src/wptFileManager.cpp:1938
msgid "Choose a Name for the Archive"
msgstr "ƒA[ƒJƒCƒu‚É–¼‘O‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
-#: Src/wptFileManager.cpp:1937
+#: Src/wptFileManager.cpp:1941
msgid "Invalid archive name. Exit."
msgstr "–³Œø‚ȃA[ƒJƒCƒu–¼BI—¹B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1941 Src/wptFileManager.cpp:1948
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1944
+#: Src/wptFileManager.cpp:1948
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1771,8 +1777,8 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1339
-#: Src/wptKeyEditDlgs.cpp:1390 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptFileManagerDlg.cpp:332 Src/wptKeyEditDlgs.cpp:1348
+#: Src/wptKeyEditDlgs.cpp:1399 Src/wptKeyEditDlgs.cpp:1475
#: Src/wptKeyManager.cpp:671 Src/wptKeyManager.cpp:773
#: Src/wptKeyManager.cpp:809 Src/wptKeyManagerDlg.cpp:1494
#: Src/wptKeyManagerDlg.cpp:1510 Src/wptKeyManagerDlg.cpp:1538
@@ -2101,7 +2107,7 @@
#: Src/wptGPGPrefsDlg.cpp:228 Src/wptGPGPrefsDlg.cpp:234
#: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:244
#: Src/wptGPGPrefsDlg.cpp:250 Src/wptGPGPrefsDlg.cpp:264
-#: Src/wptKeyEditDlgs.cpp:1753 Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyEditDlgs.cpp:1762 Src/wptKeyManagerDlg.cpp:940
#: Src/wptMainProc.cpp:439 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
@@ -2464,7 +2470,7 @@
#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1703
#: Src/wptKeyManagerDlg.cpp:1776 Src/wptKeyManagerDlg.cpp:1913
#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284
-#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412
+#: Src/wptKeysigDlg.cpp:358 Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:415
#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2563,11 +2569,11 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:255
-#: Src/wptKeyEditDlgs.cpp:1162 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1478 Src/wptKeyEditDlgs.cpp:1500
-#: Src/wptKeyEditDlgs.cpp:1539 Src/wptKeyEditDlgs.cpp:1572
-#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
+#: Src/wptImportList.cpp:262 Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:1171 Src/wptKeyEditDlgs.cpp:1232
+#: Src/wptKeyEditDlgs.cpp:1487 Src/wptKeyEditDlgs.cpp:1509
+#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1581
+#: Src/wptKeylist.cpp:393 Src/wptKeylist.cpp:427 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2577,9 +2583,9 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:257
-#: Src/wptKeyEditDlgs.cpp:1160 Src/wptKeyEditDlgs.cpp:1397
-#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
+#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:263
+#: Src/wptKeyEditDlgs.cpp:1169 Src/wptKeyEditDlgs.cpp:1406
+#: Src/wptKeylist.cpp:395 Src/wptKeylist.cpp:425 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
msgstr "ŠúŒÀØ‚ê"
@@ -2590,13 +2596,13 @@
msgstr "ӎФΨ"
# c:\oss\winpt\src\wptImportList.cpp:57
-#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:430
+#: Src/wptImportList.cpp:270 Src/wptKeylist.cpp:431
msgid "public key"
msgstr "ŒöŠJŒ®"
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1240
+#: Src/wptImportList.cpp:301 Src/wptKeyEditDlgs.cpp:1249
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2606,7 +2612,7 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:45
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
-#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
+#: Src/wptImportList.cpp:350 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553
#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:926
#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:112
@@ -2617,7 +2623,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:474 c:\oss\winpt\src\wptKeylist.cpp:40
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
-#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
+#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556
#: Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2628,8 +2634,8 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1084
-#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:858
+#: Src/wptImportList.cpp:352 Src/wptKeyEditDlgs.cpp:1093
+#: Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:858
#: Src/wptKeyManagerDlg.cpp:949 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:111
@@ -2641,15 +2647,15 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
# c:\oss\winpt\src\wptSigList.cpp:44
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1085
-#: Src/wptKeyEditDlgs.cpp:1192 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1094
+#: Src/wptKeyEditDlgs.cpp:1201 Src/wptKeylist.cpp:560
#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:952
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "ì¬"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:554
+#: Src/wptImportList.cpp:354 Src/wptKeylist.cpp:555
#: Src/wptKeyManagerDlg.cpp:859 Src/wptKeyManagerDlg.cpp:951
msgid "Type"
msgstr "Ží—Þ"
@@ -2685,32 +2691,32 @@
msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:228
+#: Src/wptKeyEditDlgs.cpp:234
msgid "Ultimate"
msgstr "ÅI“I"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
# c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeyEditDlgs.cpp:243 Src/wptKeyEditDlgs.cpp:1157
-#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
+#: Src/wptKeyEditDlgs.cpp:249 Src/wptKeyEditDlgs.cpp:1166
+#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:355
msgid "Never"
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptKeyEditDlgs.cpp:259 Src/wptKeyEditDlgs.cpp:1164
+#: Src/wptKeyEditDlgs.cpp:265 Src/wptKeyEditDlgs.cpp:1173
msgid "OK"
msgstr "OK"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:282
+#: Src/wptKeyEditDlgs.cpp:288
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:283
+#: Src/wptKeyEditDlgs.cpp:289
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2718,7 +2724,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:358
+#: Src/wptKeyEditDlgs.cpp:364
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
@@ -2729,7 +2735,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2739,7 +2745,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:360 Src/wptKeyEditDlgs.cpp:448
+#: Src/wptKeyEditDlgs.cpp:366 Src/wptKeyEditDlgs.cpp:454
#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2749,12 +2755,12 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:362
+#: Src/wptKeyEditDlgs.cpp:368
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:377
+#: Src/wptKeyEditDlgs.cpp:383
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2763,25 +2769,25 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyEditDlgs.cpp:391
-#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyEditDlgs.cpp:409
-#: Src/wptKeyEditDlgs.cpp:917
+#: Src/wptKeyEditDlgs.cpp:387 Src/wptKeyEditDlgs.cpp:397
+#: Src/wptKeyEditDlgs.cpp:403 Src/wptKeyEditDlgs.cpp:415
+#: Src/wptKeyEditDlgs.cpp:926
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:382
+#: Src/wptKeyEditDlgs.cpp:388
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "ŽŸ‚̃tƒ@ƒCƒ‹'%s'‚ª—LŒø‚ÈJPEG‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:248
-#: Src/wptKeyEditDlgs.cpp:391 Src/wptKeyRevokeDlg.cpp:149
+#: Src/wptKeyEditDlgs.cpp:397 Src/wptKeyRevokeDlg.cpp:149
msgid "Please enter a file name."
msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:395
+#: Src/wptKeyEditDlgs.cpp:401
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2790,7 +2796,7 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:414
+#: Src/wptKeyEditDlgs.cpp:420
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2809,23 +2815,23 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:167
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:75
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
-#: Src/wptKeyEditDlgs.cpp:415 Src/wptKeyEditDlgs.cpp:484
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:742
-#: Src/wptKeyEditDlgs.cpp:1502 Src/wptKeyEditDlgs.cpp:1574
-#: Src/wptKeyEditDlgs.cpp:1659 Src/wptKeyEditDlgs.cpp:1841
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeyEditDlgs.cpp:421 Src/wptKeyEditDlgs.cpp:491
+#: Src/wptKeyEditDlgs.cpp:575 Src/wptKeyEditDlgs.cpp:751
+#: Src/wptKeyEditDlgs.cpp:1511 Src/wptKeyEditDlgs.cpp:1583
+#: Src/wptKeyEditDlgs.cpp:1668 Src/wptKeyEditDlgs.cpp:1850
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:318
-#: Src/wptKeyEditDlgs.cpp:446
+#: Src/wptKeyEditDlgs.cpp:452
msgid "Appointing a key as designated revoker cannot be undone."
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤Žw’肳‚ꂽŒãAŒ³‚É–ß‚³‚ê‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:319
-#: Src/wptKeyEditDlgs.cpp:447
+#: Src/wptKeyEditDlgs.cpp:453
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2833,8 +2839,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:358
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:708
-#: Src/wptKeyEditDlgs.cpp:450 Src/wptKeyEditDlgs.cpp:466
-#: Src/wptKeyEditDlgs.cpp:478 Src/wptKeyEditDlgs.cpp:948
+#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:472
+#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:957
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2843,35 +2849,35 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1324
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1365
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:466 Src/wptKeyEditDlgs.cpp:1534
-#: Src/wptKeyEditDlgs.cpp:1591 Src/wptKeyEditDlgs.cpp:1636
-#: Src/wptKeyEditDlgs.cpp:1780 Src/wptKeyEditDlgs.cpp:1811
-#: Src/wptKeyEditDlgs.cpp:1979
+#: Src/wptKeyEditDlgs.cpp:472 Src/wptKeyEditDlgs.cpp:1543
+#: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1645
+#: Src/wptKeyEditDlgs.cpp:1789 Src/wptKeyEditDlgs.cpp:1820
+#: Src/wptKeyEditDlgs.cpp:1988
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:483
+#: Src/wptKeyEditDlgs.cpp:490
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:524
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:518
+#: Src/wptKeyEditDlgs.cpp:526
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:519
+#: Src/wptKeyEditDlgs.cpp:527
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:535
+#: Src/wptKeyEditDlgs.cpp:543
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2879,14 +2885,14 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:535 Src/wptKeyEditDlgs.cpp:539
-#: Src/wptKeyEditDlgs.cpp:544 Src/wptKeyEditDlgs.cpp:548
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:543 Src/wptKeyEditDlgs.cpp:547
+#: Src/wptKeyEditDlgs.cpp:552 Src/wptKeyEditDlgs.cpp:556
+#: Src/wptKeyEditDlgs.cpp:573
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:547
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2894,43 +2900,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:544
+#: Src/wptKeyEditDlgs.cpp:552
msgid "Please enter an email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:548
+#: Src/wptKeyEditDlgs.cpp:556
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:575
msgid "user ID successfully added."
msgstr "ƒ†[ƒU[ID‚𳂵‚’ljÁ‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:472
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:656
-#: Src/wptKeyEditDlgs.cpp:651 Src/wptKeyEditDlgs.cpp:855
+#: Src/wptKeyEditDlgs.cpp:660 Src/wptKeyEditDlgs.cpp:864
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:652
+#: Src/wptKeyEditDlgs.cpp:661
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:653
+#: Src/wptKeyEditDlgs.cpp:662
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:654
+#: Src/wptKeyEditDlgs.cpp:663
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:700
+#: Src/wptKeyEditDlgs.cpp:709
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2943,18 +2949,18 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:540
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:637
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:676
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:707
-#: Src/wptKeyEditDlgs.cpp:739 Src/wptKeyEditDlgs.cpp:838
+#: Src/wptKeyEditDlgs.cpp:710 Src/wptKeyEditDlgs.cpp:716
+#: Src/wptKeyEditDlgs.cpp:748 Src/wptKeyEditDlgs.cpp:847
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:706
+#: Src/wptKeyEditDlgs.cpp:715
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS‚͌ŒèƒL[ƒTƒCƒY1024‚ªŽg—p‚µ‚Ü‚·BƒTƒCƒY‚ª•ÏX‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:678
-#: Src/wptKeyEditDlgs.cpp:741
+#: Src/wptKeyEditDlgs.cpp:750
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2967,10 +2973,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1196
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:918
-#: Src/wptKeyEditDlgs.cpp:769 Src/wptKeyEditDlgs.cpp:837
-#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeyEditDlgs.cpp:948
-#: Src/wptKeyEditDlgs.cpp:1028 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyEditDlgs.cpp:1461 Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:778 Src/wptKeyEditDlgs.cpp:846
+#: Src/wptKeyEditDlgs.cpp:925 Src/wptKeyEditDlgs.cpp:957
+#: Src/wptKeyEditDlgs.cpp:1037 Src/wptKeyEditDlgs.cpp:1395
+#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1532
#: Src/wptKeyManagerDlg.cpp:1527
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -2978,29 +2984,29 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:579
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:599
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:613
-#: Src/wptKeyEditDlgs.cpp:770 Src/wptKeyEditDlgs.cpp:788
+#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:797
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:904
msgid "Preferred keyserver successfully set."
msgstr "Šó–]‚̃L[ƒT[ƒo[‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:58
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:189
-#: Src/wptKeyEditDlgs.cpp:982 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyEditDlgs.cpp:991 Src/wptKeyEditOwnertrustDlg.cpp:55
#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyManager.cpp:156
-#: Src/wptKeyEditDlgs.cpp:985 Src/wptKeyManager.cpp:208
+#: Src/wptKeyEditDlgs.cpp:994 Src/wptKeyManager.cpp:208
msgid "Key status changed."
msgstr "ƒL[‚Ìó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:1034
+#: Src/wptKeyEditDlgs.cpp:1043
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -3009,19 +3015,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:1041
+#: Src/wptKeyEditDlgs.cpp:1050
msgid "Current (old) Passphrase"
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:1045
+#: Src/wptKeyEditDlgs.cpp:1054
msgid "New Passphrase"
msgstr "V‚µ‚¢ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:771
# c:\oss\winpt\src\wptKeygenDlg.cpp:250
# c:\oss\winpt\src\wptPassphraseDlg.cpp:153
-#: Src/wptKeyEditDlgs.cpp:1052 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1061 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3030,55 +3036,55 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1064
+#: Src/wptKeyEditDlgs.cpp:1073
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1066
+#: Src/wptKeyEditDlgs.cpp:1075
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1083 Src/wptKeyManagerDlg.cpp:865
+#: Src/wptKeyEditDlgs.cpp:1092 Src/wptKeyManagerDlg.cpp:865
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1086
+#: Src/wptKeyEditDlgs.cpp:1095
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
-#: Src/wptKeyEditDlgs.cpp:1100 Src/wptKeyEditDlgs.cpp:1198
+#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1207
msgid "Could not find key."
msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
-#: Src/wptKeyEditDlgs.cpp:1107
+#: Src/wptKeyEditDlgs.cpp:1116
msgid "No subkey(s) found."
msgstr "ƒTƒuƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
# c:\oss\winpt\src\wptKeylist.cpp:53
-#: Src/wptKeyEditDlgs.cpp:1189 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1198 Src/wptKeylist.cpp:549 Src/wptKeylist.cpp:558
#: Src/wptKeyManagerDlg.cpp:862
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1191
+#: Src/wptKeyEditDlgs.cpp:1200
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1204
+#: Src/wptKeyEditDlgs.cpp:1213
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1298
+#: Src/wptKeyEditDlgs.cpp:1307
#, fuzzy
msgid ""
"ADDUID \t\tadd a user ID\r\n"
@@ -3119,22 +3125,22 @@
"ENABLE \t\tƒL[‚ð—LŒø‚É‚·‚é\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1319
+#: Src/wptKeyEditDlgs.cpp:1328
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1335
+#: Src/wptKeyEditDlgs.cpp:1344
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptKeyEditDlgs.cpp:1352
msgid "Primary subkey can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒTƒuƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1351
+#: Src/wptKeyEditDlgs.cpp:1360
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3152,16 +3158,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1363
+#: Src/wptKeyEditDlgs.cpp:1372
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeyEditDlgs.cpp:1376
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1398
+#: Src/wptKeyEditDlgs.cpp:1407
msgid ""
"Key already expired.\n"
"\n"
@@ -3174,22 +3180,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:1407 Src/wptKeyEditDlgs.cpp:1410
+#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1419
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1433
+#: Src/wptKeyEditDlgs.cpp:1442
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1439
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1479
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3202,37 +3208,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1488
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1498
+#: Src/wptKeyEditDlgs.cpp:1507
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1502
+#: Src/wptKeyEditDlgs.cpp:1511
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1533
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1529
+#: Src/wptKeyEditDlgs.cpp:1538
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1540
+#: Src/wptKeyEditDlgs.cpp:1549
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1546
+#: Src/wptKeyEditDlgs.cpp:1555
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3244,57 +3250,57 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1570
+#: Src/wptKeyEditDlgs.cpp:1579
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1574
+#: Src/wptKeyEditDlgs.cpp:1583
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1616
+#: Src/wptKeyEditDlgs.cpp:1625
#, fuzzy
msgid "Could not set user ID preferences"
msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1388
-#: Src/wptKeyEditDlgs.cpp:1656
+#: Src/wptKeyEditDlgs.cpp:1665
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1659
+#: Src/wptKeyEditDlgs.cpp:1668
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1746
+#: Src/wptKeyEditDlgs.cpp:1755
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1752
+#: Src/wptKeyEditDlgs.cpp:1761
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:1754
+#: Src/wptKeyEditDlgs.cpp:1763
#, fuzzy
msgid "user ID:"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1764 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1806
+#: Src/wptKeyEditDlgs.cpp:1815
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1817
+#: Src/wptKeyEditDlgs.cpp:1826
#, fuzzy, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3308,21 +3314,21 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1846
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1841
+#: Src/wptKeyEditDlgs.cpp:1850
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1946
+#: Src/wptKeyEditDlgs.cpp:1955
msgid "Finished to compact key."
msgstr ""
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:1992
#, fuzzy
msgid "Do you really want to make this sig exportable?"
msgstr ""
@@ -3331,32 +3337,32 @@
"%s"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:2007 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:2016 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:2065
+#: Src/wptKeyEditDlgs.cpp:2074
msgid "Could not set subkey window procedure."
msgstr "ƒTƒuƒL[ƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:2078
+#: Src/wptKeyEditDlgs.cpp:2087
msgid "Could not set user ID window procedure."
msgstr "ƒ†[ƒU[IDƒEƒBƒ“ƒhƒvƒƒV[ƒWƒƒ‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:2087
+#: Src/wptKeyEditDlgs.cpp:2096
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2119
+#: Src/wptKeyEditDlgs.cpp:2128
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2123
+#: Src/wptKeyEditDlgs.cpp:2132
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3450,17 +3456,17 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:244 c:\oss\winpt\src\wptKeygenDlg.cpp:252
# c:\oss\winpt\src\wptKeygenDlg.cpp:289 c:\oss\winpt\src\wptKeygenDlg.cpp:311
# c:\oss\winpt\src\wptKeygenDlg.cpp:392
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
-#: Src/wptKeygenDlg.cpp:372 Src/wptKeygenDlg.cpp:411 Src/wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
-#: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
-#: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
+#: Src/wptKeygenDlg.cpp:368 Src/wptKeygenDlg.cpp:407 Src/wptKeygenDlg.cpp:412
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:422 Src/wptKeygenDlg.cpp:428
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:447 Src/wptKeygenDlg.cpp:454
+#: Src/wptKeygenDlg.cpp:489 Src/wptKeygenDlg.cpp:582
#: Src/wptKeyManagerDlg.cpp:1607 Src/wptPassphraseDlg.cpp:109
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
# c:\oss\winpt\src\wptKeygenDlg.cpp:60
-#: Src/wptKeygenDlg.cpp:289
+#: Src/wptKeygenDlg.cpp:285
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -3478,58 +3484,58 @@
"Ž©•ª‚̃L[ƒŠƒ“ƒO‚ðƒoƒbƒNƒAƒbƒv‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:294
+#: Src/wptKeygenDlg.cpp:290
msgid "WARNING - Important hint"
msgstr "Œx - d—v‚ȃqƒ“ƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:67
-#: Src/wptKeygenDlg.cpp:296
+#: Src/wptKeygenDlg.cpp:292
msgid "Destination for Public Keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚Ì‚ ‚Äæ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:72 c:\oss\winpt\src\wptKeygenDlg.cpp:80
-#: Src/wptKeygenDlg.cpp:302 Src/wptKeygenDlg.cpp:311
+#: Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
#, c-format
msgid "Could not copy %s -> %s"
msgstr "ˆÈ‰º‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½ %s -> %s"
# c:\oss\winpt\src\wptKeygenDlg.cpp:75
-#: Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:301
msgid "Destination for Secret Keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚Ì‚ ‚Äæ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:95
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and ELG (default)"
msgstr "DSA ‹y‚Ñ ELG (Šù’è)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:96
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA and RSA"
msgstr "DSA ‹y‚Ñ RSA"
# c:\oss\winpt\src\wptKeygenDlg.cpp:97
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:325
msgid "DSA sign only"
msgstr "DSA–¼‚Ì‚Ý"
# c:\oss\winpt\src\wptKeygenDlg.cpp:98
-#: Src/wptKeygenDlg.cpp:330
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign only"
msgstr "RSA–¼‚Ì‚Ý"
# c:\oss\winpt\src\wptKeygenDlg.cpp:99
-#: Src/wptKeygenDlg.cpp:331
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA sign and encrypt"
msgstr "RSA –¼‹y‚шƉ»"
# c:\oss\winpt\src\wptKeygenDlg.cpp:100
-#: Src/wptKeygenDlg.cpp:332
+#: Src/wptKeygenDlg.cpp:328
msgid "RSA and RSA (PGP)"
msgstr "RSA ‹y‚Ñ RSA (PGP)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:144
-#: Src/wptKeygenDlg.cpp:374
+#: Src/wptKeygenDlg.cpp:370
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation was finished."
@@ -3538,84 +3544,84 @@
"ƒZ[ƒW‚ª‚Ђ傤‚¶‚·‚é‚Ü‚Å‚¨‘Ò‚¿‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:372
msgid "Subkey size in &bits"
msgstr "ƒTƒuƒL[‚̃rƒbƒg’PˆÊ‚Å‚Ì‘å‚«‚³(&B)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:147
-#: Src/wptKeygenDlg.cpp:377
+#: Src/wptKeygenDlg.cpp:373
msgid "&Real name"
msgstr "ŽÀ–¼(&R)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:153
-#: Src/wptKeygenDlg.cpp:381
+#: Src/wptKeygenDlg.cpp:377
msgid "Key &type"
msgstr "ƒL[‚ÌŽí—Þ(&T)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:189
-#: Src/wptKeygenDlg.cpp:410
+#: Src/wptKeygenDlg.cpp:406
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "–³Œø‚È’lB—LŒø”͈͂Í1024`4096ƒrƒbƒg‚Å‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:194
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:411
msgid "Do you really need such a large key?"
msgstr "‚±‚̂悤‚È’·‚¢ƒL[‚ð–{“–‚É‚¢‚è‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:566
+#: Src/wptKeygenDlg.cpp:417 Src/wptKeygenDlg.cpp:562
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:425 Src/wptKeygenDlg.cpp:571
+#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:567
msgid "Please do not enter the email address in the name field."
msgstr "–¼‘O‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:577
+#: Src/wptKeygenDlg.cpp:427 Src/wptKeygenDlg.cpp:573
msgid "Please enter a valid email address."
msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:211
-#: Src/wptKeygenDlg.cpp:438
+#: Src/wptKeygenDlg.cpp:434
msgid "Please do NOT enter the email address in the comment field."
msgstr "ƒRƒƒ“ƒg‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeygenDlg.cpp:457 Src/wptKeyRevokeDlg.cpp:157
+#: Src/wptKeygenDlg.cpp:453 Src/wptKeyRevokeDlg.cpp:157
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:292 c:\oss\winpt\src\wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
+#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:607
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:539
+#: Src/wptKeygenDlg.cpp:535
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:540
+#: Src/wptKeygenDlg.cpp:536
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:541
+#: Src/wptKeygenDlg.cpp:537
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:538
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:539
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents that your public key they are\n"
@@ -3626,7 +3632,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:540
msgid ""
"By accosiating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3639,19 +3645,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:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
-#: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
+#: Src/wptKeygenDlg.cpp:541 Src/wptKeygenDlg.cpp:563 Src/wptKeygenDlg.cpp:568
+#: Src/wptKeygenDlg.cpp:574 Src/wptKeygenDlg.cpp:579 Src/wptKeygenDlg.cpp:603
#: Src/wptKeyManagerDlg.cpp:1630
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:543
msgid "E&xpert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:582
+#: Src/wptKeygenDlg.cpp:578
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3731,37 +3737,37 @@
msgid "Public Key"
msgstr "ŒöŠJŒ®"
-#: Src/wptKeylist.cpp:352
+#: Src/wptKeylist.cpp:353
msgid "None"
msgstr "‚È‚µ"
# c:\oss\winpt\src\wptMAPI.cpp:396 c:\oss\winpt\src\wptMAPI.cpp:404
-#: Src/wptKeylist.cpp:356
+#: Src/wptKeylist.cpp:357
msgid "Marginal"
msgstr "‚Ù‚ñ‚̂킸‚©‚΂©‚è"
-#: Src/wptKeylist.cpp:359
+#: Src/wptKeylist.cpp:360
msgid "Full"
msgstr "ƒtƒ‹"
-#: Src/wptKeylist.cpp:396 Src/wptKeylist.cpp:422 Src/wptKeyPropsDlg.cpp:166
+#: Src/wptKeylist.cpp:397 Src/wptKeylist.cpp:423 Src/wptKeyPropsDlg.cpp:166
msgid "Disabled"
msgstr "–³Œø‰»‚È‚Á‚½"
# c:\oss\winpt\src\wptKeylist.cpp:167
-#: Src/wptKeylist.cpp:432
+#: Src/wptKeylist.cpp:433
msgid "key pair"
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:547 Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557 Src/wptKeyManagerDlg.cpp:861
#: Src/wptKeyManagerDlg.cpp:950
msgid "Cipher"
msgstr "ˆÃ†"
# c:\oss\winpt\src\wptKeylist.cpp:54 c:\oss\winpt\src\wptVerifyList.cpp:78
# c:\oss\winpt\src\wptVerifyList.cpp:86
-#: Src/wptKeylist.cpp:558 Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeylist.cpp:559 Src/wptKeyManagerDlg.cpp:863
#: Src/wptVerifyList.cpp:110
msgid "Trust"
msgstr "M—p"
@@ -3770,12 +3776,12 @@
# c:\oss\winpt\src\wptFileManager.cpp:1030
# c:\oss\winpt\src\wptKeylist.cpp:569 c:\oss\winpt\src\wptPassphraseCB.cpp:75
# c:\oss\winpt\src\wptVerifyList.cpp:160
-#: Src/wptKeylist.cpp:732 Src/wptPassphraseCB.cpp:123
+#: Src/wptKeylist.cpp:733 Src/wptPassphraseCB.cpp:123
msgid "Invalid User ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
# c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1006
+#: Src/wptKeylist.cpp:1007
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -3791,12 +3797,12 @@
"‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
+#: Src/wptKeylist.cpp:1015 Src/wptKeylist.cpp:1079
msgid "Recipients"
msgstr "ŽóMŽÒ"
# c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1079
+#: Src/wptKeylist.cpp:1080
#, c-format
msgid ""
"KeyID %s.\n"
@@ -3806,7 +3812,7 @@
"–{“–‚É–³Œø‚ȃL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1181
+#: Src/wptKeylist.cpp:1182
msgid "Secret Key List"
msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
@@ -4137,7 +4143,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:974
-#: Src/wptKeysigDlg.cpp:397
+#: Src/wptKeysigDlg.cpp:400
msgid "&Properties"
msgstr "‘®«(&P)"
@@ -5078,13 +5084,13 @@
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptKeysigDlg.cpp:394
+#: Src/wptKeysigDlg.cpp:395
#, c-format
msgid "Signature List for \"%s\""
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeysigDlg.cpp:333
-#: Src/wptKeysigDlg.cpp:396
+#: Src/wptKeysigDlg.cpp:399
msgid "&Receive Key"
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/ChangeLog 2006-04-22 18:30:24 UTC (rev 201)
@@ -1,3 +1,24 @@
+2006-04-22 Timo Schulz <ts at g10code.de>
+
+ * wptKeyEditDlgs.cpp (addrevoker_dlg_proc): Encode
+ revoker name in UTF8.
+ * wptKeysigDlg.cpp (keysig_dlg_proc): Fix utf8 problem
+ with the window title.
+
+2006-04-20 Timo Schulz <ts at g10code.de>
+
+ * wptUTF8.cpp (native_to_utf8): Use c++ alloc.
+ * wptKeygenDlg.cpp (keygen_dlg_proc): Do not mix c and
+ c++ memory allocation.
+ * wptFileManager.cpp (show_verify_result): Show PKA status
+ if possible.
+ * wptClipVerifyDlg.cpp (get_pka_status): New.
+ (clip_verify_dlg_proc): Show PKA status if possible.
+ * wptClipEditDlg.cpp (clip_edit_dlg_proc): Handle IDCANCEL
+ to use ESC to quit the dialog.
+ * wptKeyEditDlgs.cpp (keyedit_adduid_dlg_proc): Also
+ encode the comment in UTF8. Thanks to Werner and Jan.
+
2006-04-16 Timo Schulz <ts at g10code.de>
* wptHTTP.cpp (getErrorCode): New.
Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptClipEditDlg.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -203,7 +203,7 @@
center_window (dlg, NULL);
SetForegroundWindow (dlg);
return TRUE;
-
+
case WM_HELP:
html_help_dispatch (lparam, "winpt.chm::winpt_texts.txt", help_arr);
break;
@@ -215,6 +215,10 @@
case WM_COMMAND:
switch (LOWORD (wparam)) {
+ case IDCANCEL:
+ EndDialog (dlg, FALSE);
+ return TRUE;
+
case IDOK:
EndDialog (dlg, TRUE);
return TRUE;
Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptClipVerifyDlg.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -138,6 +138,25 @@
}
+/* Return human printable PKA status.
+ If no pka information is available, return NULL. */
+char*
+get_pka_status (gpgme_signature_t sig)
+{
+ const char *fmt;
+ char *pka_inf;
+
+ if (sig->pka_trust == 0 || !sig->pka_address)
+ return NULL;
+ fmt = _("PKA: Verified signer's address is '%s'");
+ pka_inf = new char[strlen (fmt)+strlen (sig->pka_address)+2];
+ if (!pka_inf)
+ BUG (NULL);
+ sprintf (pka_inf, fmt, sig->pka_address);
+ return pka_inf;
+}
+
+
/* Dialog procedure for the clipboard verification. */
BOOL CALLBACK
clip_verify_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -152,7 +171,7 @@
WORD port = HKP_PORT;
int rc = 0, det_len=0;
- switch( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
SetWindowText (dlg, _("Verify"));
SetDlgItemText (dlg, IDC_VERIFY_SAVE, _("&Save"));
@@ -236,7 +255,14 @@
_("Verify"), MB_ERR);
}
if (sig->exp_timestamp > (DWORD)time (NULL))
- SetDlgItemText( dlg, IDC_VERIFY_INFO, _("The signature is expired!") );
+ SetDlgItemText (dlg, IDC_VERIFY_INFO, _("The signature is expired!"));
+ else {
+ char *pka_info = get_pka_status (sig);
+ if (pka_info != NULL) {
+ SetDlgItemText (dlg, IDC_VERIFY_INFO, pka_info);
+ free_if_alloc (pka_info);
+ }
+ }
if (sig->notations)
show_notation_data (dlg, sig->notations);
gpgme_release (c);
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptFileManager.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -1204,6 +1204,9 @@
}
+char* get_pka_status (gpgme_signature_t sig);
+
+
/* Show the human readable verify result from @sigres. */
static void
show_verify_result (gpgme_verify_result_t sigres)
@@ -1211,7 +1214,7 @@
gpgme_key_t key=NULL;
gpgme_signature_t sig=sigres->signatures;
const char *s, *keyid;
- char *uid;
+ char *uid, *pka_info;
char buf[384];
int sigok = 0;
@@ -1221,7 +1224,7 @@
keyid = sig->fpr;
if (!keyid)
return;
-
+ pka_info = get_pka_status (sig);
keyid = strlen (sig->fpr) == 40? sig->fpr+32 : sig->fpr + 24;
get_pubkey (sig->fpr, &key);
@@ -1231,11 +1234,12 @@
uid = strdup (_("user ID not found"));
_snprintf (buf, sizeof (buf)-1, _("Signature made %s using %s key ID %s\n"
- "%s from \"%s\""),
+ "%s from \"%s\"\n%s"),
strtimestamp (sig->timestamp),
get_key_pubalgo (sig->pubkey_algo),
- keyid, s, uid);
+ keyid, s, uid, pka_info? pka_info : "");
msg_box (NULL, buf, _("Decrypt Verify"), sigok? MB_OK: MB_ICONWARNING|MB_OK);
+ free_if_alloc (pka_info);
safe_free (uid);
}
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -206,20 +206,26 @@
/* Add a new user-id to the list view @lv. */
static void
do_add_new_userid (listview_ctrl_t lv,
- const char *utf8_name, const char *email, const char *comment)
+ const char *utf8_name, const char *email,
+ const char *utf8_comment)
{
- char *p, *uid;
+ char *p, *uid, *com;
size_t n;
n = strlen (utf8_name) + strlen (email) + 16;
- if (comment)
- n += strlen (comment);
- uid = utf8_to_native (utf8_name);
+ if (utf8_comment)
+ n += strlen (utf8_comment);
+ uid = utf8_to_native (utf8_name);
p = new char[n+1];
if (!p)
BUG (NULL);
- if (comment)
- sprintf (p, "%s (%s)", uid, comment);
+ if (utf8_comment) {
+ com = utf8_to_native (utf8_comment);
+ if (!com)
+ BUG (NULL);
+ sprintf (p, "%s (%s)", uid, com);
+ free_if_alloc (com);
+ }
else
sprintf (p, "%s", uid);
free (uid);
@@ -434,7 +440,7 @@
static keyedit_cb_t cb;
gpgme_error_t err;
GpgKeyEdit *ke;
- char uid[128];
+ char uid[128], *utf8_uid;
switch (msg) {
case WM_INITDIALOG:
@@ -466,13 +472,14 @@
msg_box( dlg, _("Please select a user ID."), _("Add Revoker"), MB_ERR );
return FALSE;
}
-
+ utf8_uid = native_to_utf8 (uid);
ke = create_GpgKeyEdit (cb->keyid);
if (cb->pass)
ke->setPassphrase (cb->pass);
else
ke->setNoPassphrase (true);
- err = ke->addDesignatedRevoker (uid);
+ err = ke->addDesignatedRevoker (utf8_uid);
+ free_if_alloc (utf8_uid);
delete ke;
if (err) {
msg_box (dlg, gpgme_strerror (err), _("Add Revoker"), MB_ERR);
@@ -505,6 +512,7 @@
gpgme_error_t err;
GpgKeyEdit *ke;
char *utf8_name = NULL;
+ char *utf8_comment = NULL;
char name[128], email[128], comment[128];
int rc;
@@ -551,25 +559,26 @@
rc = GetDlgItemText (dlg, IDC_ADDUID_COMMENT,
comment, sizeof comment -1);
- utf8_name = native_to_utf8 (name);
+ if (rc > 0)
+ utf8_comment = native_to_utf8 (comment);
+ utf8_name = native_to_utf8 (name);
ke = create_GpgKeyEdit (ctx->keyid);
if (ctx->is_protected)
ke->setPassphrase (ctx->pass);
else
ke->setNoPassphrase (true);
- err = ke->addUserid (utf8_name, rc > 0? comment : NULL, email);
+ err = ke->addUserid (utf8_name, utf8_comment, email);
if (err)
msg_box (dlg, gpgme_strerror (err), _("UserID"), MB_ERR);
else {
msg_box (dlg, _("user ID successfully added."), _("GnuPG Status"), MB_OK);
ctx->finished = 1;
- keygen->name = m_strdup (utf8_name);
- keygen->comment = rc > 0? m_strdup (comment) : NULL;
+ keygen->name = utf8_name;
+ keygen->comment = utf8_comment;
keygen->email = m_strdup (email);
}
delete ke;
- free (utf8_name);
EndDialog (dlg, TRUE);
return TRUE;
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptKeygenDlg.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -91,8 +91,8 @@
"Key-Length: %d\n"
"Key-Usage: %s\n"
"Name-Real: %s\n"
- "Name-Email: %s\n"
"Name-Comment: %s\n"
+ "Name-Email: %s\n"
"Expire-Date: %s\n"
"Passphrase: %s\n"
"</GnupgKeyParms>\n";
@@ -126,7 +126,7 @@
size += strlen (key_params);
if (expdate)
size += strlen (expdate) + 1;
- p = (char *)malloc (size+1);
+ p = new char[size+1];
if (!p)
BUG (0);
/* XXX: simply the whole switch-case code. */
@@ -172,9 +172,7 @@
break;
default:
- if (p)
- free (p);
- p = NULL;
+ free_if_alloc (p);
break;
}
}
@@ -220,9 +218,7 @@
break;
default:
- if (p)
- free (p);
- p = NULL;
+ free_if_alloc (p);
break;
}
}
@@ -249,7 +245,7 @@
err = gpgme_op_genkey (ctx, params, NULL, NULL);
if (!err) {
res = gpgme_op_genkey_result (ctx);
- *fpr = res->fpr? strdup (res->fpr) : NULL;
+ *fpr = res->fpr? m_strdup (res->fpr) : NULL;
}
gpgme_release (ctx);
return err;
@@ -466,7 +462,7 @@
BUG (0);
p = gpg_genkey_params (keytype, bits, utf8_name, NULL,
email, expire, pwd);
- safe_free (utf8_name);
+ free_if_alloc (utf8_name);
}
else {
char *utf8_name, *utf8_comment;
@@ -476,20 +472,20 @@
BUG (0);
p = gpg_genkey_params (keytype, bits, utf8_name, utf8_comment,
email, expire, pwd);
- safe_free (utf8_name);
- safe_free (utf8_comment);
+ free_if_alloc (utf8_name);
+ free_if_alloc (utf8_comment);
}
keygen_cb_dlg_create ();
err = gpg_genkey (p, keygen_cb, &fpr);
sfree_if_alloc (pwd);
if (p) {
wipememory (p, strlen (p)); /* burn the passphrase! */
- free (p);
+ free_if_alloc (p);
}
keygen_cb_dlg_destroy ();
keygen_cb (NULL, NULL, 0, 0, 0); /* flush */
if (err) {
- safe_free (fpr);
+ free_if_alloc (fpr);
msg_box (dlg, gpgme_strerror (err), _("Key Generation"), MB_ERR);
return FALSE;
}
@@ -497,7 +493,7 @@
keycache_update (0, fpr);
keycache_update (1, fpr);
- safe_free (fpr);
+ free_if_alloc (fpr);
clear_dlg_fields (dlg);
backup_keyrings (dlg);
@@ -593,27 +589,26 @@
pubkey_algo = GPG_KEYGEN_DSA_RSA;
p = gpg_genkey_params (pubkey_algo, DFAULT_KEYSIZE, utf8_name,
NULL, email, NULL, pass);
- free( utf8_name );
+ free_if_alloc (utf8_name);
keygen_cb_dlg_create();
err = gpg_genkey (p, keygen_cb, &fpr);
keygen_cb_dlg_destroy();
- keygen_cb( NULL, NULL, 0, 0, 0 );
- if( p ) {
- memset( p, 0, strlen( p ) );
- free( p );
+ keygen_cb (NULL, NULL, 0, 0, 0);
+ if (p) {
+ wipememory (p, strlen (p));
+ free_if_alloc (p);
}
sfree_if_alloc (pass);
- if( err ) {
- msg_box( dlg, gpgme_strerror( err ), _("Key Generation Wizard"), MB_ERR );
- if (fpr)
- free (fpr);
+ if (err) {
+ msg_box (dlg, gpgme_strerror( err ), _("Key Generation Wizard"), MB_ERR);
+ free_if_alloc (fpr);
return FALSE;
}
status_box( dlg, _("Key Generation completed"), _("GnuPG Status") );
keycache_update (0, fpr);
keycache_update (1, fpr);
- safe_free (fpr);
+ free_if_alloc (fpr);
backup_keyrings (dlg);
if (ctx)
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptKeylist.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -303,6 +303,7 @@
case GPGME_PK_DSA: return "DSA";
case GPGME_PK_ELG:
case GPGME_PK_ELG_E: return "ELG";
+ case 0: /* XXX: gpgme returned pubkey algo 0 for a RSA made sig. */
case GPGME_PK_RSA: return "RSA";
default: return "???";
}
Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptKeysigDlg.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -382,7 +382,7 @@
static struct winpt_key_s *k;
gpgme_key_sig_t ks;
HWND sl;
- char inf[384];
+ char inf[384], *utf8_uid;
int idx = 0;
switch (msg) {
@@ -390,8 +390,11 @@
k = (winpt_key_t) lparam;
if (!k)
BUG (0);
- if (k->uid)
- _snprintf (inf, DIM (inf)-1, _("Signature List for \"%s\""), k->uid);
+ if (k->uid) {
+ utf8_uid = utf8_to_native (k->uid);
+ _snprintf (inf, DIM (inf)-1, _("Signature List for \"%s\""), utf8_uid);
+ safe_free (utf8_uid);
+ }
SetWindowText (dlg, inf);
SetDlgItemText (dlg, IDC_KEYSIG_RECVKEY, _("&Receive Key"));
SetDlgItemText (dlg, IDC_KEYSIG_SIGPROPS, _("&Properties"));
Modified: trunk/Src/wptUTF8.cpp
===================================================================
--- trunk/Src/wptUTF8.cpp 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/Src/wptUTF8.cpp 2006-04-22 18:30:24 UTC (rev 201)
@@ -43,13 +43,13 @@
if (n < 0)
return NULL;
- result = (wchar_t*)malloc ((n+1) * sizeof *result);
+ result = new wchar_t[n+1];
if (!result)
BUG (0);
n = MultiByteToWideChar (GetACP (), 0, string, -1, result, n);
if (n < 0) {
- free (result);
+ free_if_alloc (result);
return NULL;
}
@@ -57,17 +57,17 @@
if (n < 0)
return NULL;
- native = (char*)malloc (n+1);
+ native = new char[n+1];
if (!native)
BUG (0);
n = WideCharToMultiByte (CP_UTF8, 0, result, -1, native, n, NULL, NULL);
if (n < 0) {
- free (result);
+ free_if_alloc (result);
return NULL;
}
- free (result);
+ free_if_alloc (result);
return native;
}
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/THANKS 2006-04-22 18:30:24 UTC (rev 201)
@@ -52,6 +52,7 @@
Oliver Nittka nittka at esem.com
Leo Lincourt leo at lcsweb.net
Lutz Zolondz lutz at g-n-u.de
+Jan Oliver Wagner
Jason Antony s1118355 at student.gu.edu.au
J. Spence spenceje at hotmail.com
Jonathan Clark jonathanc at webmaint.com
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-04-17 09:12:50 UTC (rev 200)
+++ trunk/configure.ac 2006-04-22 18:30:24 UTC (rev 201)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.12-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.12, 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