[Winpt-commits] r187 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 22 12:04:24 CET 2006
Author: twoaday
Date: 2006-03-22 12:04:20 +0100 (Wed, 22 Mar 2006)
New Revision: 187
Modified:
trunk/Include/wptUTF8.h
trunk/NEWS
trunk/Po/POTFILES.in
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/README
trunk/Src/ChangeLog
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptImportList.cpp
trunk/Src/wptKeyCache.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManager.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyRevokeDlg.cpp
trunk/Src/wptKeyRevokersDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/Src/wptKeysigDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/Src/wptPassphraseCB.cpp
trunk/Src/wptSigList.cpp
trunk/Src/wptUTF8.cpp
trunk/Src/wptVerifyList.cpp
trunk/TODO
trunk/configure.ac
Log:
2006-03-21 Timo Schulz <ts at g10code.de>
* wptUTF8.cpp (native_to_utf8): Use directly W32 API.
(utf8_to_native): Likewise. Remove cp850 conversion.
* wptKeyEditDlgs.cpp (do_find_userid): Correct UTF8 handling.
* wptKeyManager.cpp (km_delete_keys): Do not reset 'with_seckey'
flag.
Prepare new release...
Modified: trunk/Include/wptUTF8.h
===================================================================
--- trunk/Include/wptUTF8.h 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Include/wptUTF8.h 2006-03-22 11:04:20 UTC (rev 187)
@@ -22,8 +22,7 @@
#define WPT_UTF8_H
int is_8bit_string (const char *str);
-char *wincp_to_utf8 (const char *s, size_t len);
-char *utf8_to_wincp (const char *s, size_t len);
-#define utf8_to_wincp2(encstr) utf8_to_wincp ((encstr), strlen (encstr))
+char* utf8_to_native (const char *string);
+char* native_to_utf8 (const char *string);
#endif /*WPT_UTF8_H*/
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/NEWS 2006-03-22 11:04:20 UTC (rev 187)
@@ -766,3 +766,7 @@
* New 'enter passphrase' control to make sniffing more difficult.
* Allow to set preferred keyserver.
* Propably fix for th mysterious keycache window on some machine.
+* Bug fix for the key sign problem that no sig expiration date
+ might be set.
+* Fix 'redraw' problem for the Key Manager.
+* Fix UTF8 encoding problem.
Modified: trunk/Po/POTFILES.in
===================================================================
--- trunk/Po/POTFILES.in 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Po/POTFILES.in 2006-03-22 11:04:20 UTC (rev 187)
@@ -22,7 +22,6 @@
Src/wptFileCBS.cpp
Src/wptFileManager.cpp
Src/wptFileManagerDlg.cpp
-Src/wptFilePrefsDlg.cpp
Src/wptFileSaveDlg.cpp
Src/wptFileStatDlg.cpp
Src/wptFileVerifyDlg.cpp
@@ -67,7 +66,6 @@
Src/wptMainProc.cpp
Src/wptMAPI.cpp
Src/wptMDSumDlg.cpp
-Src/wptNLS.c
Src/wptOwnertrustDlg.cpp
Src/wptPassCache.cpp
Src/wptPassphraseCB.cpp
@@ -77,7 +75,6 @@
Src/wptProgressDlg.cpp
Src/wptProxySettingsDlg.cpp
Src/wptRegistry.cpp
-Src/wptSecmem.cpp
Src/wptSigList.cpp
Src/wptSigTreeDlg.cpp
Src/wptSymEnc.cpp
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Po/de.po 2006-03-22 11:04:20 UTC (rev 187)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.9\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-11 12:41+0100\n"
+"POT-Creation-Date: 2006-03-22 01:38+0100\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"
@@ -30,9 +30,9 @@
#: Src/WinPT.cpp:453 Src/WinPT.cpp:460 Src/WinPT.cpp:500 Src/WinPT.cpp:528
#: Src/WinPT.cpp:537 Src/WinPT.cpp:541 Src/WinPT.cpp:558 Src/WinPT.cpp:628
#: Src/WinPT.cpp:641 Src/WinPT.cpp:688 Src/WinPT.cpp:714 Src/WinPT.cpp:732
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:916 Src/wptGPG.cpp:927
-#: Src/wptGPG.cpp:936 Src/wptGPG.cpp:946 Src/wptMainProc.cpp:346
-#: Src/wptMainProc.cpp:530
+#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:346
+#: Src/wptMainProc.cpp:532
msgid "WinPT Error"
msgstr "WinPT Fehler"
@@ -59,15 +59,15 @@
#: Src/WinPT.cpp:302 Src/WinPT.cpp:320 Src/WinPT.cpp:331
#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
-#: Src/wptKeyserverDlg.cpp:66 Src/wptKeyserverDlg.cpp:196
-#: Src/wptKeyserverDlg.cpp:204 Src/wptKeyserverDlg.cpp:220
-#: Src/wptKeyserverDlg.cpp:388 Src/wptKeyserverDlg.cpp:394
-#: Src/wptKeyserverDlg.cpp:503 Src/wptKeyserverDlg.cpp:563
-#: Src/wptKeyserverDlg.cpp:568 Src/wptKeyserverDlg.cpp:680
-#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:695
-#: Src/wptKeyserverDlg.cpp:711 Src/wptKeyserverDlg.cpp:727
-#: Src/wptKeyserverDlg.cpp:732 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:744
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
+#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:382 Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:497 Src/wptKeyserverDlg.cpp:557
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:674
+#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:726 Src/wptKeyserverDlg.cpp:732
+#: Src/wptKeyserverDlg.cpp:738
msgid "Keyserver"
msgstr "Schlüsselserver"
@@ -172,7 +172,7 @@
"\n"
"%s: öffentlicher Schlüssel nicht gefunden."
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:136
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
msgid "About the GNU Privacy Guard"
msgstr "Über den GNU Privacy Guard"
@@ -181,7 +181,7 @@
msgstr "Über GnuPG"
#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
-#: Src/wptMainProc.cpp:581
+#: Src/wptMainProc.cpp:583
msgid "About WinPT"
msgstr "Über WinPT"
@@ -230,7 +230,7 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1987
+#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1991
#: Src/wptKeyManagerDlg.cpp:963
msgid "&Help"
msgstr "&Hilfe"
@@ -316,7 +316,7 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:513
+#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
msgid "&Name"
msgstr "&Name"
@@ -332,7 +332,7 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:649 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "&Niemals"
@@ -377,7 +377,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1364
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -432,7 +432,7 @@
msgid "GPG Card Status"
msgstr "GPG Kartenstatus"
-#: Src/wptCardManager.cpp:54
+#: Src/wptCardManager.cpp:53
msgid ""
"Please insert the OpenPGP smart card\n"
"Press OK to continue or Cancel"
@@ -493,7 +493,7 @@
#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:262
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:806 Src/wptKeyManager.cpp:1004 Src/wptSymEnc.cpp:91
+#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
@@ -537,7 +537,7 @@
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:270
-#: Src/wptMainProc.cpp:431 Src/wptMainProc.cpp:512 Src/wptMainProc.cpp:516
+#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:518
msgid "Clipboard"
msgstr "Zwischenablage"
@@ -567,7 +567,7 @@
"Vorhandene Datei überschreiben?"
#: Src/wptClipEditDlg.cpp:194 Src/wptMainProc.cpp:169 Src/wptMainProc.cpp:235
-#: Src/wptMainProc.cpp:575
+#: Src/wptMainProc.cpp:577
msgid "Clipboard Editor"
msgstr "Zwischenablagen-Editor"
@@ -593,8 +593,8 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1986
-#: Src/wptKeyserverDlg.cpp:620 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1990
+#: Src/wptKeyserverDlg.cpp:614 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
@@ -619,12 +619,12 @@
#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:286
#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:156 Src/wptKeyEditDlgs.cpp:337
-#: Src/wptKeyEditDlgs.cpp:439 Src/wptKeyEditDlgs.cpp:516
-#: Src/wptKeyEditDlgs.cpp:650 Src/wptKeyEditOwnertrustDlg.cpp:67
+#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
+#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:552
-#: Src/wptKeyserverSearchDlg.cpp:68 Src/wptKeysignDlg.cpp:269
+#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:546
+#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -698,7 +698,7 @@
#: Src/wptFileManagerDlg.cpp:556 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:179
#: Src/wptMainProc.cpp:245 Src/wptMainProc.cpp:257 Src/wptMainProc.cpp:265
-#: Src/wptMainProc.cpp:419
+#: Src/wptMainProc.cpp:421
msgid "Verify"
msgstr "Überprüfen"
@@ -746,33 +746,33 @@
msgid "Enter URL to retrieve the public key"
msgstr "Bitte URL eingeben um öff. Schlüssel zu empfangen"
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:767
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:865
-#: Src/wptKeyEditDlgs.cpp:880 Src/wptKeyEditDlgs.cpp:931
-#: Src/wptKeyEditDlgs.cpp:975 Src/wptKeyEditDlgs.cpp:982
-#: Src/wptKeyEditDlgs.cpp:1000 Src/wptKeyEditDlgs.cpp:1049
-#: Src/wptKeyEditDlgs.cpp:1056 Src/wptKeyEditDlgs.cpp:1147
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1282
-#: Src/wptKeyEditDlgs.cpp:1286 Src/wptKeyEditDlgs.cpp:1290
-#: Src/wptKeyEditDlgs.cpp:1295 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1346
-#: Src/wptKeyEditDlgs.cpp:1361 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyEditDlgs.cpp:1480 Src/wptKeyEditDlgs.cpp:1487
-#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1497
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1545
-#: Src/wptKeyEditDlgs.cpp:1562 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1590 Src/wptKeyEditDlgs.cpp:1691
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1751
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1764
-#: Src/wptKeyEditDlgs.cpp:1884 Src/wptKeyEditDlgs.cpp:1889
-#: Src/wptKeyEditDlgs.cpp:1898 Src/wptKeyEditDlgs.cpp:1912
-#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeyEditDlgs.cpp:1967
-#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:2017 Src/wptKeyEditDlgs.cpp:2022
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1792
+#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
+#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:935
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:1004 Src/wptKeyEditDlgs.cpp:1053
+#: Src/wptKeyEditDlgs.cpp:1060 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeyEditDlgs.cpp:1157 Src/wptKeyEditDlgs.cpp:1286
+#: Src/wptKeyEditDlgs.cpp:1290 Src/wptKeyEditDlgs.cpp:1294
+#: Src/wptKeyEditDlgs.cpp:1299 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1423 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1484 Src/wptKeyEditDlgs.cpp:1491
+#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1501
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1594 Src/wptKeyEditDlgs.cpp:1695
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1759 Src/wptKeyEditDlgs.cpp:1768
+#: Src/wptKeyEditDlgs.cpp:1888 Src/wptKeyEditDlgs.cpp:1893
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1920 Src/wptKeyEditDlgs.cpp:1971
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1791
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -789,8 +789,8 @@
msgid "No"
msgstr "Nein"
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1113
+#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117
msgid "OK"
msgstr "OK"
@@ -1016,12 +1016,12 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1036
+#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1040
#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1143
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:97
msgid "Name"
@@ -1064,17 +1064,17 @@
#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
#: Src/wptFileManagerDlg.cpp:554 Src/wptMainProc.cpp:197
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
msgid "Sign"
msgstr "Signieren"
#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:552
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
+#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
msgid "Encrypt"
msgstr "Verschlüsseln"
#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:416
msgid "Symmetric"
msgstr "Symmetrisch"
@@ -1154,7 +1154,7 @@
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:229
+#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
msgid "Import"
msgstr "Importieren"
@@ -1176,7 +1176,7 @@
msgstr "Kein Schlüssel zum Exportieren ausgewählt."
#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
-#: Src/wptKeyserverDlg.cpp:95
+#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exportieren"
@@ -1185,9 +1185,9 @@
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1015
-#: Src/wptKeyEditDlgs.cpp:1312 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyserverDlg.cpp:106
+#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1316 Src/wptKeyEditDlgs.cpp:1390
+#: Src/wptKeyserverDlg.cpp:99
msgid "GnuPG status"
msgstr "GnuPG Status"
@@ -1305,14 +1305,14 @@
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1286
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:827
-#: Src/wptKeyManager.cpp:863 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
+#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:155
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1325,7 +1325,7 @@
msgid "%d Object(s) marked"
msgstr "%d Objekt(e) markiert"
-#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:543
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:545
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
@@ -1360,7 +1360,7 @@
msgstr "&Signieren"
#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:555
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
@@ -1380,7 +1380,7 @@
msgid "E&xport"
msgstr "E&xportieren"
-#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:413
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:415
msgid "Exit"
msgstr "Beenden"
@@ -1511,7 +1511,7 @@
msgstr "WinPT Erster Start"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:728
-#: Src/wptGPG.cpp:835
+#: Src/wptGPG.cpp:838
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1521,19 +1521,19 @@
"In diesem Zustand kann nichts gespeichert werden\n"
"Wollen Sie das Attribut zurücksetzen?"
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:841
msgid "GPG Information"
msgstr "GPG Information"
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:845
msgid "Could not reset read-only state."
msgstr "Konnte den Nur-Lesen Zustand nicht zurücksetzen."
-#: Src/wptGPG.cpp:843 Src/wptGPG.cpp:1122 Src/wptGPG.cpp:1131
+#: Src/wptGPG.cpp:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
msgid "GPG Error"
msgstr "GPG Fehler"
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:858
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1547,23 +1547,23 @@
"Die Schlüsselbunde sind im Nur-Lesen-Modus, was meistens der Fall ist, \n"
"wenn ein anderes Programm auf die Schlüsselbunde zugreift.\n"
-#: Src/wptGPG.cpp:860
+#: Src/wptGPG.cpp:863
msgid "GPG Warning"
msgstr "GPG Warnung"
-#: Src/wptGPG.cpp:884 Src/wptGPGPrefsDlg.cpp:213 Src/wptGPGPrefsDlg.cpp:219
-#: Src/wptGPGPrefsDlg.cpp:225 Src/wptGPGPrefsDlg.cpp:231
-#: Src/wptGPGPrefsDlg.cpp:236 Src/wptGPGPrefsDlg.cpp:241
-#: Src/wptGPGPrefsDlg.cpp:247 Src/wptGPGPrefsDlg.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1698 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:215
+#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: 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:1702 Src/wptKeyManagerDlg.cpp:956
+#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
#: Src/wptRegistry.cpp:591
msgid "Preferences"
msgstr "Einstellungen"
-#: Src/wptGPG.cpp:885
+#: Src/wptGPG.cpp:888
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1572,41 +1572,41 @@
"%s existiert nicht.\n"
"Möchten Sie dieses Verzeichnis erstellen?"
-#: Src/wptGPG.cpp:913
+#: Src/wptGPG.cpp:916
msgid "Please choose your public keyring"
msgstr "Bitte wählen Sie Ihren öffentlichen Schlüsselbund."
-#: Src/wptGPG.cpp:916 Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:919 Src/wptGPG.cpp:939
msgid "No keyring was chosen. Exit."
msgstr "Kein Schlüsselbund ausgewählt. Abbruch."
-#: Src/wptGPG.cpp:922
+#: Src/wptGPG.cpp:925
msgid "Overwrite old public keyring?"
msgstr "Alten öff. Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:927 Src/wptGPG.cpp:946
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:949
msgid "Could not copy file."
msgstr "Datei konnte nicht kopiert werden"
-#: Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:936
msgid "Please choose your secret keyring"
msgstr "Bitte wählen Sie Ihren geheimen Schlüsselbund"
-#: Src/wptGPG.cpp:941
+#: Src/wptGPG.cpp:944
msgid "Overwrite old secret keyring?"
msgstr "Alten geheimen Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:991 Src/wptGPG.cpp:1081 Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
msgid "Backup"
msgstr "Sicherung"
-#: Src/wptGPG.cpp:991
+#: Src/wptGPG.cpp:994
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Schlüsselbundsicherung \"%s\" fehlgeschlagen"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:1021
-#: Src/wptGPG.cpp:1082
+#: Src/wptGPG.cpp:1085
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
@@ -1615,12 +1615,12 @@
"Kann auf das Backup-Laufwerk '%s' nicht zugreifen.\n"
"Bitte aktivieren/überprüfen sie das Laufwerk um Fortzufahren."
-#: Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:1097
#, c-format
msgid "Invalid backup mode %d"
msgstr "Ungültiger Sicherungsmethode %d"
-#: Src/wptGPG.cpp:1121
+#: Src/wptGPG.cpp:1124
msgid "No GPG error description available."
msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
@@ -1695,7 +1695,7 @@
"Sind Sie sicher?"
#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1676
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:595
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
@@ -1716,60 +1716,64 @@
msgstr "Signaturlevel erfragen während Schlüsselsignierung"
#: Src/wptGPGPrefsDlg.cpp:149
+msgid "Allow to set an expiration date for signatures"
+msgstr "Erlaube ein Ablaufdatum für Signaturen zu setzen"
+
+#: Src/wptGPGPrefsDlg.cpp:150
msgid "Comment in armored files"
msgstr "Kommentar in Armor-Dateien"
-#: Src/wptGPGPrefsDlg.cpp:150
+#: Src/wptGPGPrefsDlg.cpp:151
msgid "Encrypt to this key"
msgstr "Mit diesem Schlüssel verschlüsseln"
-#: Src/wptGPGPrefsDlg.cpp:151
+#: Src/wptGPGPrefsDlg.cpp:152
msgid "General GPG options"
msgstr "Allgemeine GPG-Optionen"
-#: Src/wptGPGPrefsDlg.cpp:152 Src/wptGPGPrefsDlg.cpp:153
-#: Src/wptGPGPrefsDlg.cpp:154 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:153 Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:155 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr "Ändern..."
-#: Src/wptGPGPrefsDlg.cpp:155
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "&Overwrite default settings"
msgstr "&Überschreibe Voreinstellungen"
-#: Src/wptGPGPrefsDlg.cpp:212
+#: Src/wptGPGPrefsDlg.cpp:215
msgid "Please enter the GnuPG home directory."
msgstr "Bitte geben Sie das GnuPG-Heimatverzeichnis ein."
-#: Src/wptGPGPrefsDlg.cpp:224
+#: Src/wptGPGPrefsDlg.cpp:227
msgid "Could not save 'HomeDir' in the registry."
msgstr "Konnte 'Heinmatverzeichnis' nicht in der Registrierung speichern."
-#: Src/wptGPGPrefsDlg.cpp:230
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Please enter where GPG.exe is located."
msgstr "Bitte geben Sie den Pfad zu GPG.EXE ein."
-#: Src/wptGPGPrefsDlg.cpp:235
+#: Src/wptGPGPrefsDlg.cpp:238
msgid "Could not find the GPG program in this directory."
msgstr "Konnte GPG-Programm nicht in diesem Verzeichnis finden."
-#: Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:243
msgid "Could not save 'gpgProgram' in the registry"
msgstr "Konnte 'gpgProgram' nicht in der Registrierung speichern."
-#: Src/wptGPGPrefsDlg.cpp:260
+#: Src/wptGPGPrefsDlg.cpp:263
msgid "Could not get GPG config file"
msgstr "Konnte Konfigurationsdatei von GPG nicht öffnen"
-#: Src/wptGPGPrefsDlg.cpp:294
+#: Src/wptGPGPrefsDlg.cpp:306
msgid "Choose GPG home directory"
msgstr "Heimatverzeichnis von GPG auswählen"
-#: Src/wptGPGPrefsDlg.cpp:314
+#: Src/wptGPGPrefsDlg.cpp:326
msgid "Choose locale directory"
msgstr "Verzeichnis der Sprachdateien auswählen"
-#: Src/wptGPGPrefsDlg.cpp:320
+#: Src/wptGPGPrefsDlg.cpp:332
msgid "Choose GPG binary"
msgstr "Wählen Sie GPG.EXE Datei aus"
@@ -1785,13 +1789,13 @@
#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:763
-#: Src/wptKeyManager.cpp:774 Src/wptKeyManager.cpp:800
-#: Src/wptKeyManager.cpp:827 Src/wptKeyManager.cpp:834
-#: Src/wptKeyManager.cpp:858 Src/wptKeyManager.cpp:863
-#: Src/wptKeyManager.cpp:883 Src/wptKeyManager.cpp:937
-#: Src/wptKeyManager.cpp:942 Src/wptKeyManager.cpp:1002
-#: Src/wptKeyManager.cpp:1032 Src/wptKeyManagerDlg.cpp:1170
+#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
+#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
+#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
+#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
+#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
+#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
@@ -1800,11 +1804,11 @@
#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1823
-#: Src/wptKeyManagerDlg.cpp:2004 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:2003 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/wptMainProc.cpp:401
-#: Src/wptMainProc.cpp:554 Src/wptMainProc.cpp:564
+#: Src/wptMainProc.cpp:556 Src/wptMainProc.cpp:566
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1878,17 +1882,17 @@
msgid "Unknown Hotkey"
msgstr "Unbekanntes Tastenkürzel"
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:233
-#: Src/wptKeyEditDlgs.cpp:1111 Src/wptKeyEditDlgs.cpp:1172
-#: Src/wptKeyEditDlgs.cpp:1424 Src/wptKeyEditDlgs.cpp:1446
-#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1518
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
+#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1176
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1489 Src/wptKeyEditDlgs.cpp:1522
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr "Widerrufen"
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1113 Src/wptKeyEditDlgs.cpp:1347
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -1902,34 +1906,34 @@
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1189
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1193
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
-#: Src/wptKeyserverSearchDlg.cpp:54 Src/wptSigList.cpp:51
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
msgid "User ID"
msgstr "Benutzerkennung"
#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:51
+#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1033
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1037
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:109
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1034
-#: Src/wptKeyEditDlgs.cpp:1141 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:54
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "Erstellung"
@@ -1948,7 +1952,7 @@
"und deshalb ein CRC Fehler auftrat."
# c:\oss\winpt-gpgme\src\wptKeyCache.cpp:479
-#: Src/wptKeyCache.cpp:654
+#: Src/wptKeyCache.cpp:655
msgid "Load GPG Keyrings..."
msgstr "Lade GPG Schlüsselbunde..."
@@ -1964,20 +1968,20 @@
msgid "Key Cache"
msgstr "Schlüsselcache"
-#: Src/wptKeyEditDlgs.cpp:206
+#: Src/wptKeyEditDlgs.cpp:208
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:221 Src/wptKeyEditDlgs.cpp:1106
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeyEditDlgs.cpp:1110
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:264
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:262
+#: Src/wptKeyEditDlgs.cpp:265
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -1987,7 +1991,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:334
+#: Src/wptKeyEditDlgs.cpp:340
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 "
@@ -1998,7 +2002,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:335
+#: Src/wptKeyEditDlgs.cpp:341
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2006,35 +2010,35 @@
"Bitte ein Bild auswählen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:336 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:268
+#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:338
+#: Src/wptKeyEditDlgs.cpp:344
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:360
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:368
-#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyEditDlgs.cpp:380
-#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:896
+#: Src/wptKeyEditDlgs.cpp:364 Src/wptKeyEditDlgs.cpp:374
+#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:900
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:368 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:378
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2042,156 +2046,156 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "Bitte ein Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:399
+#: Src/wptKeyEditDlgs.cpp:405
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:734
-#: Src/wptKeyEditDlgs.cpp:1448 Src/wptKeyEditDlgs.cpp:1520
-#: Src/wptKeyEditDlgs.cpp:1605 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
+#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:1452 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1609 Src/wptKeyEditDlgs.cpp:1787
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
-#: Src/wptKeyPropsDlg.cpp:359 Src/wptOwnertrustDlg.cpp:124
+#: 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:436
+#: Src/wptKeyEditDlgs.cpp:442
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:437
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:440 Src/wptKeyEditDlgs.cpp:456
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:475
-#: Src/wptKeyEditDlgs.cpp:909
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:913
msgid "Add Revoker"
msgstr "\"Wiederrufer\" hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:1480
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1755
-#: Src/wptKeyEditDlgs.cpp:1884
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1484
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1759
+#: Src/wptKeyEditDlgs.cpp:1888
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:486
msgid "Revoker successfully addded."
msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:512
+#: Src/wptKeyEditDlgs.cpp:518
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:520
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:515
+#: Src/wptKeyEditDlgs.cpp:521
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:536
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (min. 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:534
-#: Src/wptKeyEditDlgs.cpp:539 Src/wptKeyEditDlgs.cpp:543
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:567
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:534
+#: Src/wptKeyEditDlgs.cpp:540
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:539
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:569
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:645 Src/wptKeyEditDlgs.cpp:840
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:844
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:646
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr "Schlüssel-Typ"
-#: Src/wptKeyEditDlgs.cpp:647
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:648
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:693
+#: Src/wptKeyEditDlgs.cpp:697
msgid "Please select one entry."
msgstr "Bitte wählen Sie einen Eintrag aus."
-#: Src/wptKeyEditDlgs.cpp:693 Src/wptKeyEditDlgs.cpp:699
-#: Src/wptKeyEditDlgs.cpp:732 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
+#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:702
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:734
+#: Src/wptKeyEditDlgs.cpp:738
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:762 Src/wptKeyEditDlgs.cpp:822
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:909
-#: Src/wptKeyEditDlgs.cpp:974 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1469
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:899 Src/wptKeyEditDlgs.cpp:913
+#: Src/wptKeyEditDlgs.cpp:978 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1473
#: Src/wptKeyManagerDlg.cpp:1522
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:762 Src/wptKeyEditDlgs.cpp:779
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:884
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:928 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:351
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
-#: Src/wptKeyEditDlgs.cpp:931 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:935 Src/wptKeyManager.cpp:232
msgid "Key status changed."
msgstr "Schlüsselstatus geändert."
-#: Src/wptKeyEditDlgs.cpp:980
+#: Src/wptKeyEditDlgs.cpp:984
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2199,15 +2203,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:987
+#: Src/wptKeyEditDlgs.cpp:991
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:991
+#: Src/wptKeyEditDlgs.cpp:995
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:998 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1002 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2215,44 +2219,44 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:1013
+#: Src/wptKeyEditDlgs.cpp:1017
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:1015
+#: Src/wptKeyEditDlgs.cpp:1019
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1032 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyManagerDlg.cpp:881
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:1035
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:1049 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptKeyEditDlgs.cpp:1053 Src/wptKeyEditDlgs.cpp:1151
msgid "Could not find key."
msgstr "Konnte Schlüssel nicht finden."
-#: Src/wptKeyEditDlgs.cpp:1056
+#: Src/wptKeyEditDlgs.cpp:1060
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1138 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:878
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1140
+#: Src/wptKeyEditDlgs.cpp:1144
msgid "Email"
msgstr "E-Mail"
-#: Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1157
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1247
+#: Src/wptKeyEditDlgs.cpp:1251
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2292,19 +2296,19 @@
"SIGN\t \t\tBenutzerkennung signieren (exportierbar)\r\n"
"LSIGN\t \t\tBenutzerkennung signieren (nicht-exportierbar)\r\n"
-#: Src/wptKeyEditDlgs.cpp:1266
+#: Src/wptKeyEditDlgs.cpp:1270
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1286
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1294
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2321,15 +2325,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1308
+#: Src/wptKeyEditDlgs.cpp:1312
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1312
+#: Src/wptKeyEditDlgs.cpp:1316
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1348
msgid ""
"Key already expired.\n"
"\n"
@@ -2339,19 +2343,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1353 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1360
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1379
+#: Src/wptKeyEditDlgs.cpp:1383
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1420
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2363,31 +2367,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1425
+#: Src/wptKeyEditDlgs.cpp:1429
msgid "Key already revoked."
msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1452
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1474
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:1479
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2397,43 +2401,43 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1520
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1562
+#: Src/wptKeyEditDlgs.cpp:1566
msgid "Could not set user ID preferences"
msgstr "Konnte die veränderter Benutzerkennung nicht speichern"
-#: Src/wptKeyEditDlgs.cpp:1602
+#: Src/wptKeyEditDlgs.cpp:1606
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1605
+#: Src/wptKeyEditDlgs.cpp:1609
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1691
+#: Src/wptKeyEditDlgs.cpp:1695
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1699 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1703 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1750
+#: Src/wptKeyEditDlgs.cpp:1754
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1765
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2444,40 +2448,40 @@
"\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1783
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1787
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1888
+#: Src/wptKeyEditDlgs.cpp:1892
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:1912 Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1971
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:1977
+#: Src/wptKeyEditDlgs.cpp:1981
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:1985
+#: Src/wptKeyEditDlgs.cpp:1989
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2017
+#: Src/wptKeyEditDlgs.cpp:2021
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2021
+#: Src/wptKeyEditDlgs.cpp:2025
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"
@@ -2517,7 +2521,7 @@
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1773 Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2531,11 +2535,11 @@
msgid "There are no preferences in the list."
msgstr "Es gibt keine Einstellungen in der Liste"
-#: Src/wptKeygenCBDlg.cpp:46
+#: Src/wptKeygenCBDlg.cpp:45
msgid "Key Generation - Progress Dialog"
msgstr "Schlüsselerzeugung - Fortschrittsdialog"
-#: Src/wptKeygenCBDlg.cpp:86 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
+#: 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
@@ -2936,7 +2940,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:764
+#: Src/wptKeyManager.cpp:763
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2953,7 +2957,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:771
+#: Src/wptKeyManager.cpp:770
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -2963,34 +2967,34 @@
"Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
"Schlüssel werden gelöscht.\n"
-#: Src/wptKeyManager.cpp:835
+#: Src/wptKeyManager.cpp:834
#, c-format
msgid "Do you really want to send '%s' to keyserver %s?"
msgstr "Wollen Sie '%s' wirklich zum Schlüsselserver %s senden?"
-#: Src/wptKeyManager.cpp:857
+#: Src/wptKeyManager.cpp:856
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:935
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
-#: Src/wptKeyManager.cpp:941
+#: Src/wptKeyManager.cpp:940
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:1027
+#: Src/wptKeyManager.cpp:1026
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
@@ -3266,10 +3270,10 @@
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:241
-#: Src/wptKeysignDlg.cpp:259 Src/wptKeysignDlg.cpp:345
-#: Src/wptKeysignDlg.cpp:362 Src/wptKeysignDlg.cpp:367
-#: Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
+#: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
+#: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
msgid "Key Signing"
msgstr "Schlüsselsignierung"
@@ -3292,7 +3296,7 @@
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
@@ -3309,7 +3313,7 @@
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:605
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
@@ -3347,7 +3351,7 @@
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
@@ -3366,7 +3370,7 @@
msgstr "Karten-Typ: %s\r\n"
# c:\oss\winpt-gpgme\src\wptKeyPropsDlg.cpp:214
-#: Src/wptKeyPropsDlg.cpp:242
+#: Src/wptKeyPropsDlg.cpp:240
#, c-format
msgid ""
"Type: %s\r\n"
@@ -3389,25 +3393,25 @@
"Cipher: %s\r\n"
"%s\r\n"
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:286
msgid "&Change"
msgstr "&Ändern"
-#: Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyPropsDlg.cpp:287
msgid "&Revokers"
msgstr "\"&Widerrufer\""
-#: Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyPropsDlg.cpp:288
msgid "Change &Password"
msgstr "&Passwort ändern"
-#: Src/wptKeyPropsDlg.cpp:297
+#: Src/wptKeyPropsDlg.cpp:295
msgid "Photo-ID not validated."
msgstr "Foto-ID nicht geprüft."
# msgid "Unknown"
# msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:335
+#: Src/wptKeyPropsDlg.cpp:333
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -3415,11 +3419,11 @@
"Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
"Sie können das Vertrauen in solche Schlüssel nicht ändern."
-#: Src/wptKeyPropsDlg.cpp:337 Src/wptKeyPropsDlg.cpp:344
+#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
msgid "WinPT Warning"
msgstr "WinPT Warnung"
-#: Src/wptKeyPropsDlg.cpp:341
+#: Src/wptKeyPropsDlg.cpp:339
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3430,11 +3434,11 @@
"Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
"Trotzdem fortfahren?"
-#: Src/wptKeyPropsDlg.cpp:358
+#: Src/wptKeyPropsDlg.cpp:356
msgid "Ownertrust successfully changed."
msgstr "Besitzervertrauen erfolgreich geändert."
-#: Src/wptKeyPropsDlg.cpp:371 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
msgid "Key Revokers"
msgstr "Schlüsselwiderrufer"
@@ -3565,12 +3569,12 @@
msgid "Keyserver Warning"
msgstr "Keyserver Warnung"
-#: Src/wptKeyserverDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:98
#, c-format
msgid "Key '%s' successfully sent"
msgstr "Schlüssel '%s' erfolgreich versendet"
-#: Src/wptKeyserverDlg.cpp:140
+#: Src/wptKeyserverDlg.cpp:132
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -3578,19 +3582,19 @@
"WARNUNG: Mehrere Schlüssel wurden gefunden.\n"
"\n"
-#: Src/wptKeyserverDlg.cpp:145
+#: Src/wptKeyserverDlg.cpp:137
msgid "Key(s) successfully received but nothing was changed."
msgstr "Schlüssel erfolgreich empfangen, aber keine Änderungen durchgeführt."
-#: Src/wptKeyserverDlg.cpp:147
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) sucessfully received and imported."
msgstr "Schlüssel erfolgreich empfangen und importiert."
-#: Src/wptKeyserverDlg.cpp:163
+#: Src/wptKeyserverDlg.cpp:155
msgid "Imported Keys"
msgstr "Importierte Schlüssel"
-#: Src/wptKeyserverDlg.cpp:193
+#: Src/wptKeyserverDlg.cpp:185
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3600,159 +3604,159 @@
"Bitte stellen Sie sicher, dass Sie eine Internetverbindung hergestellt haben "
"und gpgkeys_ldap.exe installiert ist."
-#: Src/wptKeyserverDlg.cpp:205
+#: Src/wptKeyserverDlg.cpp:197
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "Finger Schlüsselimport fehlgeschlagen: %s\n"
-#: Src/wptKeyserverDlg.cpp:219
+#: Src/wptKeyserverDlg.cpp:211
msgid "This is not a valid OpenPGP key."
msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
-#: Src/wptKeyserverDlg.cpp:335
+#: Src/wptKeyserverDlg.cpp:329
msgid "Proxy: none"
msgstr "Proxy: keiner"
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:382
msgid "Please select one of the servers."
msgstr "Bitte einen der Server auswählen."
-#: Src/wptKeyserverDlg.cpp:393
+#: Src/wptKeyserverDlg.cpp:387
msgid "Only HTTP keyserver can be used."
msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:408
msgid "DNS Name"
msgstr "DNS Name"
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:409
msgid "Port"
msgstr "Port"
-#: Src/wptKeyserverDlg.cpp:416
+#: Src/wptKeyserverDlg.cpp:410
msgid "Default"
msgstr "Standard"
-#: Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:496
msgid "No space for new keyserver entry"
msgstr "Kein Platz für neuen Keserver-Eintrag"
-#: Src/wptKeyserverDlg.cpp:523
+#: Src/wptKeyserverDlg.cpp:517
msgid "HKP Keyserver"
msgstr "HKP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:524
+#: Src/wptKeyserverDlg.cpp:518
msgid "LDAP Keyserver"
msgstr "LDAP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:519
msgid "Finger Keyserver"
msgstr "Finger-Keyserver"
-#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:765
-#: Src/wptKeyserverDlg.cpp:785
+#: Src/wptKeyserverDlg.cpp:544 Src/wptKeyserverDlg.cpp:759
+#: Src/wptKeyserverDlg.cpp:779
msgid "Edit Keyserver"
msgstr "Editiere Keyserver"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverDlg.cpp:643
+#: Src/wptKeyserverDlg.cpp:545 Src/wptKeyserverDlg.cpp:637
msgid "&Add"
msgstr "&Hinzufügen"
-#: Src/wptKeyserverDlg.cpp:553
+#: Src/wptKeyserverDlg.cpp:547
msgid "Type:"
msgstr "Typ:"
-#: Src/wptKeyserverDlg.cpp:554
+#: Src/wptKeyserverDlg.cpp:548
msgid "Port:"
msgstr "Port:"
-#: Src/wptKeyserverDlg.cpp:555
+#: Src/wptKeyserverDlg.cpp:549
msgid "Host name:"
msgstr "Rechnername:"
-#: Src/wptKeyserverDlg.cpp:563
+#: Src/wptKeyserverDlg.cpp:557
msgid "Please enter a host name"
msgstr "Bitte einen Rechnernamen eingeben."
-#: Src/wptKeyserverDlg.cpp:568
+#: Src/wptKeyserverDlg.cpp:562
msgid "Invalid port, valid numbers are < 65535"
msgstr "Ungültiger Port, gültige Nummern sind < 65535"
-#: Src/wptKeyserverDlg.cpp:612 Src/wptKeyserverSearchDlg.cpp:67
+#: Src/wptKeyserverDlg.cpp:606 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "&Empfangen"
-#: Src/wptKeyserverDlg.cpp:614
+#: Src/wptKeyserverDlg.cpp:608
msgid "Send key (default is receiving)"
msgstr "Schlüssel senden (sonst empfangen)"
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:610
msgid "Please enter the key ID or email address you search for"
msgstr "Bitte die key ID oder E-Mail-Adresse angeben die gesucht wird"
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:611
msgid "&Search"
msgstr "&Suchen"
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:612
msgid "C&hange"
msgstr "Ä&ndern"
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:613
msgid "Set &default"
msgstr "Als &Standard"
-#: Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:638
msgid "&Remove"
msgstr "&Entfernen"
-#: Src/wptKeyserverDlg.cpp:645
+#: Src/wptKeyserverDlg.cpp:639
msgid "&Edit"
msgstr "&Edtieren"
-#: Src/wptKeyserverDlg.cpp:671 Src/wptProxySettingsDlg.cpp:67
-#: Src/wptProxySettingsDlg.cpp:76 Src/wptProxySettingsDlg.cpp:83
-#: Src/wptProxySettingsDlg.cpp:88 Src/wptProxySettingsDlg.cpp:93
-#: Src/wptProxySettingsDlg.cpp:147 Src/wptProxySettingsDlg.cpp:179
+#: Src/wptKeyserverDlg.cpp:665 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
+#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
+#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
+#: Src/wptProxySettingsDlg.cpp:197
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: Src/wptKeyserverDlg.cpp:679 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:673 Src/wptKeyserverDlg.cpp:704
msgid "Please select one of the keyservers."
msgstr "Bitte einen Keyserver auswählen."
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:681
msgid "This is not implemented yet!"
msgstr "Das ist noch nicht implementiert!"
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:726
+#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:720
msgid "Please enter the search pattern."
msgstr "Bitte Suchmuster eingeben."
-#: Src/wptKeyserverDlg.cpp:731
+#: Src/wptKeyserverDlg.cpp:725
msgid "Only keyids are allowed."
msgstr "Nur Schlüssel-IDs zulässig"
-#: Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:731
msgid "Only enter the name of the user."
msgstr "Nur den Namen des Benutzers eingeben."
-#: Src/wptKeyserverDlg.cpp:743
+#: Src/wptKeyserverDlg.cpp:737
msgid "Only email addresses or keyids are allowed."
msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
+#: Src/wptKeyserverSearchDlg.cpp:63
+#, c-format
+msgid "Connect to '%s' to search for \"%s\""
+msgstr "Verbinde mit '%s', um nach \"%s\" zu suchen"
+
#: Src/wptKeyserverSearchDlg.cpp:66
msgid "Keyserver Searching"
msgstr "Schlüsselserver-Suche"
-#: Src/wptKeyserverSearchDlg.cpp:70
-#, c-format
-msgid "Connect to '%s' to search for \"%s\""
-msgstr "Verbinde mit '%s', um nach \"%s\" zu suchen"
-
-#: Src/wptKeyserverSearchDlg.cpp:80 Src/wptKeyserverSearchDlg.cpp:86
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
msgid "Keyserver Search"
msgstr "Schlüsselserver-Suche"
@@ -3851,12 +3855,12 @@
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
-#: Src/wptKeysignDlg.cpp:165 Src/wptKeysignDlg.cpp:319
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
msgid "Choose Signature Class"
msgstr "Signaturklasse auswählen"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:166
+#: Src/wptKeysignDlg.cpp:167
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -3865,30 +3869,30 @@
"gehört? Wenn Sie nicht antworten wollen, bitte \"0\" benutzen."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:167
+#: Src/wptKeysignDlg.cpp:168
msgid "(0) I will not answer (default)"
msgstr "(0) Ich möchte nicht darauf antworten"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:158
-#: Src/wptKeysignDlg.cpp:168
+#: Src/wptKeysignDlg.cpp:169
msgid "(1) I have not checked at all."
msgstr "(1) Ich habe keine Überprüfung gemacht."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:159
-#: Src/wptKeysignDlg.cpp:169
+#: Src/wptKeysignDlg.cpp:170
msgid "(2) I have done causal checking."
msgstr "(2) Ich habe einige Überprüfungen gemacht."
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:160
-#: Src/wptKeysignDlg.cpp:170
+#: Src/wptKeysignDlg.cpp:171
msgid "(3) I have done very careful checkings."
msgstr "(3) Ich habe gründliche Überprüfungen gemacht."
-#: Src/wptKeysignDlg.cpp:209
+#: Src/wptKeysignDlg.cpp:210
msgid "never"
msgstr "niemals"
-#: Src/wptKeysignDlg.cpp:246
+#: Src/wptKeysignDlg.cpp:264
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -3909,43 +3913,47 @@
"\n"
"Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
-#: Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277
msgid "No valid secret key found."
msgstr "Keine gültigen geheimen Schlüssel gefunden."
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:282
msgid "Sign local only (non exportable signature)"
msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
-#: Src/wptKeysignDlg.cpp:265
+#: Src/wptKeysignDlg.cpp:283
msgid "Signature expires on"
msgstr "Signatur läuft ab am"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:266
+#: Src/wptKeysignDlg.cpp:284
msgid "Sign non-revocably"
msgstr "Nicht-widerrufbar signieren"
-#: Src/wptKeysignDlg.cpp:267
+#: Src/wptKeysignDlg.cpp:285
msgid "&Ask for certification level"
msgstr "Zertifizierungslevel erfragen"
-#: Src/wptKeysignDlg.cpp:270
+#: Src/wptKeysignDlg.cpp:288
msgid "&Show photo"
msgstr "&Photo anzeigen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:271 Src/wptPassphraseCB.cpp:92
+#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr "&Maskiere Eingabe"
-#: Src/wptKeysignDlg.cpp:345
+#: Src/wptKeysignDlg.cpp:355
+msgid "You cannot select today as the expiration date."
+msgstr ""
+
+#: Src/wptKeysignDlg.cpp:371
msgid "Could not get Key ID from key."
msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
-#: Src/wptKeysignDlg.cpp:366
+#: Src/wptKeysignDlg.cpp:392
msgid "This key is already signed by your key"
msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
@@ -3982,38 +3990,38 @@
msgid "Could not set current window mode hooks."
msgstr "Konnte \"Current Window\" Hooks nicht setzen."
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:413
msgid "Edit Clipboard"
msgstr "Zwischenablage bearbeiten"
-#: Src/wptMainProc.cpp:412
+#: Src/wptMainProc.cpp:414
msgid "About..."
msgstr "Über..."
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
msgid "Decrypt/Verify"
msgstr "Entschlüsseln/Überprüfen"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:434
msgid "Current Window"
msgstr "Aktuelles Fenster"
-#: Src/wptMainProc.cpp:488
+#: Src/wptMainProc.cpp:490
msgid "Remove all passphrases from cache?"
msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
-#: Src/wptMainProc.cpp:489 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
-#: Src/wptMainProc.cpp:499
+#: Src/wptMainProc.cpp:501
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden. WinPT "
"beenden?"
-#: Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:533
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4022,7 +4030,7 @@
"Stellen Sie sicher, dass das Fenster Text enthält.\n"
"%s."
-#: Src/wptMainProc.cpp:587 Src/wptPreferencesDlg.cpp:136
+#: Src/wptMainProc.cpp:589 Src/wptPreferencesDlg.cpp:136
msgid "WinPT Preferences"
msgstr "WinPT Einstellungen"
@@ -4302,53 +4310,57 @@
msgid "Could not create progress thread."
msgstr "Konnte Fortschrittsthread nicht erstellen."
-#: Src/wptProxySettingsDlg.cpp:67
+#: Src/wptProxySettingsDlg.cpp:69
msgid "Invalid host/IP address."
msgstr "Ungültige IP-Adresse."
-#: Src/wptProxySettingsDlg.cpp:76
+#: Src/wptProxySettingsDlg.cpp:78
+msgid "Please enter the proxy hostname."
+msgstr "Bitte geben Sie den Proxy-Hostname ein."
+
+#: Src/wptProxySettingsDlg.cpp:84
msgid "Invalid port number."
msgstr "Ungültige Portnummer."
-#: Src/wptProxySettingsDlg.cpp:82
+#: Src/wptProxySettingsDlg.cpp:90
msgid "Please select a value from 0-65535 for the port"
msgstr "Bitte geben Sie für den Port einen Wert von 0-65535 ein"
-#: Src/wptProxySettingsDlg.cpp:87
+#: Src/wptProxySettingsDlg.cpp:95
msgid "When you want to use authentication, please fill out both fields."
msgstr ""
"Wenn Sie Authentifizierung nutzen wollen, füllen Sie bitte beide Felder aus."
-#: Src/wptProxySettingsDlg.cpp:92
+#: Src/wptProxySettingsDlg.cpp:100
msgid "Please enter a host name and a port."
msgstr "Bitte geben Sie den Hostname und Port ein."
-#: Src/wptProxySettingsDlg.cpp:141
+#: Src/wptProxySettingsDlg.cpp:151
msgid "Proxy host name or IP address"
msgstr "Proxy Rechnername oder IP Adresse"
-#: Src/wptProxySettingsDlg.cpp:142
+#: Src/wptProxySettingsDlg.cpp:152
msgid "Server requires &authentication"
msgstr "Server benötigt &Authentifikation"
-#: Src/wptProxySettingsDlg.cpp:143
+#: Src/wptProxySettingsDlg.cpp:153
msgid "User name"
msgstr "Benutzername"
-#: Src/wptProxySettingsDlg.cpp:144
+#: Src/wptProxySettingsDlg.cpp:154
msgid "Password"
msgstr "Passwort"
-#: Src/wptProxySettingsDlg.cpp:145
+#: Src/wptProxySettingsDlg.cpp:155
msgid "Proxy type"
msgstr "Proxy-Type"
-#: Src/wptProxySettingsDlg.cpp:146
+#: Src/wptProxySettingsDlg.cpp:156
msgid "Authentication"
msgstr "Authentifizierung"
# c:\oss\winpt-gpgme\src\wptProxySettingsDlg.cpp:156
-#: Src/wptProxySettingsDlg.cpp:178
+#: Src/wptProxySettingsDlg.cpp:196
msgid "Please fill out all required fields for authentication."
msgstr "Bitte füllen Sie alle benötigen Felder für die Authentifizierung aus."
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Po/fr.po 2006-03-22 11:04:20 UTC (rev 187)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.8\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-11 12:41+0100\n"
+"POT-Creation-Date: 2006-03-22 01:38+0100\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"
@@ -23,9 +23,9 @@
#: Src/WinPT.cpp:453 Src/WinPT.cpp:460 Src/WinPT.cpp:500 Src/WinPT.cpp:528
#: Src/WinPT.cpp:537 Src/WinPT.cpp:541 Src/WinPT.cpp:558 Src/WinPT.cpp:628
#: Src/WinPT.cpp:641 Src/WinPT.cpp:688 Src/WinPT.cpp:714 Src/WinPT.cpp:732
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:916 Src/wptGPG.cpp:927
-#: Src/wptGPG.cpp:936 Src/wptGPG.cpp:946 Src/wptMainProc.cpp:346
-#: Src/wptMainProc.cpp:530
+#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:346
+#: Src/wptMainProc.cpp:532
msgid "WinPT Error"
msgstr "Erreur WinPT"
@@ -50,15 +50,15 @@
#: Src/WinPT.cpp:302 Src/WinPT.cpp:320 Src/WinPT.cpp:331
#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
-#: Src/wptKeyserverDlg.cpp:66 Src/wptKeyserverDlg.cpp:196
-#: Src/wptKeyserverDlg.cpp:204 Src/wptKeyserverDlg.cpp:220
-#: Src/wptKeyserverDlg.cpp:388 Src/wptKeyserverDlg.cpp:394
-#: Src/wptKeyserverDlg.cpp:503 Src/wptKeyserverDlg.cpp:563
-#: Src/wptKeyserverDlg.cpp:568 Src/wptKeyserverDlg.cpp:680
-#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:695
-#: Src/wptKeyserverDlg.cpp:711 Src/wptKeyserverDlg.cpp:727
-#: Src/wptKeyserverDlg.cpp:732 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:744
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
+#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:382 Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:497 Src/wptKeyserverDlg.cpp:557
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:674
+#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:726 Src/wptKeyserverDlg.cpp:732
+#: Src/wptKeyserverDlg.cpp:738
msgid "Keyserver"
msgstr "Serveur de clé"
@@ -138,7 +138,7 @@
"%s: public key not found."
msgstr ""
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:136
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
msgid "About the GNU Privacy Guard"
msgstr "A Propos de GNU Privacy Guard"
@@ -147,7 +147,7 @@
msgstr ""
#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
-#: Src/wptMainProc.cpp:581
+#: Src/wptMainProc.cpp:583
msgid "About WinPT"
msgstr "A propos de WinPT"
@@ -186,7 +186,7 @@
msgid "&About GPG..."
msgstr ""
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1987
+#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1991
#: Src/wptKeyManagerDlg.cpp:963
msgid "&Help"
msgstr "&Aide"
@@ -266,7 +266,7 @@
"Still proceed?"
msgstr ""
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:513
+#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
msgid "&Name"
msgstr "&Nom"
@@ -282,7 +282,7 @@
msgid "Off-card passphrase"
msgstr ""
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:649 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "&Jamais"
@@ -326,7 +326,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr ""
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1364
msgid "The date you have chosen lies in the past."
msgstr ""
@@ -376,7 +376,7 @@
msgid "GPG Card Status"
msgstr ""
-#: Src/wptCardManager.cpp:54
+#: Src/wptCardManager.cpp:53
msgid ""
"Please insert the OpenPGP smart card\n"
"Press OK to continue or Cancel"
@@ -429,7 +429,7 @@
#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:262
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:806 Src/wptKeyManager.cpp:1004 Src/wptSymEnc.cpp:91
+#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "Etat de GnuPG: Terminé"
@@ -467,7 +467,7 @@
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:270
-#: Src/wptMainProc.cpp:431 Src/wptMainProc.cpp:512 Src/wptMainProc.cpp:516
+#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:518
msgid "Clipboard"
msgstr "Presse papiers"
@@ -493,7 +493,7 @@
msgstr ""
#: Src/wptClipEditDlg.cpp:194 Src/wptMainProc.cpp:169 Src/wptMainProc.cpp:235
-#: Src/wptMainProc.cpp:575
+#: Src/wptMainProc.cpp:577
msgid "Clipboard Editor"
msgstr "Editeur de presse papiers"
@@ -519,8 +519,8 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1986
-#: Src/wptKeyserverDlg.cpp:620 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1990
+#: Src/wptKeyserverDlg.cpp:614 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fermer"
@@ -544,12 +544,12 @@
#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:286
#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:156 Src/wptKeyEditDlgs.cpp:337
-#: Src/wptKeyEditDlgs.cpp:439 Src/wptKeyEditDlgs.cpp:516
-#: Src/wptKeyEditDlgs.cpp:650 Src/wptKeyEditOwnertrustDlg.cpp:67
+#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
+#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:552
-#: Src/wptKeyserverSearchDlg.cpp:68 Src/wptKeysignDlg.cpp:269
+#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:546
+#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -621,7 +621,7 @@
#: Src/wptFileManagerDlg.cpp:556 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:179
#: Src/wptMainProc.cpp:245 Src/wptMainProc.cpp:257 Src/wptMainProc.cpp:265
-#: Src/wptMainProc.cpp:419
+#: Src/wptMainProc.cpp:421
msgid "Verify"
msgstr "Vérifier"
@@ -665,33 +665,33 @@
msgid "Enter URL to retrieve the public key"
msgstr ""
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:767
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:865
-#: Src/wptKeyEditDlgs.cpp:880 Src/wptKeyEditDlgs.cpp:931
-#: Src/wptKeyEditDlgs.cpp:975 Src/wptKeyEditDlgs.cpp:982
-#: Src/wptKeyEditDlgs.cpp:1000 Src/wptKeyEditDlgs.cpp:1049
-#: Src/wptKeyEditDlgs.cpp:1056 Src/wptKeyEditDlgs.cpp:1147
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1282
-#: Src/wptKeyEditDlgs.cpp:1286 Src/wptKeyEditDlgs.cpp:1290
-#: Src/wptKeyEditDlgs.cpp:1295 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1346
-#: Src/wptKeyEditDlgs.cpp:1361 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyEditDlgs.cpp:1480 Src/wptKeyEditDlgs.cpp:1487
-#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1497
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1545
-#: Src/wptKeyEditDlgs.cpp:1562 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1590 Src/wptKeyEditDlgs.cpp:1691
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1751
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1764
-#: Src/wptKeyEditDlgs.cpp:1884 Src/wptKeyEditDlgs.cpp:1889
-#: Src/wptKeyEditDlgs.cpp:1898 Src/wptKeyEditDlgs.cpp:1912
-#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeyEditDlgs.cpp:1967
-#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:2017 Src/wptKeyEditDlgs.cpp:2022
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1792
+#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
+#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:935
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:1004 Src/wptKeyEditDlgs.cpp:1053
+#: Src/wptKeyEditDlgs.cpp:1060 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeyEditDlgs.cpp:1157 Src/wptKeyEditDlgs.cpp:1286
+#: Src/wptKeyEditDlgs.cpp:1290 Src/wptKeyEditDlgs.cpp:1294
+#: Src/wptKeyEditDlgs.cpp:1299 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1423 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1484 Src/wptKeyEditDlgs.cpp:1491
+#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1501
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1594 Src/wptKeyEditDlgs.cpp:1695
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1759 Src/wptKeyEditDlgs.cpp:1768
+#: Src/wptKeyEditDlgs.cpp:1888 Src/wptKeyEditDlgs.cpp:1893
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1920 Src/wptKeyEditDlgs.cpp:1971
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1791
msgid "Key Edit"
msgstr ""
@@ -707,8 +707,8 @@
msgid "No"
msgstr "Non"
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1113
+#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117
msgid "OK"
msgstr ""
@@ -923,12 +923,12 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1036
+#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1040
#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1143
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:97
msgid "Name"
@@ -969,17 +969,17 @@
#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
#: Src/wptFileManagerDlg.cpp:554 Src/wptMainProc.cpp:197
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
msgid "Sign"
msgstr "Signer"
#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:552
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
+#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
msgid "Encrypt"
msgstr "Chiffrer"
#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:416
msgid "Symmetric"
msgstr "Symétrique"
@@ -1054,7 +1054,7 @@
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:229
+#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
msgid "Import"
msgstr "Importer"
@@ -1072,7 +1072,7 @@
msgstr ""
#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
-#: Src/wptKeyserverDlg.cpp:95
+#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exporter"
@@ -1081,9 +1081,9 @@
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1015
-#: Src/wptKeyEditDlgs.cpp:1312 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyserverDlg.cpp:106
+#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1316 Src/wptKeyEditDlgs.cpp:1390
+#: Src/wptKeyserverDlg.cpp:99
msgid "GnuPG status"
msgstr "Status de GnuPG"
@@ -1197,14 +1197,14 @@
msgid "Options"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1286
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:827
-#: Src/wptKeyManager.cpp:863 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
+#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:155
msgid "Please select a key."
msgstr "Sélectionner une clé."
@@ -1217,7 +1217,7 @@
msgid "%d Object(s) marked"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:543
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:545
msgid "File Manager (use drag & drop to add files)"
msgstr "Gestionnaire de fichier (utilisez le drag & drop)"
@@ -1252,7 +1252,7 @@
msgstr "&Signer"
#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:555
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
msgid "Sign && Encrypt"
msgstr "Signer && Chiffrer"
@@ -1272,7 +1272,7 @@
msgid "E&xport"
msgstr "Exporter"
-#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:413
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:415
msgid "Exit"
msgstr "Quitter"
@@ -1391,26 +1391,26 @@
msgid "WinPT First Start"
msgstr "Première exécution de WinPT"
-#: Src/wptGPG.cpp:835
+#: Src/wptGPG.cpp:838
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
"access. Do you want to remove the attribute?"
msgstr ""
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:841
msgid "GPG Information"
msgstr ""
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:845
msgid "Could not reset read-only state."
msgstr ""
-#: Src/wptGPG.cpp:843 Src/wptGPG.cpp:1122 Src/wptGPG.cpp:1131
+#: Src/wptGPG.cpp:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
msgid "GPG Error"
msgstr "Erreur GPG"
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:858
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1419,23 +1419,23 @@
"caused by another program which already opened the files.\n"
msgstr ""
-#: Src/wptGPG.cpp:860
+#: Src/wptGPG.cpp:863
msgid "GPG Warning"
msgstr ""
-#: Src/wptGPG.cpp:884 Src/wptGPGPrefsDlg.cpp:213 Src/wptGPGPrefsDlg.cpp:219
-#: Src/wptGPGPrefsDlg.cpp:225 Src/wptGPGPrefsDlg.cpp:231
-#: Src/wptGPGPrefsDlg.cpp:236 Src/wptGPGPrefsDlg.cpp:241
-#: Src/wptGPGPrefsDlg.cpp:247 Src/wptGPGPrefsDlg.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1698 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:215
+#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: 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:1702 Src/wptKeyManagerDlg.cpp:956
+#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
#: Src/wptRegistry.cpp:591
msgid "Preferences"
msgstr "Préférences"
-#: Src/wptGPG.cpp:885
+#: Src/wptGPG.cpp:888
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1444,52 +1444,52 @@
"%s n'existe pas.\n"
"Voulez-vous créer ce répertoire?"
-#: Src/wptGPG.cpp:913
+#: Src/wptGPG.cpp:916
msgid "Please choose your public keyring"
msgstr "Veuillez choisir votre porte-clés public"
-#: Src/wptGPG.cpp:916 Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:919 Src/wptGPG.cpp:939
msgid "No keyring was chosen. Exit."
msgstr "Aucun porte-clés n'a été choisi. Sortie."
-#: Src/wptGPG.cpp:922
+#: Src/wptGPG.cpp:925
msgid "Overwrite old public keyring?"
msgstr ""
-#: Src/wptGPG.cpp:927 Src/wptGPG.cpp:946
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:949
msgid "Could not copy file."
msgstr ""
-#: Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:936
msgid "Please choose your secret keyring"
msgstr "Veuillez choisir votre porte-clés secret"
-#: Src/wptGPG.cpp:941
+#: Src/wptGPG.cpp:944
msgid "Overwrite old secret keyring?"
msgstr ""
-#: Src/wptGPG.cpp:991 Src/wptGPG.cpp:1081 Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
msgid "Backup"
msgstr ""
-#: Src/wptGPG.cpp:991
+#: Src/wptGPG.cpp:994
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr ""
-#: Src/wptGPG.cpp:1082
+#: Src/wptGPG.cpp:1085
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
"Please insert/check the drive to continue."
msgstr ""
-#: Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:1097
#, c-format
msgid "Invalid backup mode %d"
msgstr ""
-#: Src/wptGPG.cpp:1121
+#: Src/wptGPG.cpp:1124
msgid "No GPG error description available."
msgstr ""
@@ -1561,7 +1561,7 @@
msgstr ""
#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1676
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:595
msgid "GnuPG Preferences"
msgstr ""
@@ -1582,60 +1582,64 @@
msgstr ""
#: Src/wptGPGPrefsDlg.cpp:149
+msgid "Allow to set an expiration date for signatures"
+msgstr ""
+
+#: Src/wptGPGPrefsDlg.cpp:150
msgid "Comment in armored files"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:150
+#: Src/wptGPGPrefsDlg.cpp:151
msgid "Encrypt to this key"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:151
+#: Src/wptGPGPrefsDlg.cpp:152
msgid "General GPG options"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:152 Src/wptGPGPrefsDlg.cpp:153
-#: Src/wptGPGPrefsDlg.cpp:154 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:153 Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:155 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:155
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "&Overwrite default settings"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:212
+#: Src/wptGPGPrefsDlg.cpp:215
msgid "Please enter the GnuPG home directory."
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:224
+#: Src/wptGPGPrefsDlg.cpp:227
msgid "Could not save 'HomeDir' in the registry."
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:230
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Please enter where GPG.exe is located."
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:235
+#: Src/wptGPGPrefsDlg.cpp:238
msgid "Could not find the GPG program in this directory."
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:243
msgid "Could not save 'gpgProgram' in the registry"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:260
+#: Src/wptGPGPrefsDlg.cpp:263
msgid "Could not get GPG config file"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:294
+#: Src/wptGPGPrefsDlg.cpp:306
msgid "Choose GPG home directory"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:314
+#: Src/wptGPGPrefsDlg.cpp:326
msgid "Choose locale directory"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:320
+#: Src/wptGPGPrefsDlg.cpp:332
msgid "Choose GPG binary"
msgstr ""
@@ -1651,13 +1655,13 @@
#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:763
-#: Src/wptKeyManager.cpp:774 Src/wptKeyManager.cpp:800
-#: Src/wptKeyManager.cpp:827 Src/wptKeyManager.cpp:834
-#: Src/wptKeyManager.cpp:858 Src/wptKeyManager.cpp:863
-#: Src/wptKeyManager.cpp:883 Src/wptKeyManager.cpp:937
-#: Src/wptKeyManager.cpp:942 Src/wptKeyManager.cpp:1002
-#: Src/wptKeyManager.cpp:1032 Src/wptKeyManagerDlg.cpp:1170
+#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
+#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
+#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
+#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
+#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
+#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
@@ -1666,11 +1670,11 @@
#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1823
-#: Src/wptKeyManagerDlg.cpp:2004 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:2003 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/wptMainProc.cpp:401
-#: Src/wptMainProc.cpp:554 Src/wptMainProc.cpp:564
+#: Src/wptMainProc.cpp:556 Src/wptMainProc.cpp:566
msgid "Key Manager"
msgstr "Gestionnaire de clés"
@@ -1738,17 +1742,17 @@
msgid "Unknown Hotkey"
msgstr ""
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:233
-#: Src/wptKeyEditDlgs.cpp:1111 Src/wptKeyEditDlgs.cpp:1172
-#: Src/wptKeyEditDlgs.cpp:1424 Src/wptKeyEditDlgs.cpp:1446
-#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1518
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
+#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1176
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1489 Src/wptKeyEditDlgs.cpp:1522
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr ""
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1113 Src/wptKeyEditDlgs.cpp:1347
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -1762,34 +1766,34 @@
msgid "public key"
msgstr "clé publique"
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1189
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1193
msgid "Invalid user ID"
msgstr ""
#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
-#: Src/wptKeyserverSearchDlg.cpp:54 Src/wptSigList.cpp:51
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
msgid "User ID"
msgstr ""
#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:51
+#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "Taille"
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1033
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1037
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:109
msgid "Key ID"
msgstr ""
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1034
-#: Src/wptKeyEditDlgs.cpp:1141 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:54
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "Création"
@@ -1804,7 +1808,7 @@
"and thus a CRC error occurs."
msgstr ""
-#: Src/wptKeyCache.cpp:654
+#: Src/wptKeyCache.cpp:655
msgid "Load GPG Keyrings..."
msgstr ""
@@ -1820,276 +1824,276 @@
msgid "Key Cache"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:206
+#: Src/wptKeyEditDlgs.cpp:208
msgid "Ultimate"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:221 Src/wptKeyEditDlgs.cpp:1106
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeyEditDlgs.cpp:1110
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:264
msgid "user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:262
+#: Src/wptKeyEditDlgs.cpp:265
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
"%s"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:334
+#: Src/wptKeyEditDlgs.cpp:340
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:335
+#: Src/wptKeyEditDlgs.cpp:341
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:336 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:268
+#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:338
+#: Src/wptKeyEditDlgs.cpp:344
msgid "Add Photo ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:360
msgid "Select Image File"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:368
-#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyEditDlgs.cpp:380
-#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:896
+#: Src/wptKeyEditDlgs.cpp:364 Src/wptKeyEditDlgs.cpp:374
+#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:900
msgid "Add Photo"
msgstr "Ajouter une photo"
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:368 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:378
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "Entrer une passphrase."
-#: Src/wptKeyEditDlgs.cpp:399
+#: Src/wptKeyEditDlgs.cpp:405
msgid "Photo successfully added."
msgstr "Photo ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:734
-#: Src/wptKeyEditDlgs.cpp:1448 Src/wptKeyEditDlgs.cpp:1520
-#: Src/wptKeyEditDlgs.cpp:1605 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
+#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:1452 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1609 Src/wptKeyEditDlgs.cpp:1787
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
-#: Src/wptKeyPropsDlg.cpp:359 Src/wptOwnertrustDlg.cpp:124
+#: Src/wptKeyPropsDlg.cpp:357 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
msgid "GnuPG Status"
msgstr "Etat de GnuPG"
-#: Src/wptKeyEditDlgs.cpp:436
+#: Src/wptKeyEditDlgs.cpp:442
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:437
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "Clé publique"
-#: Src/wptKeyEditDlgs.cpp:440 Src/wptKeyEditDlgs.cpp:456
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:475
-#: Src/wptKeyEditDlgs.cpp:909
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:913
msgid "Add Revoker"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:1480
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1755
-#: Src/wptKeyEditDlgs.cpp:1884
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1484
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1759
+#: Src/wptKeyEditDlgs.cpp:1888
msgid "Please select a user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "Entrer la passphrase."
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:486
msgid "Revoker successfully addded."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:512
+#: Src/wptKeyEditDlgs.cpp:518
msgid "Add new User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:520
msgid "&Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:515
+#: Src/wptKeyEditDlgs.cpp:521
msgid "&Comment"
msgstr "&Commentaire"
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:536
msgid "Please enter a name (min. 5 chars.)"
msgstr "Entrer un nom (min. 5 caractères)"
-#: Src/wptKeyEditDlgs.cpp:530 Src/wptKeyEditDlgs.cpp:534
-#: Src/wptKeyEditDlgs.cpp:539 Src/wptKeyEditDlgs.cpp:543
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:567
msgid "UserID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:534
+#: Src/wptKeyEditDlgs.cpp:540
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "Entrer une adresse email"
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:569
msgid "user ID successfully added."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:645 Src/wptKeyEditDlgs.cpp:840
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:844
msgid "Add new Subkey"
msgstr "Ajouter la nouvelle clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:646
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:647
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:648
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:693
+#: Src/wptKeyEditDlgs.cpp:697
msgid "Please select one entry."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:693 Src/wptKeyEditDlgs.cpp:699
-#: Src/wptKeyEditDlgs.cpp:732 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
+#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
msgid "Add Subkey"
msgstr "Ajouter la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:702
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:734
+#: Src/wptKeyEditDlgs.cpp:738
msgid "Subkey successfully added."
msgstr "Clé secondaire ajoutée avec succès."
-#: Src/wptKeyEditDlgs.cpp:762 Src/wptKeyEditDlgs.cpp:822
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:909
-#: Src/wptKeyEditDlgs.cpp:974 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1469
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:899 Src/wptKeyEditDlgs.cpp:913
+#: Src/wptKeyEditDlgs.cpp:978 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1473
#: Src/wptKeyManagerDlg.cpp:1522
msgid "There is no secret key available!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:762 Src/wptKeyEditDlgs.cpp:779
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
msgid "Add user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:884
msgid "Preferred keyserver successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:928 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:351
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptKeyEditOwnertrustDlg.cpp:55
+#: Src/wptKeyPropsDlg.cpp:349
msgid "Change Ownertrust"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:931 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:935 Src/wptKeyManager.cpp:232
msgid "Key status changed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:980
+#: Src/wptKeyEditDlgs.cpp:984
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:987
+#: Src/wptKeyEditDlgs.cpp:991
msgid "Current (old) Passphrase"
msgstr "Actuel (ancienne) Passphrase"
-#: Src/wptKeyEditDlgs.cpp:991
+#: Src/wptKeyEditDlgs.cpp:995
msgid "New Passphrase"
msgstr "Nouvelle Passphrase"
-#: Src/wptKeyEditDlgs.cpp:998 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1002 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:1013
+#: Src/wptKeyEditDlgs.cpp:1017
msgid "Change Passwd"
msgstr "Changement de mot de passe"
-#: Src/wptKeyEditDlgs.cpp:1015
+#: Src/wptKeyEditDlgs.cpp:1019
msgid "Passphrase successfully changed."
msgstr "Passphrase modifiée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1032 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyManagerDlg.cpp:881
msgid "Description"
msgstr "Déscription"
-#: Src/wptKeyEditDlgs.cpp:1035
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Expires"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1049 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptKeyEditDlgs.cpp:1053 Src/wptKeyEditDlgs.cpp:1151
msgid "Could not find key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1056
+#: Src/wptKeyEditDlgs.cpp:1060
msgid "No subkey(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1138 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:878
msgid "Validity"
msgstr "Validité"
-#: Src/wptKeyEditDlgs.cpp:1140
+#: Src/wptKeyEditDlgs.cpp:1144
msgid "Email"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1157
msgid "No user ID(s) found."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1247
+#: Src/wptKeyEditDlgs.cpp:1251
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2112,19 +2116,19 @@
"LSIGN\t \t\tsign a user-id (non-exportable)\r\n"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1266
+#: Src/wptKeyEditDlgs.cpp:1270
msgid "Key Edit Help"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1286
msgid "Primary key can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1294
msgid "Primary subkey can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2135,34 +2139,34 @@
"Do you really want to delete this subkey?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1308
+#: Src/wptKeyEditDlgs.cpp:1312
msgid "Delete Subkey"
msgstr "Effacer la clé secondaire"
-#: Src/wptKeyEditDlgs.cpp:1312
+#: Src/wptKeyEditDlgs.cpp:1316
msgid "Subkey successfully deleted."
msgstr "Clé secondaire effacée avec succès."
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1348
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:1353 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1360
msgid "Key Expiration Date"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1379
+#: Src/wptKeyEditDlgs.cpp:1383
msgid "Expire Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Subkey expire date successfully set."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1420
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2170,31 +2174,31 @@
"This command is only available to revoke single subkeys"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1425
+#: Src/wptKeyEditDlgs.cpp:1429
msgid "Key already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Revoke Subkey"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1452
msgid "Subkey successfully revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1474
msgid "Revoke user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:1479
msgid "Key has only one user ID."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "This user ID has been already revoked."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2202,43 +2206,43 @@
"Do you really want to revoke this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1520
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1562
+#: Src/wptKeyEditDlgs.cpp:1566
msgid "Could not set user ID preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1602
+#: Src/wptKeyEditDlgs.cpp:1606
msgid "Primary"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1605
+#: Src/wptKeyEditDlgs.cpp:1609
msgid "User ID successfully flagged"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1691
+#: Src/wptKeyEditDlgs.cpp:1695
msgid "No preferences available."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "MDC feature"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1699 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1703 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1750
+#: Src/wptKeyEditDlgs.cpp:1754
msgid "Primary user ID can not be deleted!"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1765
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2246,39 +2250,39 @@
"Do you really want to delete this user ID?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1783
msgid "Delete user ID"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1787
msgid "User ID successfully deleted"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1888
+#: Src/wptKeyEditDlgs.cpp:1892
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1912 Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1971
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1977
+#: Src/wptKeyEditDlgs.cpp:1981
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1985
+#: Src/wptKeyEditDlgs.cpp:1989
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2017
+#: Src/wptKeyEditDlgs.cpp:2021
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2021
+#: Src/wptKeyEditDlgs.cpp:2025
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2315,7 +2319,7 @@
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1773 Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2329,11 +2333,11 @@
msgid "There are no preferences in the list."
msgstr ""
-#: Src/wptKeygenCBDlg.cpp:46
+#: Src/wptKeygenCBDlg.cpp:45
msgid "Key Generation - Progress Dialog"
msgstr ""
-#: Src/wptKeygenCBDlg.cpp:86 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
+#: 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
@@ -2700,7 +2704,7 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:764
+#: Src/wptKeyManager.cpp:763
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2711,39 +2715,39 @@
"%s"
msgstr ""
-#: Src/wptKeyManager.cpp:771
+#: Src/wptKeyManager.cpp:770
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
"placeholder will be deleted.\n"
msgstr ""
-#: Src/wptKeyManager.cpp:835
+#: Src/wptKeyManager.cpp:834
#, c-format
msgid "Do you really want to send '%s' to keyserver %s?"
msgstr ""
-#: Src/wptKeyManager.cpp:857
+#: Src/wptKeyManager.cpp:856
msgid "Please only select one key."
msgstr ""
-#: Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:935
msgid "Do you really want to refresh all keys in the keyring?"
msgstr ""
-#: Src/wptKeyManager.cpp:941
+#: Src/wptKeyManager.cpp:940
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search"
msgstr "Chercher"
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search for:"
msgstr ""
-#: Src/wptKeyManager.cpp:1027
+#: Src/wptKeyManager.cpp:1026
#, c-format
msgid "String pattern \"%s\" not found."
msgstr ""
@@ -2997,10 +3001,10 @@
msgid "Could not access public keyring"
msgstr "Ne peut accéder au porte-clés publique"
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:241
-#: Src/wptKeysignDlg.cpp:259 Src/wptKeysignDlg.cpp:345
-#: Src/wptKeysignDlg.cpp:362 Src/wptKeysignDlg.cpp:367
-#: Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
+#: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
+#: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
msgid "Key Signing"
msgstr ""
@@ -3023,7 +3027,7 @@
msgid "Key Signature List"
msgstr "Liste de signature de clé"
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr ""
@@ -3037,7 +3041,7 @@
msgid "Smart Card support is not available."
msgstr ""
-#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:605
msgid "Keyserver Access"
msgstr ""
@@ -3075,7 +3079,7 @@
msgid "WARNING"
msgstr "ATTENTION"
-#: Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "No key was selected, select all by default."
msgstr ""
@@ -3093,7 +3097,7 @@
msgid "Card-Type: %s\r\n"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:242
+#: Src/wptKeyPropsDlg.cpp:240
#, c-format
msgid ""
"Type: %s\r\n"
@@ -3107,33 +3111,33 @@
"%s\r\n"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:286
msgid "&Change"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyPropsDlg.cpp:287
msgid "&Revokers"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyPropsDlg.cpp:288
msgid "Change &Password"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:297
+#: Src/wptKeyPropsDlg.cpp:295
msgid "Photo-ID not validated."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:335
+#: Src/wptKeyPropsDlg.cpp:333
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:337 Src/wptKeyPropsDlg.cpp:344
+#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
msgid "WinPT Warning"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:341
+#: Src/wptKeyPropsDlg.cpp:339
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3141,11 +3145,11 @@
"Do you really want to continue?"
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:358
+#: Src/wptKeyPropsDlg.cpp:356
msgid "Ownertrust successfully changed."
msgstr ""
-#: Src/wptKeyPropsDlg.cpp:371 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
msgid "Key Revokers"
msgstr ""
@@ -3267,188 +3271,188 @@
msgid "Keyserver Warning"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:98
#, c-format
msgid "Key '%s' successfully sent"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:140
+#: Src/wptKeyserverDlg.cpp:132
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:145
+#: Src/wptKeyserverDlg.cpp:137
msgid "Key(s) successfully received but nothing was changed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:147
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) sucessfully received and imported."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:163
+#: Src/wptKeyserverDlg.cpp:155
msgid "Imported Keys"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:193
+#: Src/wptKeyserverDlg.cpp:185
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
"installed"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:205
+#: Src/wptKeyserverDlg.cpp:197
#, c-format
msgid "Finger key import failed: %s\n"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:219
+#: Src/wptKeyserverDlg.cpp:211
msgid "This is not a valid OpenPGP key."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:335
+#: Src/wptKeyserverDlg.cpp:329
msgid "Proxy: none"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:382
msgid "Please select one of the servers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:393
+#: Src/wptKeyserverDlg.cpp:387
msgid "Only HTTP keyserver can be used."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:408
msgid "DNS Name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:409
msgid "Port"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:416
+#: Src/wptKeyserverDlg.cpp:410
msgid "Default"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:496
msgid "No space for new keyserver entry"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:523
+#: Src/wptKeyserverDlg.cpp:517
msgid "HKP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:524
+#: Src/wptKeyserverDlg.cpp:518
msgid "LDAP Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:519
msgid "Finger Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:765
-#: Src/wptKeyserverDlg.cpp:785
+#: Src/wptKeyserverDlg.cpp:544 Src/wptKeyserverDlg.cpp:759
+#: Src/wptKeyserverDlg.cpp:779
msgid "Edit Keyserver"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverDlg.cpp:643
+#: Src/wptKeyserverDlg.cpp:545 Src/wptKeyserverDlg.cpp:637
msgid "&Add"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:553
+#: Src/wptKeyserverDlg.cpp:547
msgid "Type:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:554
+#: Src/wptKeyserverDlg.cpp:548
msgid "Port:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:555
+#: Src/wptKeyserverDlg.cpp:549
msgid "Host name:"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:563
+#: Src/wptKeyserverDlg.cpp:557
msgid "Please enter a host name"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:568
+#: Src/wptKeyserverDlg.cpp:562
msgid "Invalid port, valid numbers are < 65535"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:612 Src/wptKeyserverSearchDlg.cpp:67
+#: Src/wptKeyserverDlg.cpp:606 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:614
+#: Src/wptKeyserverDlg.cpp:608
msgid "Send key (default is receiving)"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:610
msgid "Please enter the key ID or email address you search for"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:611
msgid "&Search"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:612
msgid "C&hange"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:613
msgid "Set &default"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:638
msgid "&Remove"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:645
+#: Src/wptKeyserverDlg.cpp:639
msgid "&Edit"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:671 Src/wptProxySettingsDlg.cpp:67
-#: Src/wptProxySettingsDlg.cpp:76 Src/wptProxySettingsDlg.cpp:83
-#: Src/wptProxySettingsDlg.cpp:88 Src/wptProxySettingsDlg.cpp:93
-#: Src/wptProxySettingsDlg.cpp:147 Src/wptProxySettingsDlg.cpp:179
+#: Src/wptKeyserverDlg.cpp:665 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
+#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
+#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
+#: Src/wptProxySettingsDlg.cpp:197
msgid "Proxy Settings"
msgstr ""
-#: Src/wptKeyserverDlg.cpp:679 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:673 Src/wptKeyserverDlg.cpp:704
msgid "Please select one of the keyservers."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:681
msgid "This is not implemented yet!"
msgstr "Ceci n'est pas encore implémenté!"
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:726
+#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:720
msgid "Please enter the search pattern."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:731
+#: Src/wptKeyserverDlg.cpp:725
msgid "Only keyids are allowed."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:731
msgid "Only enter the name of the user."
msgstr ""
-#: Src/wptKeyserverDlg.cpp:743
+#: Src/wptKeyserverDlg.cpp:737
msgid "Only email addresses or keyids are allowed."
msgstr ""
+#: Src/wptKeyserverSearchDlg.cpp:63
+#, c-format
+msgid "Connect to '%s' to search for \"%s\""
+msgstr ""
+
#: Src/wptKeyserverSearchDlg.cpp:66
msgid "Keyserver Searching"
msgstr ""
-#: Src/wptKeyserverSearchDlg.cpp:70
-#, c-format
-msgid "Connect to '%s' to search for \"%s\""
-msgstr ""
-
-#: Src/wptKeyserverSearchDlg.cpp:80 Src/wptKeyserverSearchDlg.cpp:86
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
msgid "Keyserver Search"
msgstr ""
@@ -3538,37 +3542,37 @@
msgid "&Receive Key"
msgstr ""
-#: Src/wptKeysignDlg.cpp:165 Src/wptKeysignDlg.cpp:319
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
msgid "Choose Signature Class"
msgstr ""
-#: Src/wptKeysignDlg.cpp:166
+#: Src/wptKeysignDlg.cpp:167
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
msgstr ""
-#: Src/wptKeysignDlg.cpp:167
+#: Src/wptKeysignDlg.cpp:168
msgid "(0) I will not answer (default)"
msgstr ""
-#: Src/wptKeysignDlg.cpp:168
+#: Src/wptKeysignDlg.cpp:169
msgid "(1) I have not checked at all."
msgstr ""
-#: Src/wptKeysignDlg.cpp:169
+#: Src/wptKeysignDlg.cpp:170
msgid "(2) I have done causal checking."
msgstr ""
-#: Src/wptKeysignDlg.cpp:170
+#: Src/wptKeysignDlg.cpp:171
msgid "(3) I have done very careful checkings."
msgstr ""
-#: Src/wptKeysignDlg.cpp:209
+#: Src/wptKeysignDlg.cpp:210
msgid "never"
msgstr "jamais"
-#: Src/wptKeysignDlg.cpp:246
+#: Src/wptKeysignDlg.cpp:264
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -3581,41 +3585,45 @@
"Are you really sure that you want to sign this key with YOUR key?\n"
msgstr ""
-#: Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277
msgid "No valid secret key found."
msgstr "Aucune clé secrète valide n'a été trouvée."
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:282
msgid "Sign local only (non exportable signature)"
msgstr ""
-#: Src/wptKeysignDlg.cpp:265
+#: Src/wptKeysignDlg.cpp:283
msgid "Signature expires on"
msgstr ""
-#: Src/wptKeysignDlg.cpp:266
+#: Src/wptKeysignDlg.cpp:284
msgid "Sign non-revocably"
msgstr ""
-#: Src/wptKeysignDlg.cpp:267
+#: Src/wptKeysignDlg.cpp:285
msgid "&Ask for certification level"
msgstr ""
-#: Src/wptKeysignDlg.cpp:270
+#: Src/wptKeysignDlg.cpp:288
msgid "&Show photo"
msgstr "&Montrer la photo"
-#: Src/wptKeysignDlg.cpp:271 Src/wptPassphraseCB.cpp:92
+#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr ""
-#: Src/wptKeysignDlg.cpp:345
+#: Src/wptKeysignDlg.cpp:355
+msgid "You cannot select today as the expiration date."
+msgstr ""
+
+#: Src/wptKeysignDlg.cpp:371
msgid "Could not get Key ID from key."
msgstr ""
-#: Src/wptKeysignDlg.cpp:366
+#: Src/wptKeysignDlg.cpp:392
msgid "This key is already signed by your key"
msgstr "Cette clé est déja signée par votre clé"
@@ -3651,42 +3659,42 @@
msgid "Could not set current window mode hooks."
msgstr ""
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:413
msgid "Edit Clipboard"
msgstr "Editer le presse papiers"
-#: Src/wptMainProc.cpp:412
+#: Src/wptMainProc.cpp:414
msgid "About..."
msgstr "A propos..."
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
msgid "Decrypt/Verify"
msgstr "Déchiffrer/Vérifier"
-#: Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:434
msgid "Current Window"
msgstr "Fenêtre courante"
-#: Src/wptMainProc.cpp:488
+#: Src/wptMainProc.cpp:490
msgid "Remove all passphrases from cache?"
msgstr ""
-#: Src/wptMainProc.cpp:489 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr ""
-#: Src/wptMainProc.cpp:499
+#: Src/wptMainProc.cpp:501
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
-#: Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:533
#, c-format
msgid ""
"Make sure that the window contains text.\n"
"%s."
msgstr ""
-#: Src/wptMainProc.cpp:587 Src/wptPreferencesDlg.cpp:136
+#: Src/wptMainProc.cpp:589 Src/wptPreferencesDlg.cpp:136
msgid "WinPT Preferences"
msgstr "Préférences de WinPT"
@@ -3946,51 +3954,56 @@
msgid "Could not create progress thread."
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:67
+#: Src/wptProxySettingsDlg.cpp:69
msgid "Invalid host/IP address."
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:76
+#: Src/wptProxySettingsDlg.cpp:78
+#, fuzzy
+msgid "Please enter the proxy hostname."
+msgstr "Entrer la passphrase."
+
+#: Src/wptProxySettingsDlg.cpp:84
msgid "Invalid port number."
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:82
+#: Src/wptProxySettingsDlg.cpp:90
msgid "Please select a value from 0-65535 for the port"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:87
+#: Src/wptProxySettingsDlg.cpp:95
msgid "When you want to use authentication, please fill out both fields."
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:92
+#: Src/wptProxySettingsDlg.cpp:100
msgid "Please enter a host name and a port."
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:141
+#: Src/wptProxySettingsDlg.cpp:151
msgid "Proxy host name or IP address"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:142
+#: Src/wptProxySettingsDlg.cpp:152
msgid "Server requires &authentication"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:143
+#: Src/wptProxySettingsDlg.cpp:153
msgid "User name"
msgstr "Nom de l'utilisateur"
-#: Src/wptProxySettingsDlg.cpp:144
+#: Src/wptProxySettingsDlg.cpp:154
msgid "Password"
msgstr "Mot de passe"
-#: Src/wptProxySettingsDlg.cpp:145
+#: Src/wptProxySettingsDlg.cpp:155
msgid "Proxy type"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:146
+#: Src/wptProxySettingsDlg.cpp:156
msgid "Authentication"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:178
+#: Src/wptProxySettingsDlg.cpp:196
msgid "Please fill out all required fields for authentication."
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Po/jp.po 2006-03-22 11:04:20 UTC (rev 187)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-03-11 12:41+0100\n"
+"POT-Creation-Date: 2006-03-22 01:38+0100\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"
@@ -33,9 +33,9 @@
#: Src/WinPT.cpp:453 Src/WinPT.cpp:460 Src/WinPT.cpp:500 Src/WinPT.cpp:528
#: Src/WinPT.cpp:537 Src/WinPT.cpp:541 Src/WinPT.cpp:558 Src/WinPT.cpp:628
#: Src/WinPT.cpp:641 Src/WinPT.cpp:688 Src/WinPT.cpp:714 Src/WinPT.cpp:732
-#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:916 Src/wptGPG.cpp:927
-#: Src/wptGPG.cpp:936 Src/wptGPG.cpp:946 Src/wptMainProc.cpp:346
-#: Src/wptMainProc.cpp:530
+#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:346
+#: Src/wptMainProc.cpp:532
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
@@ -81,15 +81,15 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/WinPT.cpp:302 Src/WinPT.cpp:320 Src/WinPT.cpp:331
#: Src/wptKeyManagerDlg.cpp:957 Src/wptKeyserver.cpp:548
-#: Src/wptKeyserverDlg.cpp:66 Src/wptKeyserverDlg.cpp:196
-#: Src/wptKeyserverDlg.cpp:204 Src/wptKeyserverDlg.cpp:220
-#: Src/wptKeyserverDlg.cpp:388 Src/wptKeyserverDlg.cpp:394
-#: Src/wptKeyserverDlg.cpp:503 Src/wptKeyserverDlg.cpp:563
-#: Src/wptKeyserverDlg.cpp:568 Src/wptKeyserverDlg.cpp:680
-#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:695
-#: Src/wptKeyserverDlg.cpp:711 Src/wptKeyserverDlg.cpp:727
-#: Src/wptKeyserverDlg.cpp:732 Src/wptKeyserverDlg.cpp:738
-#: Src/wptKeyserverDlg.cpp:744
+#: Src/wptKeyserverDlg.cpp:67 Src/wptKeyserverDlg.cpp:188
+#: Src/wptKeyserverDlg.cpp:196 Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:382 Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:497 Src/wptKeyserverDlg.cpp:557
+#: Src/wptKeyserverDlg.cpp:562 Src/wptKeyserverDlg.cpp:674
+#: Src/wptKeyserverDlg.cpp:682 Src/wptKeyserverDlg.cpp:689
+#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:721
+#: Src/wptKeyserverDlg.cpp:726 Src/wptKeyserverDlg.cpp:732
+#: Src/wptKeyserverDlg.cpp:738
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
@@ -200,7 +200,7 @@
"%s: ŒöŠJŒ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptAboutDlgs.cpp:41
-#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:136
+#: Src/wptAboutDlgs.cpp:53 Src/wptAboutDlgs.cpp:138
msgid "About the GNU Privacy Guard"
msgstr "GNUƒvƒ‰ƒCƒoƒV[ƒK[ƒh‚ɂ‚¢‚Ä"
@@ -213,7 +213,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
# c:\oss\winpt\src\wptMainProc.cpp:560
#: Src/wptAboutDlgs.cpp:94 Src/wptKeyManagerDlg.cpp:1756
-#: Src/wptMainProc.cpp:581
+#: Src/wptMainProc.cpp:583
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -265,7 +265,7 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1987
+#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1991
#: Src/wptKeyManagerDlg.cpp:963
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
@@ -376,7 +376,7 @@
"‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:395
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:513
+#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:519
msgid "&Name"
msgstr "–¼‘O(&N)"
@@ -400,7 +400,7 @@
msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:649 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:653 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
@@ -455,7 +455,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:683 Src/wptKeyEditDlgs.cpp:1360
+#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1364
msgid "The date you have chosen lies in the past."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -532,7 +532,7 @@
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptCardManager.cpp:47
-#: Src/wptCardManager.cpp:54
+#: Src/wptCardManager.cpp:53
msgid ""
"Please insert the OpenPGP smart card\n"
"Press OK to continue or Cancel"
@@ -611,7 +611,7 @@
#: Src/wptClipDecryptDlg.cpp:163 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:262
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:806 Src/wptKeyManager.cpp:1004 Src/wptSymEnc.cpp:91
+#: Src/wptKeyManager.cpp:805 Src/wptKeyManager.cpp:1003 Src/wptSymEnc.cpp:91
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
@@ -669,7 +669,7 @@
#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:238
#: Src/wptClipEditDlg.cpp:243 Src/wptFileManagerDlg.cpp:212
#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:270
-#: Src/wptMainProc.cpp:431 Src/wptMainProc.cpp:512 Src/wptMainProc.cpp:516
+#: Src/wptMainProc.cpp:433 Src/wptMainProc.cpp:514 Src/wptMainProc.cpp:518
msgid "Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
@@ -706,7 +706,7 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:45 c:\oss\winpt\src\wptMainProc.cpp:181
# c:\oss\winpt\src\wptMainProc.cpp:249 c:\oss\winpt\src\wptMainProc.cpp:554
#: Src/wptClipEditDlg.cpp:194 Src/wptMainProc.cpp:169 Src/wptMainProc.cpp:235
-#: Src/wptMainProc.cpp:575
+#: Src/wptMainProc.cpp:577
msgid "Clipboard Editor"
msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
@@ -742,8 +742,8 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1986
-#: Src/wptKeyserverDlg.cpp:620 Src/wptMDSumDlg.cpp:104
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1990
+#: Src/wptKeyserverDlg.cpp:614 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -776,12 +776,12 @@
#: Src/wptCommonDlg.cpp:79 Src/wptFileManagerDlg.cpp:84
#: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:286
#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptGPGPrefsDlg.cpp:156 Src/wptKeyEditDlgs.cpp:337
-#: Src/wptKeyEditDlgs.cpp:439 Src/wptKeyEditDlgs.cpp:516
-#: Src/wptKeyEditDlgs.cpp:650 Src/wptKeyEditOwnertrustDlg.cpp:67
+#: Src/wptGPGPrefsDlg.cpp:157 Src/wptKeyEditDlgs.cpp:343
+#: Src/wptKeyEditDlgs.cpp:445 Src/wptKeyEditDlgs.cpp:522
+#: Src/wptKeyEditDlgs.cpp:654 Src/wptKeyEditOwnertrustDlg.cpp:67
#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
-#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:552
-#: Src/wptKeyserverSearchDlg.cpp:68 Src/wptKeysignDlg.cpp:269
+#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:546
+#: Src/wptKeyserverSearchDlg.cpp:61 Src/wptKeysignDlg.cpp:287
#: Src/wptPassphraseCB.cpp:91 Src/wptPassphraseDlg.cpp:69 Src/wptPINDlg.cpp:55
#: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
msgid "&Cancel"
@@ -900,7 +900,7 @@
#: Src/wptFileManagerDlg.cpp:556 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:179
#: Src/wptMainProc.cpp:245 Src/wptMainProc.cpp:257 Src/wptMainProc.cpp:265
-#: Src/wptMainProc.cpp:419
+#: Src/wptMainProc.cpp:421
msgid "Verify"
msgstr "Šm”F‚·‚é"
@@ -1003,33 +1003,33 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1568
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1173
-#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:767
-#: Src/wptKeyEditDlgs.cpp:826 Src/wptKeyEditDlgs.cpp:865
-#: Src/wptKeyEditDlgs.cpp:880 Src/wptKeyEditDlgs.cpp:931
-#: Src/wptKeyEditDlgs.cpp:975 Src/wptKeyEditDlgs.cpp:982
-#: Src/wptKeyEditDlgs.cpp:1000 Src/wptKeyEditDlgs.cpp:1049
-#: Src/wptKeyEditDlgs.cpp:1056 Src/wptKeyEditDlgs.cpp:1147
-#: Src/wptKeyEditDlgs.cpp:1153 Src/wptKeyEditDlgs.cpp:1282
-#: Src/wptKeyEditDlgs.cpp:1286 Src/wptKeyEditDlgs.cpp:1290
-#: Src/wptKeyEditDlgs.cpp:1295 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1346
-#: Src/wptKeyEditDlgs.cpp:1361 Src/wptKeyEditDlgs.cpp:1365
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1425
-#: Src/wptKeyEditDlgs.cpp:1430 Src/wptKeyEditDlgs.cpp:1475
-#: Src/wptKeyEditDlgs.cpp:1480 Src/wptKeyEditDlgs.cpp:1487
-#: Src/wptKeyEditDlgs.cpp:1494 Src/wptKeyEditDlgs.cpp:1497
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1545
-#: Src/wptKeyEditDlgs.cpp:1562 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1590 Src/wptKeyEditDlgs.cpp:1691
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1751
-#: Src/wptKeyEditDlgs.cpp:1755 Src/wptKeyEditDlgs.cpp:1764
-#: Src/wptKeyEditDlgs.cpp:1884 Src/wptKeyEditDlgs.cpp:1889
-#: Src/wptKeyEditDlgs.cpp:1898 Src/wptKeyEditDlgs.cpp:1912
-#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeyEditDlgs.cpp:1967
-#: Src/wptKeyEditDlgs.cpp:1977 Src/wptKeyEditDlgs.cpp:1988
-#: Src/wptKeyEditDlgs.cpp:2017 Src/wptKeyEditDlgs.cpp:2022
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1792
+#: Src/wptCommonDlg.cpp:137 Src/wptKeyEditDlgs.cpp:771
+#: Src/wptKeyEditDlgs.cpp:830 Src/wptKeyEditDlgs.cpp:869
+#: Src/wptKeyEditDlgs.cpp:884 Src/wptKeyEditDlgs.cpp:935
+#: Src/wptKeyEditDlgs.cpp:979 Src/wptKeyEditDlgs.cpp:986
+#: Src/wptKeyEditDlgs.cpp:1004 Src/wptKeyEditDlgs.cpp:1053
+#: Src/wptKeyEditDlgs.cpp:1060 Src/wptKeyEditDlgs.cpp:1151
+#: Src/wptKeyEditDlgs.cpp:1157 Src/wptKeyEditDlgs.cpp:1286
+#: Src/wptKeyEditDlgs.cpp:1290 Src/wptKeyEditDlgs.cpp:1294
+#: Src/wptKeyEditDlgs.cpp:1299 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1365 Src/wptKeyEditDlgs.cpp:1369
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1423 Src/wptKeyEditDlgs.cpp:1429
+#: Src/wptKeyEditDlgs.cpp:1434 Src/wptKeyEditDlgs.cpp:1479
+#: Src/wptKeyEditDlgs.cpp:1484 Src/wptKeyEditDlgs.cpp:1491
+#: Src/wptKeyEditDlgs.cpp:1498 Src/wptKeyEditDlgs.cpp:1501
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1549
+#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1594 Src/wptKeyEditDlgs.cpp:1695
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1755
+#: Src/wptKeyEditDlgs.cpp:1759 Src/wptKeyEditDlgs.cpp:1768
+#: Src/wptKeyEditDlgs.cpp:1888 Src/wptKeyEditDlgs.cpp:1893
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:1920 Src/wptKeyEditDlgs.cpp:1971
+#: Src/wptKeyEditDlgs.cpp:1981 Src/wptKeyEditDlgs.cpp:1992
+#: Src/wptKeyEditDlgs.cpp:2021 Src/wptKeyEditDlgs.cpp:2026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1791
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1048,8 +1048,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:144
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:166
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:890
-#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:237
-#: Src/wptKeyEditDlgs.cpp:1113
+#: Src/wptCommonDlg.cpp:228 Src/wptKeyEditDlgs.cpp:239
+#: Src/wptKeyEditDlgs.cpp:1117
msgid "OK"
msgstr "OK"
@@ -1334,7 +1334,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:179
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
# c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1036
+#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:1040
#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
msgid "Status"
msgstr "ó‹µ"
@@ -1343,7 +1343,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:384 Src/wptKeyEditDlgs.cpp:1139
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1143
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:97
msgid "Name"
@@ -1399,7 +1399,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
#: Src/wptFileManagerDlg.cpp:554 Src/wptMainProc.cpp:197
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
+#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:425
msgid "Sign"
msgstr "–¼"
@@ -1407,7 +1407,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:401
# c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:552
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
+#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:422
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1416,7 +1416,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
-#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:416
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
@@ -1523,7 +1523,7 @@
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
#: Src/wptKeyManager.cpp:501 Src/wptKeyManager.cpp:512
-#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:229
+#: Src/wptKeyManager.cpp:640 Src/wptKeyserverDlg.cpp:221
msgid "Import"
msgstr "ƒCƒ“ƒ|[ƒg"
@@ -1554,7 +1554,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
-#: Src/wptKeyserverDlg.cpp:95
+#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1571,9 +1571,9 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1015
-#: Src/wptKeyEditDlgs.cpp:1312 Src/wptKeyEditDlgs.cpp:1386
-#: Src/wptKeyserverDlg.cpp:106
+#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:1316 Src/wptKeyEditDlgs.cpp:1390
+#: Src/wptKeyserverDlg.cpp:99
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
@@ -1737,14 +1737,14 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1286
-#: Src/wptKeyEditDlgs.cpp:1336 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:827
-#: Src/wptKeyManager.cpp:863 Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptFileManagerDlg.cpp:331 Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:826
+#: Src/wptKeyManager.cpp:862 Src/wptKeyManagerDlg.cpp:1495
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1549
#: Src/wptKeyManagerDlg.cpp:1568 Src/wptKeyManagerDlg.cpp:1588
#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1723
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:155
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1758,7 +1758,7 @@
msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:543
+#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:545
msgid "File Manager (use drag & drop to add files)"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
@@ -1808,7 +1808,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:404
# c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
#: Src/wptFileManagerDlg.cpp:480 Src/wptFileManagerDlg.cpp:555
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:423
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1835,7 +1835,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:413
+#: Src/wptFileManagerDlg.cpp:485 Src/wptMainProc.cpp:415
msgid "Exit"
msgstr "I—¹"
@@ -1997,7 +1997,7 @@
msgstr "WinPTʼn‚̃Xƒ^[ƒg"
# c:\oss\winpt\src\wptGPG.cpp:734
-#: Src/wptGPG.cpp:835
+#: Src/wptGPG.cpp:838
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -2008,23 +2008,23 @@
"‚±‚Ì‘®«‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:737
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:841
msgid "GPG Information"
msgstr "GPGƒCƒ“ƒtƒH"
# c:\oss\winpt\src\wptGPG.cpp:741
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:845
msgid "Could not reset read-only state."
msgstr "ƒŠ[ƒhƒIƒ“ƒŠ[ó‘Ô‚ð‰Šú‰»‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:178 c:\oss\winpt\src\wptGPG.cpp:742
# c:\oss\winpt\src\wptGPG.cpp:1029 c:\oss\winpt\src\wptGPG.cpp:1038
-#: Src/wptGPG.cpp:843 Src/wptGPG.cpp:1122 Src/wptGPG.cpp:1131
+#: Src/wptGPG.cpp:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
msgid "GPG Error"
msgstr "GPGƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:757
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:858
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -2039,7 +2039,7 @@
"ƒvƒƒOƒ‰ƒ€‚ª‚»‚ê‚ðŠJ‚¢‚½‚½‚ß‚Æl‚¦‚ç‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptGPG.cpp:762
-#: Src/wptGPG.cpp:860
+#: Src/wptGPG.cpp:863
msgid "GPG Warning"
msgstr "GPGŒx"
@@ -2063,12 +2063,12 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptGPG.cpp:884 Src/wptGPGPrefsDlg.cpp:213 Src/wptGPGPrefsDlg.cpp:219
-#: Src/wptGPGPrefsDlg.cpp:225 Src/wptGPGPrefsDlg.cpp:231
-#: Src/wptGPGPrefsDlg.cpp:236 Src/wptGPGPrefsDlg.cpp:241
-#: Src/wptGPGPrefsDlg.cpp:247 Src/wptGPGPrefsDlg.cpp:261
-#: Src/wptKeyEditDlgs.cpp:1698 Src/wptKeyManagerDlg.cpp:956
-#: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:215
+#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: 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:1702 Src/wptKeyManagerDlg.cpp:956
+#: Src/wptMainProc.cpp:435 Src/wptPreferencesDlg.cpp:215
#: Src/wptPreferencesDlg.cpp:260 Src/wptPreferencesDlg.cpp:272
#: Src/wptPreferencesDlg.cpp:284 Src/wptPreferencesDlg.cpp:315
#: Src/wptRegistry.cpp:591
@@ -2076,7 +2076,7 @@
msgstr "ƒJƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptGPG.cpp:885
+#: Src/wptGPG.cpp:888
#, c-format
msgid ""
"%s does not exit.\n"
@@ -2086,47 +2086,47 @@
"‚±‚̃fƒBƒŒƒNƒgƒŠ[‚ð쬂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:863
-#: Src/wptGPG.cpp:913
+#: Src/wptGPG.cpp:916
msgid "Please choose your public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:866 c:\oss\winpt\src\wptGPG.cpp:886
-#: Src/wptGPG.cpp:916 Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:919 Src/wptGPG.cpp:939
msgid "No keyring was chosen. Exit."
msgstr "ƒL[ƒŠƒ“ƒO‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñBI—¹B"
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPG.cpp:922
+#: Src/wptGPG.cpp:925
msgid "Overwrite old public keyring?"
msgstr "ŒÃ‚¢ŒöŠJŒ®‚ðã‘‚«‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:877 c:\oss\winpt\src\wptGPG.cpp:896
-#: Src/wptGPG.cpp:927 Src/wptGPG.cpp:946
+#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:949
msgid "Could not copy file."
msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:883
-#: Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:936
msgid "Please choose your secret keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:891
-#: Src/wptGPG.cpp:941
+#: Src/wptGPG.cpp:944
msgid "Overwrite old secret keyring?"
msgstr "ŒÃ‚¢”é–§ƒL[ƒŠƒ“ƒO‚ðã‘‚«‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:942 c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:991 Src/wptGPG.cpp:1081 Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
msgid "Backup"
msgstr "ƒoƒbƒNƒAƒbƒv"
# c:\oss\winpt\src\wptGPG.cpp:942
-#: Src/wptGPG.cpp:991
+#: Src/wptGPG.cpp:994
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "ˆÈ‰º‚̃oƒbƒNƒAƒbƒvƒL[ƒŠƒ“ƒO‚ª \"%s\" Ž¸”s‚µ‚Ü‚µ‚½B"
-#: Src/wptGPG.cpp:1082
+#: Src/wptGPG.cpp:1085
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
@@ -2136,13 +2136,13 @@
"‘±‚¯‚é‚̂Ƀhƒ‰ƒCƒu‚ð‘}“ü‚Ü‚½‚̓`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:1094
+#: Src/wptGPG.cpp:1097
#, c-format
msgid "Invalid backup mode %d"
msgstr "–³Œø‚ȃoƒbƒNƒAƒbƒvƒ‚[ƒh %d"
# c:\oss\winpt\src\wptGPG.cpp:1029
-#: Src/wptGPG.cpp:1121
+#: Src/wptGPG.cpp:1124
msgid "No GPG error description available."
msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
@@ -2234,7 +2234,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
# c:\oss\winpt\src\wptMainProc.cpp:572
#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1676
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:595
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2257,76 +2257,80 @@
msgid "Ask for the signature class during key sign"
msgstr "–¼Žž‚ɃVƒOƒlƒCƒ`ƒƒƒNƒ‰ƒX‚ð—v‹‚·‚é"
+#: Src/wptGPGPrefsDlg.cpp:149
+msgid "Allow to set an expiration date for signatures"
+msgstr ""
+
# c:\oss\winpt\src\wptErrors.cpp:68
-#: Src/wptGPGPrefsDlg.cpp:149
+#: Src/wptGPGPrefsDlg.cpp:150
msgid "Comment in armored files"
msgstr "ƒAƒ‹ƒ‚[ƒ‹ƒhƒtƒ@ƒCƒ‹—p‚̂ɃRƒƒ“ƒg"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptGPGPrefsDlg.cpp:150
+#: Src/wptGPGPrefsDlg.cpp:151
msgid "Encrypt to this key"
msgstr "‚±‚̃L[‚ƈƉ»"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
-#: Src/wptGPGPrefsDlg.cpp:151
+#: Src/wptGPGPrefsDlg.cpp:152
msgid "General GPG options"
msgstr "GPGˆê”ʃIƒvƒVƒ‡ƒ“"
-#: Src/wptGPGPrefsDlg.cpp:152 Src/wptGPGPrefsDlg.cpp:153
-#: Src/wptGPGPrefsDlg.cpp:154 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:153 Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:155 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr "ŠJ‚..."
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPGPrefsDlg.cpp:155
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "&Overwrite default settings"
msgstr "‹K’èÝ’è‚ðã‘‚µ‚Ü‚·(&O)"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:107
-#: Src/wptGPGPrefsDlg.cpp:212
+#: Src/wptGPGPrefsDlg.cpp:215
msgid "Please enter the GnuPG home directory."
msgstr "GnuPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:154
-#: Src/wptGPGPrefsDlg.cpp:224
+#: Src/wptGPGPrefsDlg.cpp:227
msgid "Could not save 'HomeDir' in the registry."
msgstr "ƒŒƒWƒXƒgƒŠ‚É'HomeDir'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:158
-#: Src/wptGPGPrefsDlg.cpp:230
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Please enter where GPG.exe is located."
msgstr "GPG.exeƒtƒ@ƒCƒ‹‚Ì‚ ‚éꊂð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:162
-#: Src/wptGPGPrefsDlg.cpp:235
+#: Src/wptGPGPrefsDlg.cpp:238
msgid "Could not find the GPG program in this directory."
msgstr "GPGƒvƒ‰ƒOƒ‰ƒ€‚ª‚±‚̃fƒBƒŒƒNƒgƒŠ‚É“ü‚Á‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:166
-#: Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:243
msgid "Could not save 'gpgProgram' in the registry"
msgstr "ƒŒƒWƒXƒgƒŠ‚É'gpgProgram'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:180
-#: Src/wptGPGPrefsDlg.cpp:260
+#: Src/wptGPGPrefsDlg.cpp:263
msgid "Could not get GPG config file"
msgstr "GPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:294
+#: Src/wptGPGPrefsDlg.cpp:306
msgid "Choose GPG home directory"
msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:314
+#: Src/wptGPGPrefsDlg.cpp:326
msgid "Choose locale directory"
msgstr "'locale'ÃÞ¨Ú¸ÄØ‚Ì‘I‘ð"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
-#: Src/wptGPGPrefsDlg.cpp:320
+#: Src/wptGPGPrefsDlg.cpp:332
msgid "Choose GPG binary"
msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð"
@@ -2409,13 +2413,13 @@
#: Src/wptKeyManager.cpp:471 Src/wptKeyManager.cpp:477
#: Src/wptKeyManager.cpp:482 Src/wptKeyManager.cpp:610
#: Src/wptKeyManager.cpp:618 Src/wptKeyManager.cpp:724
-#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:763
-#: Src/wptKeyManager.cpp:774 Src/wptKeyManager.cpp:800
-#: Src/wptKeyManager.cpp:827 Src/wptKeyManager.cpp:834
-#: Src/wptKeyManager.cpp:858 Src/wptKeyManager.cpp:863
-#: Src/wptKeyManager.cpp:883 Src/wptKeyManager.cpp:937
-#: Src/wptKeyManager.cpp:942 Src/wptKeyManager.cpp:1002
-#: Src/wptKeyManager.cpp:1032 Src/wptKeyManagerDlg.cpp:1170
+#: Src/wptKeyManager.cpp:753 Src/wptKeyManager.cpp:762
+#: Src/wptKeyManager.cpp:773 Src/wptKeyManager.cpp:799
+#: Src/wptKeyManager.cpp:826 Src/wptKeyManager.cpp:833
+#: Src/wptKeyManager.cpp:857 Src/wptKeyManager.cpp:862
+#: Src/wptKeyManager.cpp:882 Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:941 Src/wptKeyManager.cpp:1001
+#: Src/wptKeyManager.cpp:1031 Src/wptKeyManagerDlg.cpp:1170
#: Src/wptKeyManagerDlg.cpp:1183 Src/wptKeyManagerDlg.cpp:1193
#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1496
#: Src/wptKeyManagerDlg.cpp:1515 Src/wptKeyManagerDlg.cpp:1523
@@ -2424,11 +2428,11 @@
#: Src/wptKeyManagerDlg.cpp:1588 Src/wptKeyManagerDlg.cpp:1617
#: Src/wptKeyManagerDlg.cpp:1646 Src/wptKeyManagerDlg.cpp:1705
#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1823
-#: Src/wptKeyManagerDlg.cpp:2004 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:2003 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/wptMainProc.cpp:401
-#: Src/wptMainProc.cpp:554 Src/wptMainProc.cpp:564
+#: Src/wptMainProc.cpp:556 Src/wptMainProc.cpp:566
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2526,10 +2530,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1273
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1303
# c:\oss\winpt\src\wptKeysigDlg.cpp:191
-#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:233
-#: Src/wptKeyEditDlgs.cpp:1111 Src/wptKeyEditDlgs.cpp:1172
-#: Src/wptKeyEditDlgs.cpp:1424 Src/wptKeyEditDlgs.cpp:1446
-#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1518
+#: Src/wptImportList.cpp:263 Src/wptKeyEditDlgs.cpp:235
+#: Src/wptKeyEditDlgs.cpp:1115 Src/wptKeyEditDlgs.cpp:1176
+#: Src/wptKeyEditDlgs.cpp:1428 Src/wptKeyEditDlgs.cpp:1450
+#: Src/wptKeyEditDlgs.cpp:1489 Src/wptKeyEditDlgs.cpp:1522
#: Src/wptKeylist.cpp:392 Src/wptKeylist.cpp:426 Src/wptKeyPropsDlg.cpp:163
#: Src/wptKeysigDlg.cpp:143 Src/wptKeysigDlg.cpp:208
msgid "Revoked"
@@ -2540,8 +2544,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:235
-#: Src/wptKeyEditDlgs.cpp:1109 Src/wptKeyEditDlgs.cpp:1343
+#: Src/wptImportList.cpp:265 Src/wptKeyEditDlgs.cpp:237
+#: Src/wptKeyEditDlgs.cpp:1113 Src/wptKeyEditDlgs.cpp:1347
#: Src/wptKeylist.cpp:394 Src/wptKeylist.cpp:424 Src/wptKeyPropsDlg.cpp:160
#: Src/wptKeysigDlg.cpp:142 Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -2559,7 +2563,7 @@
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1189
+#: Src/wptImportList.cpp:302 Src/wptKeyEditDlgs.cpp:1193
msgid "Invalid user ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -2571,7 +2575,7 @@
# c:\oss\winpt\src\wptVerifyList.cpp:88
#: Src/wptImportList.cpp:351 Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:552
#: Src/wptKeyManagerDlg.cpp:873 Src/wptKeyManagerDlg.cpp:942
-#: Src/wptKeyserverSearchDlg.cpp:54 Src/wptSigList.cpp:51
+#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
msgid "User ID"
msgstr "ƒ†[ƒU[ID"
@@ -2581,7 +2585,7 @@
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:546 Src/wptKeylist.cpp:555
-#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:51
+#: Src/wptKeyManagerDlg.cpp:876 Src/wptKeyserverSearchDlg.cpp:50
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2591,10 +2595,10 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1033
+#: Src/wptImportList.cpp:353 Src/wptKeyEditDlgs.cpp:1037
#: Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:874
#: Src/wptKeyManagerDlg.cpp:965 Src/wptKeyRevokersDlg.cpp:58
-#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
+#: Src/wptKeyserverSearchDlg.cpp:51 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:109
msgid "Key ID"
msgstr "ƒL[‚ÌID"
@@ -2604,10 +2608,10 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
# c:\oss\winpt\src\wptSigList.cpp:44
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1034
-#: Src/wptKeyEditDlgs.cpp:1141 Src/wptKeylist.cpp:559
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:1038
+#: Src/wptKeyEditDlgs.cpp:1145 Src/wptKeylist.cpp:559
#: Src/wptKeyManagerDlg.cpp:880 Src/wptKeyManagerDlg.cpp:968
-#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:54
+#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "ì¬"
@@ -2628,7 +2632,7 @@
# c:\oss\winpt\src\WinPT.cpp:247 c:\oss\winpt\src\wptGPG.cpp:864
# c:\oss\winpt\src\wptGPG.cpp:884
-#: Src/wptKeyCache.cpp:654
+#: Src/wptKeyCache.cpp:655
msgid "Load GPG Keyrings..."
msgstr "GPGƒL[ƒŠƒ“ƒO‚ðƒ[ƒh‚·‚é..."
@@ -2648,25 +2652,25 @@
msgstr "ƒL[ƒLƒƒƒbƒVƒ…"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:142
-#: Src/wptKeyEditDlgs.cpp:206
+#: Src/wptKeyEditDlgs.cpp:208
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:221 Src/wptKeyEditDlgs.cpp:1106
+#: Src/wptKeyEditDlgs.cpp:223 Src/wptKeyEditDlgs.cpp:1110
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:261
+#: Src/wptKeyEditDlgs.cpp:264
msgid "user ID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:186
-#: Src/wptKeyEditDlgs.cpp:262
+#: Src/wptKeyEditDlgs.cpp:265
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2674,7 +2678,7 @@
msgstr "ƒL[‚Ìî•ñ‚ðˆÈ‰º‚ɑ΂µ‚ÄŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½: \"%s\"%s"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
-#: Src/wptKeyEditDlgs.cpp:334
+#: Src/wptKeyEditDlgs.cpp:340
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 "
@@ -2685,7 +2689,7 @@
"‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:224
-#: Src/wptKeyEditDlgs.cpp:335
+#: Src/wptKeyEditDlgs.cpp:341
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2695,8 +2699,8 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
-#: Src/wptKeyEditDlgs.cpp:336 Src/wptKeyEditDlgs.cpp:438
-#: Src/wptKeysignDlg.cpp:268
+#: Src/wptKeyEditDlgs.cpp:342 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeysignDlg.cpp:286
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2705,12 +2709,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:338
+#: Src/wptKeyEditDlgs.cpp:344
msgid "Add Photo ID"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:241
-#: Src/wptKeyEditDlgs.cpp:354
+#: Src/wptKeyEditDlgs.cpp:360
msgid "Select Image File"
msgstr "‰æ‘œƒtƒ@ƒCƒ‹‚ð‘I‘ð"
@@ -2719,25 +2723,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:358 Src/wptKeyEditDlgs.cpp:368
-#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyEditDlgs.cpp:380
-#: Src/wptKeyEditDlgs.cpp:394 Src/wptKeyEditDlgs.cpp:896
+#: Src/wptKeyEditDlgs.cpp:364 Src/wptKeyEditDlgs.cpp:374
+#: Src/wptKeyEditDlgs.cpp:380 Src/wptKeyEditDlgs.cpp:386
+#: Src/wptKeyEditDlgs.cpp:400 Src/wptKeyEditDlgs.cpp:900
msgid "Add Photo"
msgstr "ƒtƒHƒg‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyEditDlgs.cpp:359
+#: Src/wptKeyEditDlgs.cpp:365
#, 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:368 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:374 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr "ƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:252
-#: Src/wptKeyEditDlgs.cpp:372
+#: Src/wptKeyEditDlgs.cpp:378
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2746,12 +2750,12 @@
"Žg—p‚·‚邱‚ƂɊԈႢ‚ª‚ ‚è‚Ü‚¹‚ñ‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
-#: Src/wptKeyEditDlgs.cpp:380 Src/wptPassphraseDlg.cpp:99
+#: Src/wptKeyEditDlgs.cpp:386 Src/wptPassphraseDlg.cpp:99
msgid "Please enter a passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:281
-#: Src/wptKeyEditDlgs.cpp:399
+#: Src/wptKeyEditDlgs.cpp:405
msgid "Photo successfully added."
msgstr "ƒtƒHƒg‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2770,23 +2774,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:400 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:565 Src/wptKeyEditDlgs.cpp:734
-#: Src/wptKeyEditDlgs.cpp:1448 Src/wptKeyEditDlgs.cpp:1520
-#: Src/wptKeyEditDlgs.cpp:1605 Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:406 Src/wptKeyEditDlgs.cpp:487
+#: Src/wptKeyEditDlgs.cpp:569 Src/wptKeyEditDlgs.cpp:738
+#: Src/wptKeyEditDlgs.cpp:1452 Src/wptKeyEditDlgs.cpp:1524
+#: Src/wptKeyEditDlgs.cpp:1609 Src/wptKeyEditDlgs.cpp:1787
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
-#: Src/wptKeyPropsDlg.cpp:359 Src/wptOwnertrustDlg.cpp:124
+#: 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:436
+#: Src/wptKeyEditDlgs.cpp:442
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:437
+#: Src/wptKeyEditDlgs.cpp:443
msgid "Public key"
msgstr "ŒöŠJŒ®"
@@ -2794,9 +2798,9 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:358
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:708
-#: Src/wptKeyEditDlgs.cpp:440 Src/wptKeyEditDlgs.cpp:456
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:475
-#: Src/wptKeyEditDlgs.cpp:909
+#: Src/wptKeyEditDlgs.cpp:446 Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:913
msgid "Add Revoker"
msgstr "–³Œø‰»‚«‚Ì‚¤‚ð’ljÁ‚·‚é"
@@ -2805,43 +2809,43 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1324
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1365
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1415
-#: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:1480
-#: Src/wptKeyEditDlgs.cpp:1537 Src/wptKeyEditDlgs.cpp:1582
-#: Src/wptKeyEditDlgs.cpp:1724 Src/wptKeyEditDlgs.cpp:1755
-#: Src/wptKeyEditDlgs.cpp:1884
+#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:1484
+#: Src/wptKeyEditDlgs.cpp:1541 Src/wptKeyEditDlgs.cpp:1586
+#: Src/wptKeyEditDlgs.cpp:1728 Src/wptKeyEditDlgs.cpp:1759
+#: Src/wptKeyEditDlgs.cpp:1888
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:468 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:363
-#: Src/wptKeyEditDlgs.cpp:480
+#: Src/wptKeyEditDlgs.cpp:486
msgid "Revoker successfully addded."
msgstr "–³Œø‰»‚·‚é‚«‚Ì‚¤‚̒ljÁ‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:394
-#: Src/wptKeyEditDlgs.cpp:512
+#: Src/wptKeyEditDlgs.cpp:518
msgid "Add new User ID"
msgstr "V‚µ‚¢ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:514
+#: Src/wptKeyEditDlgs.cpp:520
msgid "&Email"
msgstr "“dŽqƒ[ƒ‹(&E)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:397
-#: Src/wptKeyEditDlgs.cpp:515
+#: Src/wptKeyEditDlgs.cpp:521
msgid "&Comment"
msgstr "ƒRƒƒ“ƒg(&C)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:414
-#: Src/wptKeyEditDlgs.cpp:530
+#: Src/wptKeyEditDlgs.cpp:536
msgid "Please enter a name (min. 5 chars.)"
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B(Å’á’·‚³‚T•¶Žš)"
@@ -2849,14 +2853,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:530 Src/wptKeyEditDlgs.cpp:534
-#: Src/wptKeyEditDlgs.cpp:539 Src/wptKeyEditDlgs.cpp:543
-#: Src/wptKeyEditDlgs.cpp:563
+#: Src/wptKeyEditDlgs.cpp:536 Src/wptKeyEditDlgs.cpp:540
+#: Src/wptKeyEditDlgs.cpp:545 Src/wptKeyEditDlgs.cpp:549
+#: Src/wptKeyEditDlgs.cpp:567
msgid "UserID"
msgstr "ƒ†[ƒU[ID"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:418
-#: Src/wptKeyEditDlgs.cpp:534
+#: Src/wptKeyEditDlgs.cpp:540
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
@@ -2864,43 +2868,43 @@
"‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:423
-#: Src/wptKeyEditDlgs.cpp:539
+#: Src/wptKeyEditDlgs.cpp:545
msgid "Please enter an email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:543
+#: Src/wptKeyEditDlgs.cpp:549
msgid "Invalid email address."
msgstr "–³Œø‚ȃ[ƒ‹ƒAƒhƒŒƒXB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:615
-#: Src/wptKeyEditDlgs.cpp:565
+#: Src/wptKeyEditDlgs.cpp:569
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:645 Src/wptKeyEditDlgs.cpp:840
+#: Src/wptKeyEditDlgs.cpp:649 Src/wptKeyEditDlgs.cpp:844
msgid "Add new Subkey"
msgstr "V‚µ‚¢ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptKeyEditDlgs.cpp:646
+#: Src/wptKeyEditDlgs.cpp:650
msgid "Key type"
msgstr "ƒL[‚ÌŽí—Þ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeyEditDlgs.cpp:647
+#: Src/wptKeyEditDlgs.cpp:651
msgid "Size in bits"
msgstr "ƒrƒbƒg’PˆÊ‚Ì‘å‚«‚³"
# c:\oss\winpt\src\wptKeygenDlg.cpp:150
-#: Src/wptKeyEditDlgs.cpp:648
+#: Src/wptKeyEditDlgs.cpp:652
msgid "Key expiration"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:508
-#: Src/wptKeyEditDlgs.cpp:693
+#: Src/wptKeyEditDlgs.cpp:697
msgid "Please select one entry."
msgstr "‘I‘ð€–Ú‚©‚çˆê‚‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -2913,18 +2917,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:693 Src/wptKeyEditDlgs.cpp:699
-#: Src/wptKeyEditDlgs.cpp:732 Src/wptKeyEditDlgs.cpp:822
+#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:703
+#: Src/wptKeyEditDlgs.cpp:736 Src/wptKeyEditDlgs.cpp:826
msgid "Add Subkey"
msgstr "ƒTƒuƒL[‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:521
-#: Src/wptKeyEditDlgs.cpp:698
+#: Src/wptKeyEditDlgs.cpp:702
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:734
+#: Src/wptKeyEditDlgs.cpp:738
msgid "Subkey successfully added."
msgstr "ƒTƒuƒL[‚ª³‚µ‚’ljÁ‚³‚ê‚Ü‚µ‚½B"
@@ -2937,10 +2941,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:762 Src/wptKeyEditDlgs.cpp:822
-#: Src/wptKeyEditDlgs.cpp:895 Src/wptKeyEditDlgs.cpp:909
-#: Src/wptKeyEditDlgs.cpp:974 Src/wptKeyEditDlgs.cpp:1332
-#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1469
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:826
+#: Src/wptKeyEditDlgs.cpp:899 Src/wptKeyEditDlgs.cpp:913
+#: Src/wptKeyEditDlgs.cpp:978 Src/wptKeyEditDlgs.cpp:1336
+#: Src/wptKeyEditDlgs.cpp:1411 Src/wptKeyEditDlgs.cpp:1473
#: Src/wptKeyManagerDlg.cpp:1522
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -2948,29 +2952,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:762 Src/wptKeyEditDlgs.cpp:779
+#: Src/wptKeyEditDlgs.cpp:766 Src/wptKeyEditDlgs.cpp:783
msgid "Add user ID"
msgstr "ƒ†[ƒU[ID‚ð’ljÁ‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:880
+#: Src/wptKeyEditDlgs.cpp:884
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:928 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:351
+#: Src/wptKeyEditDlgs.cpp:932 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:931 Src/wptKeyManager.cpp:232
+#: Src/wptKeyEditDlgs.cpp:935 Src/wptKeyManager.cpp:232
msgid "Key status changed."
msgstr "ƒL[‚Ìó‘Ô‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:753
-#: Src/wptKeyEditDlgs.cpp:980
+#: Src/wptKeyEditDlgs.cpp:984
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2979,19 +2983,19 @@
"IDEAˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€‚ŕی삳‚ê‚Ä‚¢‚é‚©‚ç‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:760
-#: Src/wptKeyEditDlgs.cpp:987
+#: Src/wptKeyEditDlgs.cpp:991
msgid "Current (old) Passphrase"
msgstr "ƒJƒŒƒ“ƒg(ŒÃ‚¢)ƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:764
-#: Src/wptKeyEditDlgs.cpp:991
+#: Src/wptKeyEditDlgs.cpp:995
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:998 Src/wptPassphraseDlg.cpp:191
+#: Src/wptKeyEditDlgs.cpp:1002 Src/wptPassphraseDlg.cpp:191
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -3000,55 +3004,55 @@
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
-#: Src/wptKeyEditDlgs.cpp:1013
+#: Src/wptKeyEditDlgs.cpp:1017
msgid "Change Passwd"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
-#: Src/wptKeyEditDlgs.cpp:1015
+#: Src/wptKeyEditDlgs.cpp:1019
msgid "Passphrase successfully changed."
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1032 Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyEditDlgs.cpp:1036 Src/wptKeyManagerDlg.cpp:881
msgid "Description"
msgstr "Ú×"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:1035
+#: Src/wptKeyEditDlgs.cpp:1039
msgid "Expires"
msgstr "ŠúŒÀØ‚ê‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:823
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:926
-#: Src/wptKeyEditDlgs.cpp:1049 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptKeyEditDlgs.cpp:1053 Src/wptKeyEditDlgs.cpp:1151
msgid "Could not find key."
msgstr "ƒL[‚ðŒ©‚Â‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:829
-#: Src/wptKeyEditDlgs.cpp:1056
+#: Src/wptKeyEditDlgs.cpp:1060
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:1138 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
+#: Src/wptKeyEditDlgs.cpp:1142 Src/wptKeylist.cpp:548 Src/wptKeylist.cpp:557
#: Src/wptKeyManagerDlg.cpp:878
msgid "Validity"
msgstr "—LŒø«"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyEditDlgs.cpp:1140
+#: Src/wptKeyEditDlgs.cpp:1144
msgid "Email"
msgstr "“dŽqƒ[ƒ‹"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:932
-#: Src/wptKeyEditDlgs.cpp:1153
+#: Src/wptKeyEditDlgs.cpp:1157
msgid "No user ID(s) found."
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1043
-#: Src/wptKeyEditDlgs.cpp:1247
+#: Src/wptKeyEditDlgs.cpp:1251
#, fuzzy
msgid ""
"ADDUID \t\tadd a user ID\r\n"
@@ -3088,22 +3092,22 @@
"ENABLE \t\tƒL[‚ð—LŒø‚É‚·‚é\r\n"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1266
+#: Src/wptKeyEditDlgs.cpp:1270
msgid "Key Edit Help"
msgstr "ƒL[•ÒW‚̃wƒ‹ƒv"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1078
-#: Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeyEditDlgs.cpp:1286
msgid "Primary key can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1294
msgid "Primary subkey can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒTƒuƒL[‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1092
-#: Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptKeyEditDlgs.cpp:1300
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -3121,16 +3125,16 @@
"‚±‚̃TƒuƒL[‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1109
-#: Src/wptKeyEditDlgs.cpp:1308
+#: Src/wptKeyEditDlgs.cpp:1312
msgid "Delete Subkey"
msgstr "ƒTƒuƒL[‚Ìíœ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
-#: Src/wptKeyEditDlgs.cpp:1312
+#: Src/wptKeyEditDlgs.cpp:1316
msgid "Subkey successfully deleted."
msgstr "ƒTƒuƒL[‚𳂵‚휂³‚ê‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1348
msgid ""
"Key already expired.\n"
"\n"
@@ -3143,22 +3147,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:1353 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1360
msgid "Key Expiration Date"
msgstr "ƒL[‚Ì—LŒøŠúŒÀ"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1173
-#: Src/wptKeyEditDlgs.cpp:1379
+#: Src/wptKeyEditDlgs.cpp:1383
msgid "Expire Subkey"
msgstr "ŠúŒÀ‚Ì؂ꂽƒTƒuƒL["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
-#: Src/wptKeyEditDlgs.cpp:1385
+#: Src/wptKeyEditDlgs.cpp:1389
msgid "Subkey expire date successfully set."
msgstr "ƒTƒuƒL[‚ÌŽ¸Œø“ú‚ª³‚µ‚Ý’è‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1206
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1420
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -3171,37 +3175,37 @@
"‚±‚̃Rƒ}ƒ“ƒh‚̓Vƒ“ƒOƒ‹ƒTƒuƒL[‚݂̂𖳌ø‚É‚·‚邽‚ߎg‚¦‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1215
-#: Src/wptKeyEditDlgs.cpp:1425
+#: Src/wptKeyEditDlgs.cpp:1429
msgid "Key already revoked."
msgstr "ƒL[‚ªŠù‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1235
-#: Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1448
msgid "Revoke Subkey"
msgstr "ƒTƒuƒL[‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1239
-#: Src/wptKeyEditDlgs.cpp:1448
+#: Src/wptKeyEditDlgs.cpp:1452
msgid "Subkey successfully revoked."
msgstr "ƒTƒuƒL[‚𳂵‚–³Œø‚É‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1470
+#: Src/wptKeyEditDlgs.cpp:1474
msgid "Revoke user ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1263
-#: Src/wptKeyEditDlgs.cpp:1475
+#: Src/wptKeyEditDlgs.cpp:1479
msgid "Key has only one user ID."
msgstr "ƒL[‚̃†[ƒU[ID‚ª‚ЂƂ‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1274
-#: Src/wptKeyEditDlgs.cpp:1486
+#: Src/wptKeyEditDlgs.cpp:1490
msgid "This user ID has been already revoked."
msgstr "‚±‚̃†[ƒU[ID‚ª–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1279
-#: Src/wptKeyEditDlgs.cpp:1492
+#: Src/wptKeyEditDlgs.cpp:1496
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3213,51 +3217,51 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É–³Œø‚É‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1258
-#: Src/wptKeyEditDlgs.cpp:1516
+#: Src/wptKeyEditDlgs.cpp:1520
msgid "Revoke User ID"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚·‚é"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1305
-#: Src/wptKeyEditDlgs.cpp:1520
+#: Src/wptKeyEditDlgs.cpp:1524
msgid "User ID successfully revoked"
msgstr "ƒ†[ƒU[ID‚𖳌ø‚É‚·‚邱‚Æ‚ª¬Œ÷‚µ‚Ü‚µ‚½"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1535
-#: Src/wptKeyEditDlgs.cpp:1562
+#: Src/wptKeyEditDlgs.cpp:1566
#, 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:1602
+#: Src/wptKeyEditDlgs.cpp:1606
msgid "Primary"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ["
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1391
-#: Src/wptKeyEditDlgs.cpp:1605
+#: Src/wptKeyEditDlgs.cpp:1609
msgid "User ID successfully flagged"
msgstr "ƒ†[ƒU[ID‚ɳ‚µ‚ƒtƒ‰ƒO‚ð‚‚¯‚Ü‚µ‚½B"
-#: Src/wptKeyEditDlgs.cpp:1691
+#: Src/wptKeyEditDlgs.cpp:1695
msgid "No preferences available."
msgstr "ƒJƒXƒ^ƒ€Ý’肪‚ ‚è‚Ü‚¹‚ñB"
-#: Src/wptKeyEditDlgs.cpp:1697
+#: Src/wptKeyEditDlgs.cpp:1701
msgid "MDC feature"
msgstr "MDC‚«‚Ì‚¤"
# c:\oss\winpt\src\wptKeyeditSetPrefDlg.cpp:112
-#: Src/wptKeyEditDlgs.cpp:1699 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1703 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "ƒL[‚̃JƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1411
-#: Src/wptKeyEditDlgs.cpp:1750
+#: Src/wptKeyEditDlgs.cpp:1754
msgid "Primary user ID can not be deleted!"
msgstr "ƒvƒ‰ƒCƒ}ƒŠ[ƒ†[ƒU[ID‚ªíœ‚Å‚«‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1420
-#: Src/wptKeyEditDlgs.cpp:1761
+#: Src/wptKeyEditDlgs.cpp:1765
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -3269,17 +3273,17 @@
"‚±‚̃†[ƒU[ID‚ð–{“–‚É휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1438
-#: Src/wptKeyEditDlgs.cpp:1779
+#: Src/wptKeyEditDlgs.cpp:1783
msgid "Delete user ID"
msgstr "ƒ†[ƒU[ID‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1442
-#: Src/wptKeyEditDlgs.cpp:1783
+#: Src/wptKeyEditDlgs.cpp:1787
msgid "User ID successfully deleted"
msgstr "ƒ†[ƒU[ID‚𳂵‚휂µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1888
+#: Src/wptKeyEditDlgs.cpp:1892
#, fuzzy
msgid "Do you really want to make this sig exportable?"
msgstr ""
@@ -3288,32 +3292,32 @@
"%s"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1912 Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyEditDlgs.cpp:1916 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:1971
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:1977
+#: Src/wptKeyEditDlgs.cpp:1981
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:1985
+#: Src/wptKeyEditDlgs.cpp:1989
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2017
+#: Src/wptKeyEditDlgs.cpp:2021
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2021
+#: Src/wptKeyEditDlgs.cpp:2025
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3374,7 +3378,7 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:86
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1773 Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:289
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -3393,7 +3397,7 @@
# 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/wptKeygenCBDlg.cpp:46
+#: Src/wptKeygenCBDlg.cpp:45
msgid "Key Generation - Progress Dialog"
msgstr "ƒL[ì¬ - isƒ_ƒCƒ„ƒƒO"
@@ -3407,7 +3411,7 @@
# 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:86 Src/wptKeygenDlg.cpp:301 Src/wptKeygenDlg.cpp:310
+#: 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
@@ -3884,7 +3888,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:764
+#: Src/wptKeyManager.cpp:763
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3902,7 +3906,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:771
+#: Src/wptKeyManager.cpp:770
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3913,37 +3917,37 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:835
+#: Src/wptKeyManager.cpp:834
#, c-format
msgid "Do you really want to send '%s' to keyserver %s?"
msgstr "'%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s? ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:857
+#: Src/wptKeyManager.cpp:856
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:936
+#: Src/wptKeyManager.cpp:935
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "ƒL[ƒŠƒ“ƒO‚É‚ ‚é‚·‚ׂẴL[‚ð–{“–‚ɃŠƒtƒŒƒbƒVƒ…‚µ‚½‚¢‚Å‚·‚ªH"
# c:\oss\winpt\src\wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:941
+#: Src/wptKeyManager.cpp:940
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1016
+#: Src/wptKeyManager.cpp:1015
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:1027
+#: Src/wptKeyManager.cpp:1026
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4284,10 +4288,10 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
# c:\oss\winpt\src\wptKeysignDlg.cpp:320
# c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:241
-#: Src/wptKeysignDlg.cpp:259 Src/wptKeysignDlg.cpp:345
-#: Src/wptKeysignDlg.cpp:362 Src/wptKeysignDlg.cpp:367
-#: Src/wptKeysignDlg.cpp:369
+#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277 Src/wptKeysignDlg.cpp:356
+#: Src/wptKeysignDlg.cpp:371 Src/wptKeysignDlg.cpp:388
+#: Src/wptKeysignDlg.cpp:393 Src/wptKeysignDlg.cpp:395
msgid "Key Signing"
msgstr "ƒL[‚𖼂·‚é"
@@ -4322,7 +4326,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:285
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
@@ -4342,7 +4346,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
# c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyManagerDlg.cpp:1668 Src/wptKeyserverDlg.cpp:605
msgid "Keyserver Access"
msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
@@ -4387,7 +4391,7 @@
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1822
+#: Src/wptKeyManagerDlg.cpp:1821
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
@@ -4408,7 +4412,7 @@
msgid "Card-Type: %s\r\n"
msgstr "ƒJ[ƒhƒ^ƒCƒv: %s\r\n"
-#: Src/wptKeyPropsDlg.cpp:242
+#: Src/wptKeyPropsDlg.cpp:240
#, c-format
msgid ""
"Type: %s\r\n"
@@ -4432,26 +4436,26 @@
"%s\r\n"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyPropsDlg.cpp:288
+#: Src/wptKeyPropsDlg.cpp:286
msgid "&Change"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyPropsDlg.cpp:287
msgid "&Revokers"
msgstr "–³Œø‰»‚«‚Ì‚¤(&R)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
-#: Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyPropsDlg.cpp:288
msgid "Change &Password"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX(&P)"
-#: Src/wptKeyPropsDlg.cpp:297
+#: Src/wptKeyPropsDlg.cpp:295
msgid "Photo-ID not validated."
msgstr "ƒtƒHƒgID—LŒø‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:171
-#: Src/wptKeyPropsDlg.cpp:335
+#: Src/wptKeyPropsDlg.cpp:333
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -4461,12 +4465,12 @@
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:173
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:180
-#: Src/wptKeyPropsDlg.cpp:337 Src/wptKeyPropsDlg.cpp:344
+#: Src/wptKeyPropsDlg.cpp:335 Src/wptKeyPropsDlg.cpp:342
msgid "WinPT Warning"
msgstr "WinPT Œx"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:177
-#: Src/wptKeyPropsDlg.cpp:341
+#: Src/wptKeyPropsDlg.cpp:339
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -4478,12 +4482,12 @@
"–{“–‚ÉŒp‘±‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:208
-#: Src/wptKeyPropsDlg.cpp:358
+#: Src/wptKeyPropsDlg.cpp:356
msgid "Ownertrust successfully changed."
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚ͳ‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:371 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
msgid "Key Revokers"
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤"
@@ -4652,12 +4656,12 @@
msgstr "ƒL[ƒT[ƒo[Œx"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:89
-#: Src/wptKeyserverDlg.cpp:105
+#: Src/wptKeyserverDlg.cpp:98
#, c-format
msgid "Key '%s' successfully sent"
msgstr "'%s' ƒL[‚Ì‘—M‚ª¬Œ÷‚µ‚Ü‚µ‚½B"
-#: Src/wptKeyserverDlg.cpp:140
+#: Src/wptKeyserverDlg.cpp:132
msgid ""
"WARNING: multiple keys matched request.\n"
"\n"
@@ -4666,12 +4670,12 @@
"\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:161
-#: Src/wptKeyserverDlg.cpp:145
+#: Src/wptKeyserverDlg.cpp:137
msgid "Key(s) successfully received but nothing was changed."
msgstr "ƒL[‚ÌŽóM‚ɬŒ÷‚µ‚Ü‚µ‚½‚ªA‚Å‚à‰½‚à•Ï‚í‚Á‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:166
-#: Src/wptKeyserverDlg.cpp:147
+#: Src/wptKeyserverDlg.cpp:139
msgid "Key(s) sucessfully received and imported."
msgstr "ƒL[‚ÌŽóM‚ª¬Œ÷‚µAƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B"
@@ -4686,12 +4690,12 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptKeyserverDlg.cpp:163
+#: Src/wptKeyserverDlg.cpp:155
msgid "Imported Keys"
msgstr "ƒCƒ“ƒ|[ƒg‚µ‚½ƒL["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:116
-#: Src/wptKeyserverDlg.cpp:193
+#: Src/wptKeyserverDlg.cpp:185
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -4702,47 +4706,47 @@
"”F‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:127
-#: Src/wptKeyserverDlg.cpp:205
+#: Src/wptKeyserverDlg.cpp:197
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "FINGERƒL[‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %s\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyserverDlg.cpp:219
+#: Src/wptKeyserverDlg.cpp:211
msgid "This is not a valid OpenPGP key."
msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserver.cpp:438
-#: Src/wptKeyserverDlg.cpp:335
+#: Src/wptKeyserverDlg.cpp:329
#, fuzzy
msgid "Proxy: none"
msgstr "ƒvƒƒNƒV[ƒGƒ‰["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:388
+#: Src/wptKeyserverDlg.cpp:382
msgid "Please select one of the servers."
msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:393
+#: Src/wptKeyserverDlg.cpp:387
msgid "Only HTTP keyserver can be used."
msgstr "HTTPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:414
+#: Src/wptKeyserverDlg.cpp:408
msgid "DNS Name"
msgstr "DNS–¼"
-#: Src/wptKeyserverDlg.cpp:415
+#: Src/wptKeyserverDlg.cpp:409
msgid "Port"
msgstr "ƒ|[ƒg"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:416
+#: Src/wptKeyserverDlg.cpp:410
msgid "Default"
msgstr "‹K’è"
-#: Src/wptKeyserverDlg.cpp:502
+#: Src/wptKeyserverDlg.cpp:496
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4761,12 +4765,12 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:523
+#: Src/wptKeyserverDlg.cpp:517
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:524
+#: Src/wptKeyserverDlg.cpp:518
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4785,7 +4789,7 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:525
+#: Src/wptKeyserverDlg.cpp:519
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4804,74 +4808,74 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:550 Src/wptKeyserverDlg.cpp:765
-#: Src/wptKeyserverDlg.cpp:785
+#: Src/wptKeyserverDlg.cpp:544 Src/wptKeyserverDlg.cpp:759
+#: Src/wptKeyserverDlg.cpp:779
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:551 Src/wptKeyserverDlg.cpp:643
+#: Src/wptKeyserverDlg.cpp:545 Src/wptKeyserverDlg.cpp:637
msgid "&Add"
msgstr "’ljÁ(&A)"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:553
+#: Src/wptKeyserverDlg.cpp:547
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:554
+#: Src/wptKeyserverDlg.cpp:548
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:555
+#: Src/wptKeyserverDlg.cpp:549
msgid "Host name:"
msgstr "ƒzƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:563
+#: Src/wptKeyserverDlg.cpp:557
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:568
+#: Src/wptKeyserverDlg.cpp:562
msgid "Invalid port, valid numbers are < 65535"
msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:612 Src/wptKeyserverSearchDlg.cpp:67
+#: Src/wptKeyserverDlg.cpp:606 Src/wptKeyserverSearchDlg.cpp:60
msgid "&Receive"
msgstr "ŽóM(&R)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:614
+#: Src/wptKeyserverDlg.cpp:608
msgid "Send key (default is receiving)"
msgstr "ƒL[‚ð‘—M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:616
+#: Src/wptKeyserverDlg.cpp:610
msgid "Please enter the key ID or email address you search for"
msgstr "ŒŸõ‚·‚é‚à‚̂̃L[ID‚Ü‚½‚Í“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyserverDlg.cpp:617
+#: Src/wptKeyserverDlg.cpp:611
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:618
+#: Src/wptKeyserverDlg.cpp:612
msgid "C&hange"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:619
+#: Src/wptKeyserverDlg.cpp:613
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:644
+#: Src/wptKeyserverDlg.cpp:638
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:645
+#: Src/wptKeyserverDlg.cpp:639
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4879,59 +4883,59 @@
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:57
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:671 Src/wptProxySettingsDlg.cpp:67
-#: Src/wptProxySettingsDlg.cpp:76 Src/wptProxySettingsDlg.cpp:83
-#: Src/wptProxySettingsDlg.cpp:88 Src/wptProxySettingsDlg.cpp:93
-#: Src/wptProxySettingsDlg.cpp:147 Src/wptProxySettingsDlg.cpp:179
+#: Src/wptKeyserverDlg.cpp:665 Src/wptProxySettingsDlg.cpp:69
+#: Src/wptProxySettingsDlg.cpp:79 Src/wptProxySettingsDlg.cpp:84
+#: Src/wptProxySettingsDlg.cpp:91 Src/wptProxySettingsDlg.cpp:96
+#: Src/wptProxySettingsDlg.cpp:101 Src/wptProxySettingsDlg.cpp:157
+#: Src/wptProxySettingsDlg.cpp:197
msgid "Proxy Settings"
msgstr "ƒvƒƒNƒV[Ý’è"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:679 Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:673 Src/wptKeyserverDlg.cpp:704
msgid "Please select one of the keyservers."
msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:376
-#: Src/wptKeyserverDlg.cpp:687
+#: Src/wptKeyserverDlg.cpp:681
msgid "This is not implemented yet!"
msgstr "‚±‚Ì‚«‚Ì‚¤‚Í‚Ü‚¾Žg—p‚©‚Ì‚¤‚Æ‚È‚Á‚Ä‚¢‚Ü‚¹‚ñI"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:381
# c:\oss\winpt\src\wptKeyserverDlg.cpp:407
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:726
+#: Src/wptKeyserverDlg.cpp:688 Src/wptKeyserverDlg.cpp:720
msgid "Please enter the search pattern."
msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:731
+#: Src/wptKeyserverDlg.cpp:725
msgid "Only keyids are allowed."
msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:737
+#: Src/wptKeyserverDlg.cpp:731
msgid "Only enter the name of the user."
msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:743
+#: Src/wptKeyserverDlg.cpp:737
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
-# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:66
-msgid "Keyserver Searching"
-msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
-
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:63
-#: Src/wptKeyserverSearchDlg.cpp:70
+#: Src/wptKeyserverSearchDlg.cpp:63
#, c-format
msgid "Connect to '%s' to search for \"%s\""
msgstr "%s‚ÉÚ‘±‚µˆÈ‰º‚Ì‚±‚Æ‚ðŒŸõ‚·‚é\"%s\""
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:80 Src/wptKeyserverSearchDlg.cpp:86
-#: Src/wptKeyserverSearchDlg.cpp:132
+#: Src/wptKeyserverSearchDlg.cpp:66
+msgid "Keyserver Searching"
+msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
+
+# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
msgid "Keyserver Search"
msgstr "ƒL[ƒT[ƒo[ŒŸõ"
@@ -5051,12 +5055,12 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:152
# c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:165 Src/wptKeysignDlg.cpp:319
+#: Src/wptKeysignDlg.cpp:166 Src/wptKeysignDlg.cpp:339
msgid "Choose Signature Class"
msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptKeysignDlg.cpp:153
-#: Src/wptKeysignDlg.cpp:166
+#: Src/wptKeysignDlg.cpp:167
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs to the person? If you don't know what to anwser, use \"0\"."
@@ -5065,34 +5069,34 @@
"‚ð”»‚ç‚È‚¢ê‡‚͈ȉº‚ðŽg—p‚µ‚ĉº‚³‚¢B\"0\""
# c:\oss\winpt\src\wptKeysignDlg.cpp:154
-#: Src/wptKeysignDlg.cpp:167
+#: Src/wptKeysignDlg.cpp:168
msgid "(0) I will not answer (default)"
msgstr "(0)‚Í•ÔŽ–‚ð‚µ‚Ü‚¹‚ñ(‹K’è)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:168
+#: Src/wptKeysignDlg.cpp:169
msgid "(1) I have not checked at all."
msgstr "(1) ‚Ü‚Á‚½‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:156
-#: Src/wptKeysignDlg.cpp:169
+#: Src/wptKeysignDlg.cpp:170
msgid "(2) I have done causal checking."
msgstr "(2) ‚³‚è‚°‚È‚ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:157
-#: Src/wptKeysignDlg.cpp:170
+#: Src/wptKeysignDlg.cpp:171
msgid "(3) I have done very careful checkings."
msgstr "(3) Td‚Ƀ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:883 c:\oss\winpt\src\wptKeylist.cpp:154
# c:\oss\winpt\src\wptKeylist.cpp:703
-#: Src/wptKeysignDlg.cpp:209
+#: Src/wptKeysignDlg.cpp:210
msgid "never"
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:246
+#: Src/wptKeysignDlg.cpp:264
#, c-format
msgid ""
"pub %d/%s created: %s expires: %s\n"
@@ -5114,48 +5118,52 @@
"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
# c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:259
+#: Src/wptKeysignDlg.cpp:277
msgid "No valid secret key found."
msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:264
+#: Src/wptKeysignDlg.cpp:282
msgid "Sign local only (non exportable signature)"
msgstr "ƒ[ƒJƒ‹—pƒVƒOƒjƒ`ƒƒ[(ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢ƒVƒOƒjƒ`ƒƒ[)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptKeysignDlg.cpp:265
+#: Src/wptKeysignDlg.cpp:283
msgid "Signature expires on"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
# c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:266
+#: Src/wptKeysignDlg.cpp:284
msgid "Sign non-revocably"
msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚É–¼‚·‚é"
-#: Src/wptKeysignDlg.cpp:267
+#: Src/wptKeysignDlg.cpp:285
msgid "&Ask for certification level"
msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:270
+#: Src/wptKeysignDlg.cpp:288
msgid "&Show photo"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:271 Src/wptPassphraseCB.cpp:92
+#: Src/wptKeysignDlg.cpp:289 Src/wptPassphraseCB.cpp:92
#: Src/wptPassphraseCB.cpp:100 Src/wptPassphraseDlg.cpp:68
#: Src/wptPINDlg.cpp:54
msgid "&Hide Typing"
msgstr "“ü—Í‚ð‰B‚·(&H)"
+#: Src/wptKeysignDlg.cpp:355
+msgid "You cannot select today as the expiration date."
+msgstr ""
+
# c:\oss\winpt\src\wptKeysignDlg.cpp:288
-#: Src/wptKeysignDlg.cpp:345
+#: Src/wptKeysignDlg.cpp:371
msgid "Could not get Key ID from key."
msgstr "ƒL[‚ÌID‚ðƒL[‚©‚çŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:366
+#: Src/wptKeysignDlg.cpp:392
msgid "This key is already signed by your key"
msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
@@ -5200,44 +5208,44 @@
"Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMainProc.cpp:398
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:413
msgid "Edit Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì•ÒW"
# c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:412
+#: Src/wptMainProc.cpp:414
msgid "About..."
msgstr "WinPT‚ɂ‚¢‚Ä..."
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:418 Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:420 Src/wptMainProc.cpp:424
msgid "Decrypt/Verify"
msgstr "•œ†/Šm”F"
-#: Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:434
msgid "Current Window"
msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
# c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:488
+#: Src/wptMainProc.cpp:490
msgid "Remove all passphrases from cache?"
msgstr "‚·‚ׂẴpƒXƒtƒŒ[ƒY‚ðƒLƒƒƒbƒVƒ…‚©‚çŠO‚¹‚Ü‚·B"
# c:\oss\winpt\src\wptClipImportDlg.cpp:112
# c:\oss\winpt\src\wptMainProc.cpp:466 c:\oss\winpt\src\wptProgressDlg.cpp:98
# c:\oss\winpt\src\wptRegistry.cpp:133
-#: Src/wptMainProc.cpp:489 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:491 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
# c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:499
+#: Src/wptMainProc.cpp:501
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BWinPT‚ðI—¹‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptMainProc.cpp:510
-#: Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:533
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -5248,7 +5256,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:566
# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptMainProc.cpp:587 Src/wptPreferencesDlg.cpp:136
+#: Src/wptMainProc.cpp:589 Src/wptPreferencesDlg.cpp:136
msgid "WinPT Preferences"
msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
@@ -5586,59 +5594,65 @@
msgstr "isƒXƒŒƒbƒh‚ð쬂»‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:427
-#: Src/wptProxySettingsDlg.cpp:67
+#: Src/wptProxySettingsDlg.cpp:69
msgid "Invalid host/IP address."
msgstr "–³Œø‚ȃzƒXƒg‚Ü‚½‚ÍIPƒAƒhƒŒƒXB"
+# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
+#: Src/wptProxySettingsDlg.cpp:78
+#, fuzzy
+msgid "Please enter the proxy hostname."
+msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
+
# c:\oss\winpt\src\wptImportList.cpp:84
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:967
-#: Src/wptProxySettingsDlg.cpp:76
+#: Src/wptProxySettingsDlg.cpp:84
msgid "Invalid port number."
msgstr "–³Œø‚ȃ|[ƒg”Ô†"
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
-#: Src/wptProxySettingsDlg.cpp:82
+#: Src/wptProxySettingsDlg.cpp:90
msgid "Please select a value from 0-65535 for the port"
msgstr "‚O`‚U‚T‚T‚R‚T‚͈̔͂̒l‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:56
-#: Src/wptProxySettingsDlg.cpp:87
+#: Src/wptProxySettingsDlg.cpp:95
msgid "When you want to use authentication, please fill out both fields."
msgstr "”FØ‚ðŽg—p‚·‚éꇂÍA—¼•û‚̃tƒB[ƒ‹ƒh‚ðŽg‚Á‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptProxySettingsDlg.cpp:92
+#: Src/wptProxySettingsDlg.cpp:100
msgid "Please enter a host name and a port."
msgstr "ƒzƒXƒg–¼‚ƃ|[ƒg‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptProxySettingsDlg.cpp:141
+#: Src/wptProxySettingsDlg.cpp:151
msgid "Proxy host name or IP address"
msgstr "ƒvƒƒbƒNƒV[ƒzƒXƒg–¼‚Ü‚½‚ÍIPƒAƒhƒŒƒX"
-#: Src/wptProxySettingsDlg.cpp:142
+#: Src/wptProxySettingsDlg.cpp:152
msgid "Server requires &authentication"
msgstr "ƒT[ƒo[‚É”FØ‚ª•K—v‚Å‚·(&A)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:147
-#: Src/wptProxySettingsDlg.cpp:143
+#: Src/wptProxySettingsDlg.cpp:153
msgid "User name"
msgstr "ƒ†[ƒU[–¼"
-#: Src/wptProxySettingsDlg.cpp:144
+#: Src/wptProxySettingsDlg.cpp:154
msgid "Password"
msgstr "ƒpƒXƒ[ƒh"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:473
-#: Src/wptProxySettingsDlg.cpp:145
+#: Src/wptProxySettingsDlg.cpp:155
#, fuzzy
msgid "Proxy type"
msgstr "ƒL[‚ÌŽí—Þ"
-#: Src/wptProxySettingsDlg.cpp:146
+#: Src/wptProxySettingsDlg.cpp:156
msgid "Authentication"
msgstr ""
-#: Src/wptProxySettingsDlg.cpp:178
+#: Src/wptProxySettingsDlg.cpp:196
msgid "Please fill out all required fields for authentication."
msgstr "”FØ‚·‚邽‚É‚ß‘S€–Ú‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
Modified: trunk/README
===================================================================
--- trunk/README 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/README 2006-03-22 11:04:20 UTC (rev 187)
@@ -1,8 +1,8 @@
- The Windows Privacy Tray
+ WinPT - The Windows Privacy Tray
Index
- 1. Notice
+ 1. Note
2. Bugs and improvements
3. What is WinPT?
4. Install
@@ -32,7 +32,7 @@
16. Features of the dialogs
-1. Notice
+1. Note
---------
This is only a quick guide for WinPT. For the moment the program is its own
@@ -42,7 +42,7 @@
2. Bugs and improvements
------------------------
-I have tried to thoroughly debug this program, but if you've found a bug,
+I have tried to thoroughly test this program, but if you've found a bug,
please send me a message with a full error description or go directly
to http://wald.intevation.org and use the WinPT bug tracking system.
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/ChangeLog 2006-03-22 11:04:20 UTC (rev 187)
@@ -1,3 +1,11 @@
+2006-03-21 Timo Schulz <ts at g10code.de>
+
+ * wptUTF8.cpp (native_to_utf8): Use directly W32 API.
+ (utf8_to_native): Likewise. Remove cp850 conversion.
+ * wptKeyEditDlgs.cpp (do_find_userid): Correct UTF8 handling.
+ * wptKeyManager.cpp (km_delete_keys): Do not reset 'with_seckey'
+ flag.
+
2006-03-20 Timo Schulz <ts at g10code.de>
* wptUTF8.cpp (get_native_charset): Removed.
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -52,7 +52,7 @@
if (get_pubkey (keyid, &key))
return m_strdup (_("user ID not found"));
- uid = utf8_to_wincp2 (key->uids->uid);
+ uid = utf8_to_native (key->uids->uid);
if (!uid)
uid = strdup (_("user ID not found"));
p = new char[strlen (uid) + 4 + 8];
@@ -188,7 +188,7 @@
}
else
s = _("Signature Status: Created with an undefined trusted key");
- uid = utf8_to_wincp2 (key->uids->uid);
+ uid = utf8_to_native (key->uids->uid);
}
else {
s = "";
Modified: trunk/Src/wptImportList.cpp
===================================================================
--- trunk/Src/wptImportList.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptImportList.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -303,7 +303,7 @@
listview_add_sub_item (lv, pos, IMPL_COL_UID, t);
}
else {
- uid = utf8_to_wincp (t, strlen (t));
+ uid = utf8_to_native (t);
if (uid) {
listview_add_sub_item (lv, pos, IMPL_COL_UID, uid);
free (uid);
Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyCache.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -529,8 +529,8 @@
for (c = ctx->item; c; c = c->next) {
if (c->flags != 0) {
*r_status = c->flags;
+ *r_obj = c;
c->flags = 0;
- *r_obj = c;
return 0;
}
}
@@ -610,17 +610,18 @@
c = ctx->item;
if (c->next == NULL) {
gpgme_key_release (itm->key);
- if (itm)
- free (itm);
+ safe_free (itm);
ctx->item = NULL;
}
else {
- while (c && c->next != itm)
- c = c->next;
+ for (; c != NULL; c = c->next) {
+ if (c->next == itm)
+ break;
+ }
+ assert (c != NULL); /* XXX: sometimes access violation. */
c->next = c->next->next;
gpgme_key_release (itm->key);
- if (itm)
- free (itm);
+ safe_free (itm);
}
return 0;
}
@@ -839,7 +840,7 @@
char **out, WORD *outlen)
{
char tmp[128], *p = tmp, *val;
- char *enc;
+ char *enc = NULL;
size_t pos = 0, i=0;
/* example: spk:24:1:21:http%3A//subkeys.pgp.de */
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -167,7 +167,7 @@
kid = key->subkeys->keyid;
if (!s || !strcmp (kid+8, k->keyid))
continue;
- u = utf8_to_wincp (s, strlen (s));
+ u = utf8_to_native (s);
SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_ADDSTRING,
0, (WPARAM)(char *)u);
free (u);
@@ -194,7 +194,7 @@
n = strlen (utf8_name) + strlen (email) + 16;
if (comment)
n += strlen (comment);
- uid = utf8_to_wincp (utf8_name, strlen (utf8_name));
+ uid = utf8_to_native (utf8_name);
p = new char[n+1];
if (!p)
BUG (NULL);
@@ -252,6 +252,7 @@
GpgKeyEdit *ke;
gpgme_error_t err;
gpg_uid_info_t inf, ui;
+ char *ui_name = NULL;
int pos = -1;
ke = new GpgKeyEdit (keyid);
@@ -267,9 +268,11 @@
}
for (ui = inf; ui; ui = ui->next) {
- if (name && email && ui->email && ui->name) {
+ safe_free (ui_name);
+ ui_name = utf8_to_native (ui->name);
+ if (name && email && ui->email && ui_name) {
if (!strcmp (ui->email, email) &&
- !strncmp (ui->name, name, strlen (name))) {
+ !strncmp (ui_name, name, strlen (name))) {
pos = ui->index;
break;
}
@@ -284,7 +287,7 @@
as the fallbck when no email address is available. */
continue;
}
- if (ui->name && name && !strcmp (ui->name, name)) {
+ if (ui_name && name && !strcmp (ui_name, name)) {
pos = ui->index;
break;
}
@@ -293,6 +296,7 @@
*r_inf = inf;
else
gpg_uid_info_release (inf);
+ safe_free (ui_name);
return pos;
}
@@ -548,10 +552,8 @@
rc = GetDlgItemText (dlg, IDC_ADDUID_COMMENT,
comment, sizeof comment -1);
+ utf8_name = native_to_utf8 (name);
- /* XXX: something is wrong with the encoding :-( */
- utf8_name = wincp_to_utf8 (name, strlen (name));
-
ke = new GpgKeyEdit (ctx->keyid);
if (!ke)
BUG (NULL);
@@ -1181,7 +1183,7 @@
/* XXX: add comment if available */
attr = u->name;
if (attr) {
- char *uid = utf8_to_wincp (attr, strlen (attr));
+ char *uid = utf8_to_native (attr);
if (uid) {
listview_add_sub_item (lv, j, 1, uid);
free (uid);
Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyManager.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -66,7 +66,7 @@
if (get_pubkey (keyid, &pk))
BUG (NULL);
- uid = utf8_to_wincp2 (pk->uids->uid);
+ uid = utf8_to_native (pk->uids->uid);
_snprintf (buf, buflen-1,
"pub %04d%s/%s %s %s\r\n"
" Primary key fingerprint: %s\r\n",
@@ -92,7 +92,7 @@
p = new char[n+1];
if (!p)
BUG (NULL);
- uid = utf8_to_wincp2 (pk->uids->uid);
+ uid = utf8_to_native (pk->uids->uid);
_snprintf (p, n, fmt, is_sec? "sec" : "pub",
pk->subkeys->length,
get_key_pubalgo2 (pk->subkeys->pubkey_algo),
@@ -755,7 +755,6 @@
"%s"), p);
if (rc == IDYES)
rset[k_pos++] = key;
- with_seckey = 0;
free_if_alloc (p);
}
else if (confirm) {
@@ -867,7 +866,7 @@
if (!key)
BUG (NULL);
- name = utf8_to_wincp2 (key->uids->name);
+ name = utf8_to_native (key->uids->name);
n = strlen (name)+1 + MAX_PATH + 5;
fname = new char[n+1];
get_temp_name (fname, n-5, name);
@@ -1046,7 +1045,7 @@
if (get_pubkey (keyid, &key))
return m_strdup (keyid);
- uid = utf8_to_wincp2 (key->uids->name);
+ uid = utf8_to_native (key->uids->name);
if (!uid)
return m_strdup (keyid);
p = new char[strlen (uid) + 8 + 16];
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -1937,7 +1937,7 @@
/* XXX: add generic function to support multiple selection
with a callback */
key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
- name = utf8_to_wincp2 (key->uids->uid);
+ name = utf8_to_native (key->uids->uid);
set_clip_text (NULL, name, strlen (name));
safe_free (name);
break;
Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyRevokeDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -48,7 +48,7 @@
if (get_pubkey (keyid, &k))
BUG (NULL);
- uid = utf8_to_wincp2 (k->uids->name);
+ uid = utf8_to_native (k->uids->name);
_snprintf (fname, flen-1, "%s_RevocationCert.asc", uid);
for (i=0; i < strlen (fname); i++) {
if (fname[i] == ' ')
@@ -153,7 +153,7 @@
}
if (use_desc)
- p = wincp_to_utf8 (desc, strlen (desc));
+ p = native_to_utf8 (desc);
/* we use the keyid to avoid charset problems and UTF8 encodings.*/
inp_data = generate_revoke_input (idx, use_desc? p : NULL, pwd);
Modified: trunk/Src/wptKeyRevokersDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokersDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyRevokersDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -106,7 +106,7 @@
if (get_pubkey (r->fpr+32, &revkey))
uid = strdup (_("user ID not found"));
else
- uid = utf8_to_wincp2 (revkey->uids->name);
+ uid = utf8_to_native (revkey->uids->name);
listview_add_item (lv, "");
alg = get_key_pubalgo (r->pubkey_algo);
listview_add_sub_item (lv, 0, REV_COL_ALGO, alg);
@@ -168,7 +168,7 @@
if (get_pubkey (keyid, &key))
BUG (NULL);
if (key->uids && key->uids->name) {
- char *uid = utf8_to_wincp2 (key->uids->name);
+ char *uid = utf8_to_native (key->uids->name);
listview_add_sub_item (lv, idx, REV_COL_NAME, uid);
free (uid);
}
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeygenDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -461,7 +461,7 @@
if (!use_comment && !strlen (comment)) {
char *utf8_name;
- utf8_name = wincp_to_utf8 (name, strlen (name));
+ utf8_name = native_to_utf8 (name);
if (!utf8_name)
BUG (0);
p = gpg_genkey_params (keytype, bits, utf8_name, NULL,
@@ -470,9 +470,9 @@
}
else {
char *utf8_name, *utf8_comment;
- utf8_name = wincp_to_utf8 (name, strlen (name));
- utf8_comment = wincp_to_utf8 (comment, strlen (comment));
- if( !utf8_name || !utf8_comment )
+ utf8_name = native_to_utf8 (name);
+ utf8_comment = native_to_utf8 (comment);
+ if (!utf8_name || !utf8_comment)
BUG (0);
p = gpg_genkey_params (keytype, bits, utf8_name, utf8_comment,
email, expire, pwd);
@@ -586,7 +586,7 @@
pass = request_passphrase2 (_("Key Generation"), PASSDLG_STRICT, &cancel);
if (cancel)
return FALSE;
- utf8_name = wincp_to_utf8 (name, strlen (name));
+ utf8_name = native_to_utf8 (name);
if( !utf8_name )
BUG( NULL );
if (IsDlgButtonChecked (dlg, IDC_KEYWIZARD_USERSA))
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeylist.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -733,7 +733,7 @@
listview_add_sub_item (lv, 0, idx++, attr);
}
else {
- char *uid = utf8_to_wincp (attr, strlen (attr));
+ char *uid = utf8_to_native (attr);
if (uid) {
listview_add_sub_item (lv, 0, idx++, uid);
free (uid);
@@ -845,7 +845,7 @@
s = key->uids->uid;
if (s) {
- uid = utf8_to_wincp2 (s);
+ uid = utf8_to_native (s);
listview_add_sub_item (lv, pos, KM_COL_UID, uid);
free (uid);
}
@@ -1136,7 +1136,7 @@
if (key->disabled || !key_is_useable (key->subkeys))
continue;
- uid = utf8_to_wincp (id, strlen (id));
+ uid = utf8_to_native (id);
size = strlen (uid) + strlen (keyid) + 32;
inf = new char[size+1];
if (!inf)
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -142,7 +142,7 @@
for (t=res->imports; t; t = t->next) {
if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {
- s = uid = utf8_to_wincp2 (key->uids->uid);
+ s = uid = utf8_to_native (key->uids->uid);
gpgme_data_write (msg, s, strlen (s));
gpgme_data_write (msg, "\n", 1);
gpgme_key_release (key);
Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeysigDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -169,7 +169,7 @@
if (ctx.exportable)
CheckDlgButton (dlg, IDC_SIGPROPS_EXP, BST_CHECKED);
if (!get_pubkey (ks->keyid+8, &issuer)) {
- char *uid = utf8_to_wincp2 (issuer->uids->uid);
+ char *uid = utf8_to_native (issuer->uids->uid);
SetDlgItemText (dlg, IDC_SIGPROPS_ISSUER, uid);
safe_free (uid);
}
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptKeysignDlg.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -113,7 +113,7 @@
continue;
if (defkey && !strcmp (defkey->subkeys->keyid, pk->subkeys->keyid))
curr_sel = i;
- uid = utf8_to_wincp (s, strlen (s));
+ uid = utf8_to_native (s);
p = new char[strlen (uid) + 64];
if (!p)
BUG (NULL);
@@ -259,7 +259,7 @@
SetWindowText (dlg, _("Key Signing"));
key = (winpt_key_t) lparam;
s = key->ctx->uids->uid;
- uid = utf8_to_wincp (s, strlen (s));
+ uid = utf8_to_native (s);
_snprintf (keymsg, sizeof keymsg -1,
_("pub %d/%s created: %s expires: %s\n\n"
"Primary key fingerprint: %s\n\n"
Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptPassphraseCB.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -121,7 +121,7 @@
id = u->name;
if (!id)
id = _("Invalid User ID");
- uid = utf8_to_wincp (id, strlen (id));
+ uid = utf8_to_native (id);
n = 32+strlen (uid)+1+4+strlen (r->keyid)+1;
if (u->email)
n += strlen (u->email)+1;
@@ -297,7 +297,7 @@
uid_hint += 16; /* skip keyid */
uid_hint += 1; /* space */
- uid = utf8_to_wincp (uid_hint, strlen (uid_hint));
+ uid = utf8_to_native (uid_hint);
if (strcmp (usedkey, mainkey))
_snprintf (desc, size-1,
Modified: trunk/Src/wptSigList.cpp
===================================================================
--- trunk/Src/wptSigList.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptSigList.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -146,7 +146,7 @@
else
attr = uid->uid;
if (attr && strlen (attr)) {
- char *uid_utf8 = utf8_to_wincp (attr, strlen (attr));
+ char *uid_utf8 = utf8_to_native (attr);
char *p = uid? m_strdup (uid_utf8) : indent_string (uid_utf8, 2);
listview_add_sub_item (lv, pos, 0, p);
free (uid_utf8);
Modified: trunk/Src/wptUTF8.cpp
===================================================================
--- trunk/Src/wptUTF8.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptUTF8.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -1,5 +1,4 @@
/* wptUTF8.cpp - UTF8 conversation
- * Copyright (C) 1994, 1998-2001 Free Software Foundation, Inc.
* Copyright (C) 2002, 2004, 2005, 2006 Timo Schulz
*
* This file is part of WinPT.
@@ -33,44 +32,54 @@
#include "wptErrors.h"
-/* convert latin1 string @string into utf8. */
-char *
-native_to_utf8( const char *string )
+char*
+native_to_utf8 (const char *string)
{
- const byte *s;
- char *buffer;
- byte *p;
- size_t length=0;
+ wchar_t *result;
+ char *native;
+ int n;
- for (s=(byte*)string; *s; s++) {
- length++;
- if (*s & 0x80)
- length++;
+ n = MultiByteToWideChar (GetACP (), 0, string, -1, NULL, 0);
+ if (n < 0)
+ return NULL;
+
+ result = (wchar_t*)malloc ((n+1) * sizeof *result);
+ if (!result)
+ BUG (0);
+
+ n = MultiByteToWideChar (GetACP (), 0, string, -1, result, n);
+ if (n < 0) {
+ free (result);
+ return NULL;
}
- buffer = (char*)malloc (length + 1);
- for (p = (byte*)buffer, s=(byte*)string; *s; s++) {
- if (*s & 0x80) {
- *p++ = 0xc0 | ((*s >> 6) & 3);
- *p++ = 0x80 | ( *s & 0x3f );
- }
- else
- *p++ = *s;
- }
- *p = 0;
- return buffer;
-}
+ n = WideCharToMultiByte (CP_UTF8, 0, result, -1, NULL, 0, NULL, NULL);
+ if (n < 0)
+ return NULL;
+ native = (char*)malloc (n+1);
+ if (!native)
+ BUG (0);
+ n = WideCharToMultiByte (CP_UTF8, 0, result, -1, native, n, NULL, NULL);
+ if (n < 0) {
+ free (result);
+ return NULL;
+ }
+
+ free (result);
+ return native;
+}
+
+
/* Convert utf8 string @str to native CP. */
-static char*
+char*
utf8_to_native (const char *string)
{
wchar_t *result;
char *native;
int n;
- /* Convert utf8 to unicode. */
n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0);
if (n < 0)
return NULL;
@@ -85,274 +94,25 @@
return NULL;
}
- /* Convert wide char into native char. */
- /*
n = WideCharToMultiByte (GetACP (), 0, result, -1, NULL, 0, NULL, NULL);
if (n < 0)
return NULL;
- */
- n = wcstombs (NULL, result, wcslen (result));
- if (n < 0)
- return NULL;
native = (char*)malloc (n+1);
if (!native)
BUG (0);
- /*
- n = WideCharToMultiByte (CP_ACP, 0, string, -1, result, n, NULL, NULL);
+ n = WideCharToMultiByte (GetACP (), 0, result, -1, native, n, NULL, NULL);
if (n < 0) {
free (result);
return NULL;
}
- */
- n = wcstombs (native, result, -1);
- if (n < 0) {
- free (result);
- return NULL;
- }
+ free (result);
return native;
}
-/* CP850 -> CP1251 */
-static void
-conv_charset (byte *string, size_t size, int what)
-{
- size_t i;
-
- if( what == 0 ) {
- for( i = 0; i < size; i++, string++ ) {
- switch( *string ) {
- case 0xa0: *string = 0xff; break; /* nobreakspace */
- case 0xa1: *string = 0xad; break; /* exclamdown */
- case 0xa2: *string = 0xbd; break; /* cent */
- case 0xa3: *string = 0x9c; break; /* sterling */
- case 0xa4: *string = 0xcf; break; /* currency */
- case 0xa5: *string = 0xbe; break; /* yen */
- case 0xa6: *string = 0xdd; break; /* brokenbar */
- case 0xa7: *string = 0xf5; break; /* section */
- case 0xa8: *string = 0xf9; break; /* diaeresis */
- case 0xa9: *string = 0xb8; break; /* copyright */
- case 0xaa: *string = 0xa6; break; /* ordfeminine */
- case 0xab: *string = 0xae; break; /* guillemotleft */
- case 0xac: *string = 0xaa; break; /* notsign */
- case 0xad: *string = 0xf0; break; /* hyphen */
- case 0xae: *string = 0xa9; break; /* registered */
- case 0xaf: *string = 0xee; break; /* macron */
- case 0xb0: *string = 0xf8; break; /* degree */
- case 0xb1: *string = 0xf1; break; /* plusminus */
- case 0xb2: *string = 0xfd; break; /* twosuperior */
- case 0xb3: *string = 0xfc; break; /* threesuperior */
- case 0xb4: *string = 0xef; break; /* acute */
- case 0xb5: *string = 0xe6; break; /* mu */
- case 0xb6: *string = 0xf4; break; /* paragraph */
- case 0xb7: *string = 0xfa; break; /* periodcentered */
- case 0xb8: *string = 0xf7; break; /* cedilla */
- case 0xb9: *string = 0xfb; break; /* onesuperior */
- case 0xba: *string = 0xa7; break; /* masculine */
- case 0xbb: *string = 0xaf; break; /* guillemotright */
- case 0xbc: *string = 0xac; break; /* onequarter */
- case 0xbd: *string = 0xab; break; /* onehalf */
- case 0xbe: *string = 0xf3; break; /* threequarters */
- case 0xbf: *string = 0xa8; break; /* questiondown */
- case 0xc0: *string = 0xb7; break; /* Agrave */
- case 0xc1: *string = 0xb5; break; /* Aacute */
- case 0xc2: *string = 0xb6; break; /* Acircumflex */
- case 0xc3: *string = 0xc7; break; /* Atilde */
- case 0xc4: *string = 0x8e; break; /* Adiaeresis */
- case 0xc5: *string = 0x8f; break; /* Aring */
- case 0xc6: *string = 0x92; break; /* AE */
- case 0xc7: *string = 0x80; break; /* Ccedilla */
- case 0xc8: *string = 0xd4; break; /* Egrave */
- case 0xc9: *string = 0x90; break; /* Eacute */
- case 0xca: *string = 0xd2; break; /* Ecircumflex */
- case 0xcb: *string = 0xd3; break; /* Ediaeresis */
- case 0xcc: *string = 0xde; break; /* Igrave */
- case 0xcd: *string = 0xd6; break; /* Iacute */
- case 0xce: *string = 0xd7; break; /* Icircumflex */
- case 0xcf: *string = 0xd8; break; /* Idiaeresis */
- case 0xd0: *string = 0xd1; break; /* Eth */
- case 0xd1: *string = 0xa5; break; /* Ntilde */
- case 0xd2: *string = 0xe3; break; /* Ograve */
- case 0xd3: *string = 0xe0; break; /* Oacute */
- case 0xd4: *string = 0xe2; break; /* Ocircumflex */
- case 0xd5: *string = 0xe5; break; /* Otilde */
- case 0xd6: *string = 0x99; break; /* Odiaeresis */
- case 0xd7: *string = 0x9e; break; /* multiply */
- case 0xd8: *string = 0x9d; break; /* Ooblique */
- case 0xd9: *string = 0xeb; break; /* Ugrave */
- case 0xda: *string = 0xe9; break; /* Uacute */
- case 0xdb: *string = 0xea; break; /* Ucircumflex */
- case 0xdc: *string = 0x9a; break; /* Udiaeresis */
- case 0xdd: *string = 0xed; break; /* Yacute */
- case 0xde: *string = 0xe8; break; /* Thorn */
- case 0xdf: *string = 0xe1; break; /* ssharp */
- case 0xe0: *string = 0x85; break; /* agrave */
- case 0xe1: *string = 0xa0; break; /* aacute */
- case 0xe2: *string = 0x83; break; /* acircumflex */
- case 0xe3: *string = 0xc6; break; /* atilde */
- case 0xe4: *string = 0x84; break; /* adiaeresis */
- case 0xe5: *string = 0x86; break; /* aring */
- case 0xe6: *string = 0x91; break; /* ae */
- case 0xe7: *string = 0x87; break; /* ccedilla */
- case 0xe8: *string = 0x8a; break; /* egrave */
- case 0xe9: *string = 0x82; break; /* eacute */
- case 0xea: *string = 0x88; break; /* ecircumflex */
- case 0xeb: *string = 0x89; break; /* ediaeresis */
- case 0xec: *string = 0x8d; break; /* igrave */
- case 0xed: *string = 0xa1; break; /* iacute */
- case 0xee: *string = 0x8c; break; /* icircumflex */
- case 0xef: *string = 0x8b; break; /* idiaeresis */
- case 0xf0: *string = 0xd0; break; /* eth */
- case 0xf1: *string = 0xa4; break; /* ntilde */
- case 0xf2: *string = 0x95; break; /* ograve */
- case 0xf3: *string = 0xa2; break; /* oacute */
- case 0xf4: *string = 0x93; break; /* ocircumflex */
- case 0xf5: *string = 0xe4; break; /* otilde */
- case 0xf6: *string = 0x94; break; /* odiaeresis */
- case 0xf7: *string = 0xf6; break; /* division */
- case 0xf8: *string = 0x9b; break; /* oslash */
- case 0xf9: *string = 0x97; break; /* ugrave */
- case 0xfa: *string = 0xa3; break; /* uacute */
- case 0xfb: *string = 0x96; break; /* ucircumflex */
- case 0xfc: *string = 0x81; break; /* udiaeresis */
- case 0xfd: *string = 0xec; break; /* yacute */
- case 0xfe: *string = 0xe7; break; /* thorn */
- case 0xff: *string = 0x98; break; /* ydiaeresis */
- default : break;
- }
- }
- }
- else {
- for( i = 0; i < size; i++, string++ ) {
- switch( *string ) {
- case 0xff: *string = 0xa0; break;
- case 0xad: *string = 0xa1; break;
- case 0xbd: *string = 0xa2; break;
- case 0x9c: *string = 0xa3; break;
- case 0xcf: *string = 0xa4; break;
- case 0xbe: *string = 0xa5; break;
- case 0xdd: *string = 0xa6; break;
- case 0xf5: *string = 0xa7; break;
- case 0xf9: *string = 0xa8; break;
- case 0xb8: *string = 0xa9; break;
- case 0xa6: *string = 0xaa; break;
- case 0xae: *string = 0xab; break;
- case 0xaa: *string = 0xac; break;
- case 0xf0: *string = 0xad; break;
- case 0xa9: *string = 0xae; break;
- case 0xee: *string = 0xaf; break;
- case 0xf8: *string = 0xb0; break;
- case 0xf1: *string = 0xb1; break;
- case 0xfd: *string = 0xb2; break;
- case 0xfc: *string = 0xb3; break;
- case 0xef: *string = 0xb4; break;
- case 0xe6: *string = 0xb5; break;
- case 0xf4: *string = 0xb6; break;
- case 0xfa: *string = 0xb7; break;
- case 0xf7: *string = 0xb8; break;
- case 0xfb: *string = 0xb9; break;
- case 0xa7: *string = 0xba; break;
- case 0xaf: *string = 0xbb; break;
- case 0xac: *string = 0xbc; break;
- case 0xab: *string = 0xbd; break;
- case 0xf3: *string = 0xbe; break;
- case 0xa8: *string = 0xbf; break;
- case 0xb7: *string = 0xc0; break;
- case 0xb5: *string = 0xc1; break;
- case 0xb6: *string = 0xc2; break;
- case 0xc7: *string = 0xc3; break;
- case 0x8e: *string = 0xc4; break;
- case 0x8f: *string = 0xc5; break;
- case 0x92: *string = 0xc6; break;
- case 0x80: *string = 0xc7; break;
- case 0xd4: *string = 0xc8; break;
- case 0x90: *string = 0xc9; break;
- case 0xd2: *string = 0xca; break;
- case 0xd3: *string = 0xcb; break;
- case 0xde: *string = 0xcc; break;
- case 0xd6: *string = 0xcd; break;
- case 0xd7: *string = 0xce; break;
- case 0xd8: *string = 0xcf; break;
- case 0xd1: *string = 0xd0; break;
- case 0xa5: *string = 0xd1; break;
- case 0xe3: *string = 0xd2; break;
- case 0xe0: *string = 0xd3; break;
- case 0xe2: *string = 0xd4; break;
- case 0xe5: *string = 0xd5; break;
- case 0x99: *string = 0xd6; break;
- case 0x9e: *string = 0xd7; break;
- case 0x9d: *string = 0xd8; break;
- case 0xeb: *string = 0xd9; break;
- case 0xe9: *string = 0xda; break;
- case 0xea: *string = 0xdb; break;
- case 0x9a: *string = 0xdc; break;
- case 0xed: *string = 0xdd; break;
- case 0xe8: *string = 0xde; break;
- case 0xe1: *string = 0xdf; break;
- case 0x85: *string = 0xe0; break;
- case 0xa0: *string = 0xe1; break;
- case 0x83: *string = 0xe2; break;
- case 0xc6: *string = 0xe3; break;
- case 0x84: *string = 0xe4; break;
- case 0x86: *string = 0xe5; break;
- case 0x91: *string = 0xe6; break;
- case 0x87: *string = 0xe7; break;
- case 0x8a: *string = 0xe8; break;
- case 0x82: *string = 0xe9; break;
- case 0x88: *string = 0xea; break;
- case 0x89: *string = 0xeb; break;
- case 0x8d: *string = 0xec; break;
- case 0xa1: *string = 0xed; break;
- case 0x8c: *string = 0xee; break;
- case 0x8b: *string = 0xef; break;
- case 0xd0: *string = 0xf0; break;
- case 0xa4: *string = 0xf1; break;
- case 0x95: *string = 0xf2; break;
- case 0xa2: *string = 0xf3; break;
- case 0x93: *string = 0xf4; break;
- case 0xe4: *string = 0xf5; break;
- case 0x94: *string = 0xf6; break;
- case 0xf6: *string = 0xf7; break;
- case 0x9b: *string = 0xf8; break;
- case 0x97: *string = 0xf9; break;
- case 0xa3: *string = 0xfa; break;
- case 0x96: *string = 0xfb; break;
- case 0x81: *string = 0xfc; break;
- case 0xec: *string = 0xfd; break;
- case 0xe7: *string = 0xfe; break;
- case 0x98: *string = 0xff; break;
- default : break;
- }
- }
- }
-}
-
-/* XXX: the conv_charset() call fails when the user-id was created
- with iso-8859-1 but it is assumed that CP850 (gpg console) is used. */
-
-char*
-utf8_to_wincp (const char * s, size_t len)
-{
- char *decs;
- decs = utf8_to_native (s);
- conv_charset ((byte *)decs, strlen (decs), 1);
- return decs;
-}
-
-
-char*
-wincp_to_utf8 (const char * s, size_t len)
-{
- char * encs;
- conv_charset ((byte *)s, len, 0);
- encs = native_to_utf8 (s);
- return encs;
-}
-
-
int
is_8bit_string (const char * str)
{
Modified: trunk/Src/wptVerifyList.cpp
===================================================================
--- trunk/Src/wptVerifyList.cpp 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/Src/wptVerifyList.cpp 2006-03-22 11:04:20 UTC (rev 187)
@@ -193,7 +193,7 @@
}
else {
attr = key->uids->name;
- uid = utf8_to_wincp2 (attr);
+ uid = utf8_to_native (attr);
if (uid) {
listview_add_sub_item( lv, 0, 4, (char *)uid );
free (uid);
@@ -257,7 +257,7 @@
listview_add_sub_item (lv, 0, 4, t);
}
else if (log->user_id) {
- char *p = utf8_to_wincp2 (log->user_id);
+ char *p = utf8_to_native (log->user_id);
if (p) {
listview_add_sub_item (lv, 0, 4, p);
free (p);
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/TODO 2006-03-22 11:04:20 UTC (rev 187)
@@ -1,6 +1,10 @@
(priority: + high, * normal, - low)
version 0.11.x
+ * there is a problem with the +E hotkey in EURO countries.
+
+ + migrate keyserver code to use the HTTP class.
+ Implement proxy authentication into the HTTP class.
+ Implement a system to manage language files. Retrieve a list
of available files from the server, present it to the user
and allow to download the file and set the default language
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-03-20 12:49:11 UTC (rev 186)
+++ trunk/configure.ac 2006-03-22 11:04:20 UTC (rev 187)
@@ -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.9-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.9, 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