[Winpt-commits] r197 - in trunk: . Include Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Apr 10 09:38:10 CEST 2006
Author: twoaday
Date: 2006-04-10 09:38:06 +0200 (Mon, 10 Apr 2006)
New Revision: 197
Modified:
trunk/Include/wptFileManager.h
trunk/NEWS
trunk/Po/de.po
trunk/Po/fr.po
trunk/Po/jp.po
trunk/Src/ChangeLog
trunk/Src/WinPT.cpp
trunk/Src/wptClipEncryptDlg.cpp
trunk/Src/wptFileCBS.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptGPG.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeyserverSearchDlg.cpp
trunk/THANKS
trunk/configure.ac
Log:
2006-04-09 Timo Schulz <ts at g10code.de>
* wptGPGPrefsDlg.cpp (gpgprefs_dlg_proc): Only return true
if the homedir value was changed.
* wptGPG.cpp (default_key_from_cache): Only return secret key
if public part is available.
(set_gnupg_default_key): Fix NULL problem.
* wptKeyEditDlgs.cpp (do_editkey_clean): Set update flag.
* wptFileCBS.cpp (write_cb, read_cb): Better error handling.
* wptFileManagerDlg.cpp (file_manager_dlg_proc): Handle
'always-on-top' correctly.
* wptKeylist.cpp (keylist_get_recipients): Allocate enough
mem to hold all possible keys.
(keylist_enum_keys): Likewise.
Modified: trunk/Include/wptFileManager.h
===================================================================
--- trunk/Include/wptFileManager.h 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Include/wptFileManager.h 2006-04-10 07:38:06 UTC (rev 197)
@@ -90,6 +90,7 @@
struct file_data_s {
struct gpgme_data_cbs cbs;
HANDLE handle;
+ int error;
gpgme_data_t dat;
unsigned long size;
unsigned long off;
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/NEWS 2006-04-10 07:38:06 UTC (rev 197)
@@ -785,3 +785,9 @@
(0.11.11)
* Fix clipboard problem on non-XP systems.
+* Allow to fetch multiple keys in the keyserver searching dialog.
+* Fix proxy support.
+ If a proxy was enabled in the past but not any longer, it might
+ be possible WinPT uses the proxy port instead of the keyserver
+ port to connect to the destination host.
+
\ No newline at end of file
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Po/de.po 2006-04-10 07:38:06 UTC (rev 197)
@@ -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-04-02 19:20+0200\n"
+"POT-Creation-Date: 2006-04-09 17:00+0200\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
@@ -30,8 +30,8 @@
#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
-#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "WinPT Fehler"
@@ -130,7 +130,7 @@
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:809
+#: Src/wptFileManagerDlg.cpp:810
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
@@ -235,7 +235,7 @@
msgstr "Über &GPG..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2045
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Hilfe"
@@ -446,7 +446,7 @@
"OK zum Fortfahren oder Abbrechen"
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -454,12 +454,12 @@
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
-#: Src/wptFileManager.cpp:1349
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
+#: Src/wptFileManager.cpp:1353
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -496,7 +496,7 @@
msgid "*** IMPORTANT ***"
msgstr "*** WICHTIG ***"
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
@@ -547,7 +547,7 @@
msgid "Clipboard"
msgstr "Zwischenablage"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
msgid "File Open"
msgstr "Datei öffnen"
@@ -563,7 +563,7 @@
msgid "File Save"
msgstr "Datei speichern"
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:107
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -599,29 +599,29 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2044
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
# c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:108
-#: Src/wptClipEncryptDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:115
msgid "Recipients unsuable for encryption:\n"
msgstr "Empfänger nicht geeignet für Verschlüsselung:\n"
-#: Src/wptClipEncryptDlg.cpp:120 Src/wptClipEncryptDlg.cpp:140
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipEncryptDlg.cpp:199
-#: Src/wptClipEncryptDlg.cpp:230 Src/wptMainProc.cpp:144
+#: Src/wptClipEncryptDlg.cpp:126 Src/wptClipEncryptDlg.cpp:146
+#: Src/wptClipEncryptDlg.cpp:199 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipEncryptDlg.cpp:237 Src/wptMainProc.cpp:144
#: Src/wptMainProc.cpp:212
msgid "Encryption"
msgstr "Verschlüsseln"
-#: Src/wptClipEncryptDlg.cpp:141
+#: Src/wptClipEncryptDlg.cpp:147
msgid "&Find"
msgstr "&Suche"
-#: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
@@ -637,12 +637,12 @@
msgid "&Cancel"
msgstr "&Abbrechen"
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipSignEncDlg.cpp:157
+#: Src/wptClipEncryptDlg.cpp:198 Src/wptClipSignEncDlg.cpp:157
msgid "You must select at least one key."
msgstr "Sie müssen wenigstens einen Schlüssel auswählen."
# c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:229
-#: Src/wptClipEncryptDlg.cpp:230
+#: Src/wptClipEncryptDlg.cpp:237
#, c-format
msgid "No recipient found with '%s'"
msgstr "Keine Empfaenger mit '%s' gefunden"
@@ -661,8 +661,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
-#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signieren"
@@ -695,7 +695,7 @@
msgid "Signing key:"
msgstr "Signierer Schlüssel:"
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1179
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
msgid "No key was selected."
msgstr "Kein Schlüssel ausgewählt."
@@ -706,8 +706,8 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
-#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
+#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -780,12 +780,12 @@
#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
-#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
-#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
-#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1935
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1949
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:2022 Src/wptKeyEditDlgs.cpp:2035
+#: Src/wptKeyEditDlgs.cpp:2046 Src/wptKeyEditDlgs.cpp:2075
+#: Src/wptKeyEditDlgs.cpp:2080 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -795,7 +795,7 @@
msgid "Enter preferred keyserver URL"
msgstr "Bevorzugte Keyserver URL eingeben"
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
msgid "Choose Locale Directory"
msgstr "Verzeichnis für Sprachdateien auswählen"
@@ -995,18 +995,18 @@
msgid "Unknown error=%d"
msgstr "Unbekannter Fehler=%d"
-#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
-#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
-#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
-#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
-#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
-#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
-#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
+#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
+#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
+#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
+#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Dateimanager"
-#: Src/wptFileManager.cpp:132
+#: Src/wptFileManager.cpp:129
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
@@ -1015,12 +1015,12 @@
"\"%s\" hat Nur-Lesen Attribut.\n"
"Auf Standard setzen?"
-#: Src/wptFileManager.cpp:136
+#: Src/wptFileManager.cpp:133
msgid "Could not reset file attribute to normal."
msgstr "Konnte Dateiattribut nicht auf normal zurücksetzen"
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:147
-#: Src/wptFileManager.cpp:172
+#: Src/wptFileManager.cpp:169
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -1033,26 +1033,26 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Name"
-#: Src/wptFileManager.cpp:386
+#: Src/wptFileManager.cpp:383
msgid "Operation"
msgstr "Prozess"
-#: Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:666
msgid "Please select a file."
msgstr "Bitte eine Datei auswählen."
-#: Src/wptFileManager.cpp:816
+#: Src/wptFileManager.cpp:813
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1061,53 +1061,53 @@
"\"%s\" scheint keine Text-Datei zu sein.\n"
"Möchsten Sie wirklich diese Datei signieren?"
-#: Src/wptFileManager.cpp:930
+#: Src/wptFileManager.cpp:928
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" existiert nicht"
-#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Dateistatus"
-#: Src/wptFileManager.cpp:1057
+#: Src/wptFileManager.cpp:1055
msgid "Enter filename for encrypted file"
msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
-#: Src/wptFileManager.cpp:1086
+#: Src/wptFileManager.cpp:1084
msgid "Could not get default secret key."
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
-#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
-#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signieren"
-#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
-#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
+#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symmetrisch"
-#: Src/wptFileManager.cpp:1195
+#: Src/wptFileManager.cpp:1193
msgid "Encryption failed."
msgstr "Verschlüsselung fehlgeschlagen."
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "Korrekte Signatur"
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "Falsche Signatur"
-#: Src/wptFileManager.cpp:1230
+#: Src/wptFileManager.cpp:1233
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1116,24 +1116,24 @@
"Signatur erstellt %s mit %s key ID %s\n"
"%s von \"%s\""
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1238
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptFileManager.cpp:1311
+#: Src/wptFileManager.cpp:1315
msgid "Choose Filename for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1320
+#: Src/wptFileManager.cpp:1324
msgid "Please enter filename for plaintext file"
msgstr "Wählen Sie einen Namen für die Klartext-Datei"
-#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
-#: Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: Src/wptFileManager.cpp:1364
+#: Src/wptFileManager.cpp:1368
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1142,7 +1142,7 @@
"Entshlüsselung fehlgeschlagen.\n"
"%s: existiert nicht."
-#: Src/wptFileManager.cpp:1371
+#: Src/wptFileManager.cpp:1375
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1153,32 +1153,32 @@
"\n"
"Wollen Sie diesen anstatt von '%s' benutzen?"
-#: Src/wptFileManager.cpp:1419
+#: Src/wptFileManager.cpp:1423
msgid "Enter filename for signed file"
msgstr "Wählen Sie einen Namen für die signierte Datei"
-#: Src/wptFileManager.cpp:1523
+#: Src/wptFileManager.cpp:1527
msgid "Could not find detached signature in the clipboard."
msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
# c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1543
+#: Src/wptFileManager.cpp:1547
msgid "No files to check."
msgstr "Keine Datei(en) zu pruefen."
-#: Src/wptFileManager.cpp:1560
+#: Src/wptFileManager.cpp:1564
msgid "Select Data File"
msgstr "Bitte Datendatei auswählen"
-#: Src/wptFileManager.cpp:1562
+#: Src/wptFileManager.cpp:1566
msgid "Selected Output File"
msgstr "Bitte Ausgabedatei auswählen"
-#: Src/wptFileManager.cpp:1590
+#: Src/wptFileManager.cpp:1594
msgid "Invalid file name. Exit"
msgstr "Ungültiger Dateiname. Abbruch"
-#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
+#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
@@ -1187,7 +1187,7 @@
msgid "Import"
msgstr "Importieren"
-#: Src/wptFileManager.cpp:1696
+#: Src/wptFileManager.cpp:1700
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1199,58 +1199,58 @@
"\n"
"Kann diese(n) Schlüssel nicht importieren!"
-#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:251
#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
msgid "No key was selected for export."
msgstr "Kein Schlüssel zum Exportieren ausgewählt."
-#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1023
#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG Status"
-#: Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1753
#, c-format
msgid "Finished (Output: %s)"
msgstr "Fertig (Ausgabe: %s)"
-#: Src/wptFileManager.cpp:1796
+#: Src/wptFileManager.cpp:1799
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManager.cpp:1855
+#: Src/wptFileManager.cpp:1859
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "Verschlüsseln in eine ZIP-Datei macht nur mit mehreren Dateien Sinn"
-#: Src/wptFileManager.cpp:1860
+#: Src/wptFileManager.cpp:1864
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1929
+#: Src/wptFileManager.cpp:1934
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1932
+#: Src/wptFileManager.cpp:1937
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1944
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
@@ -1341,7 +1341,7 @@
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:118
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1375,7 +1375,7 @@
msgid "&Encrypt"
msgstr "&Verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:552
+#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
msgid "Encrypt into ZIP"
msgstr "Verschlüsseln in ZIP"
@@ -1388,7 +1388,7 @@
msgid "&Sign"
msgstr "&Signieren"
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:556
+#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
@@ -1437,7 +1437,7 @@
msgstr "&Einstellungen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
msgid "Send as Mail"
msgstr "Als Mail versenden"
@@ -1450,41 +1450,41 @@
msgid "&Wipe"
msgstr "&Löschen"
-#: Src/wptFileManagerDlg.cpp:558
+#: Src/wptFileManagerDlg.cpp:559
msgid "Wipe"
msgstr "Löschen"
-#: Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:561
msgid "List Packets"
msgstr "Pakete anzeigen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:606
+#: Src/wptFileManagerDlg.cpp:607
msgid "&Calc Digest"
msgstr "Digest &berechnen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:761
+#: Src/wptFileManagerDlg.cpp:762
msgid "Are you sure you want to secure delete these files?"
msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
-#: Src/wptFileManagerDlg.cpp:762 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Ja"
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Nein"
-#: Src/wptFileManagerDlg.cpp:806
+#: Src/wptFileManagerDlg.cpp:807
msgid "Operation Status: Error"
msgstr "Prozess-Status: Fehler"
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:808
msgid "Operation Status: Done."
msgstr "Prozess-Status: Fertig."
-#: Src/wptFileManagerDlg.cpp:850
+#: Src/wptFileManagerDlg.cpp:851
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1540,7 +1540,7 @@
msgstr "WinPT Erster Start"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:728
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:840
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1550,19 +1550,19 @@
"In diesem Zustand kann nichts gespeichert werden\n"
"Wollen Sie das Attribut zurücksetzen?"
-#: Src/wptGPG.cpp:841
+#: Src/wptGPG.cpp:843
msgid "GPG Information"
msgstr "GPG Information"
-#: Src/wptGPG.cpp:845
+#: Src/wptGPG.cpp:847
msgid "Could not reset read-only state."
msgstr "Konnte den Nur-Lesen Zustand nicht zurücksetzen."
-#: Src/wptGPG.cpp:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
+#: Src/wptGPG.cpp:848 Src/wptGPG.cpp:1127 Src/wptGPG.cpp:1136
msgid "GPG Error"
msgstr "GPG Fehler"
-#: Src/wptGPG.cpp:858
+#: Src/wptGPG.cpp:860
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1576,11 +1576,11 @@
"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:863
+#: Src/wptGPG.cpp:865
msgid "GPG Warning"
msgstr "GPG Warnung"
-#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: Src/wptGPG.cpp:889 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
@@ -1592,7 +1592,7 @@
msgid "Preferences"
msgstr "Einstellungen"
-#: Src/wptGPG.cpp:888
+#: Src/wptGPG.cpp:890
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1601,41 +1601,41 @@
"%s existiert nicht.\n"
"Möchten Sie dieses Verzeichnis erstellen?"
-#: Src/wptGPG.cpp:916
+#: Src/wptGPG.cpp:918
msgid "Please choose your public keyring"
msgstr "Bitte wählen Sie Ihren öffentlichen Schlüsselbund."
-#: Src/wptGPG.cpp:919 Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:921 Src/wptGPG.cpp:941
msgid "No keyring was chosen. Exit."
msgstr "Kein Schlüsselbund ausgewählt. Abbruch."
-#: Src/wptGPG.cpp:925
+#: Src/wptGPG.cpp:927
msgid "Overwrite old public keyring?"
msgstr "Alten öff. Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:949
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:951
msgid "Could not copy file."
msgstr "Datei konnte nicht kopiert werden"
-#: Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:938
msgid "Please choose your secret keyring"
msgstr "Bitte wählen Sie Ihren geheimen Schlüsselbund"
-#: Src/wptGPG.cpp:944
+#: Src/wptGPG.cpp:946
msgid "Overwrite old secret keyring?"
msgstr "Alten geheimen Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:996 Src/wptGPG.cpp:1086 Src/wptGPG.cpp:1099
msgid "Backup"
msgstr "Sicherung"
-#: Src/wptGPG.cpp:994
+#: Src/wptGPG.cpp:996
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Schlüsselbundsicherung \"%s\" fehlgeschlagen"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:1021
-#: Src/wptGPG.cpp:1085
+#: Src/wptGPG.cpp:1087
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
@@ -1644,12 +1644,12 @@
"Kann auf das Backup-Laufwerk '%s' nicht zugreifen.\n"
"Bitte aktivieren/überprüfen sie das Laufwerk um Fortzufahren."
-#: Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:1099
#, c-format
msgid "Invalid backup mode %d"
msgstr "Ungültiger Sicherungsmethode %d"
-#: Src/wptGPG.cpp:1124
+#: Src/wptGPG.cpp:1126
msgid "No GPG error description available."
msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
@@ -1794,12 +1794,12 @@
msgid "Could not get GPG config file"
msgstr "Konnte Konfigurationsdatei von GPG nicht öffnen"
-#: Src/wptGPGPrefsDlg.cpp:306
-msgid "Choose GPG home directory"
+#: Src/wptGPGPrefsDlg.cpp:312
+msgid "Choose GPG Home Directory"
msgstr "Heimatverzeichnis von GPG auswählen"
-#: Src/wptGPGPrefsDlg.cpp:332
-msgid "Choose GPG binary"
+#: Src/wptGPGPrefsDlg.cpp:340
+msgid "Choose GPG Binary"
msgstr "Wählen Sie GPG.EXE Datei aus"
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
@@ -1830,7 +1830,7 @@
#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
-#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1996 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:413
#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
@@ -2113,7 +2113,7 @@
#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
-#: Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1935
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
@@ -2495,32 +2495,32 @@
msgid "Finished to compact key."
msgstr "Schlüssel erfolgreich bearbeitet."
-#: Src/wptKeyEditDlgs.cpp:1937
+#: Src/wptKeyEditDlgs.cpp:1939
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
-#: Src/wptKeyEditDlgs.cpp:2019
+#: Src/wptKeyEditDlgs.cpp:2021
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:2032
+#: Src/wptKeyEditDlgs.cpp:2034
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:2041
+#: Src/wptKeyEditDlgs.cpp:2043
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2075
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:2077
+#: Src/wptKeyEditDlgs.cpp:2079
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"
@@ -2844,7 +2844,7 @@
msgid "Invalid User ID"
msgstr "Ungültige Benutzerkennung"
-#: Src/wptKeylist.cpp:1005
+#: Src/wptKeylist.cpp:1006
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2859,11 +2859,11 @@
"\n"
"\"%s\" trotzdem benutzen?"
-#: Src/wptKeylist.cpp:1013 Src/wptKeylist.cpp:1076
+#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
msgid "Recipients"
msgstr "Empfänger"
-#: Src/wptKeylist.cpp:1077
+#: Src/wptKeylist.cpp:1079
#, c-format
msgid ""
"KeyID %s.\n"
@@ -2872,7 +2872,7 @@
"Schlüssel ID %s.\n"
"Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
-#: Src/wptKeylist.cpp:1179
+#: Src/wptKeylist.cpp:1181
msgid "Secret Key List"
msgstr "Liste der geheimen Schlüssel"
@@ -3786,7 +3786,7 @@
msgid "Keyserver Searching"
msgstr "Schlüsselserver-Suche"
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
msgid "Keyserver Search"
msgstr "Schlüsselserver-Suche"
Modified: trunk/Po/fr.po
===================================================================
--- trunk/Po/fr.po 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Po/fr.po 2006-04-10 07:38:06 UTC (rev 197)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.8\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-02 19:20+0200\n"
+"POT-Creation-Date: 2006-04-09 17:00+0200\n"
"PO-Revision-Date: 2006-03-04 21:32+0100\n"
"Last-Translator: Pascal Brochart <pbrochart at tuxfamily.org>\n"
"Language-Team: FR <winpt-dev at wald.intevation.org>\n"
@@ -23,8 +23,8 @@
#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
-#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "Erreur WinPT"
@@ -105,7 +105,7 @@
msgstr ""
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:809
+#: Src/wptFileManagerDlg.cpp:810
msgid "Wipe Free Space"
msgstr ""
@@ -190,7 +190,7 @@
msgid "&About GPG..."
msgstr ""
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2045
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "&Aide"
@@ -387,7 +387,7 @@
msgstr ""
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -395,12 +395,12 @@
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
-#: Src/wptFileManager.cpp:1349
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
+#: Src/wptFileManager.cpp:1353
msgid "Decryption"
msgstr "Déchiffrement"
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -431,7 +431,7 @@
msgid "*** IMPORTANT ***"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
@@ -476,7 +476,7 @@
msgid "Clipboard"
msgstr "Presse papiers"
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
msgid "File Open"
msgstr ""
@@ -490,7 +490,7 @@
msgid "File Save"
msgstr ""
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:107
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -524,28 +524,28 @@
msgid "Add quotes"
msgstr ""
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2044
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fermer"
-#: Src/wptClipEncryptDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:115
msgid "Recipients unsuable for encryption:\n"
msgstr ""
-#: Src/wptClipEncryptDlg.cpp:120 Src/wptClipEncryptDlg.cpp:140
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipEncryptDlg.cpp:199
-#: Src/wptClipEncryptDlg.cpp:230 Src/wptMainProc.cpp:144
+#: Src/wptClipEncryptDlg.cpp:126 Src/wptClipEncryptDlg.cpp:146
+#: Src/wptClipEncryptDlg.cpp:199 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipEncryptDlg.cpp:237 Src/wptMainProc.cpp:144
#: Src/wptMainProc.cpp:212
msgid "Encryption"
msgstr "Chiffrement"
-#: Src/wptClipEncryptDlg.cpp:141
+#: Src/wptClipEncryptDlg.cpp:147
msgid "&Find"
msgstr "&Chercher"
-#: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
@@ -561,11 +561,11 @@
msgid "&Cancel"
msgstr "&Annuler"
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipSignEncDlg.cpp:157
+#: Src/wptClipEncryptDlg.cpp:198 Src/wptClipSignEncDlg.cpp:157
msgid "You must select at least one key."
msgstr "Vous devez sélectionner au moins une clé."
-#: Src/wptClipEncryptDlg.cpp:230
+#: Src/wptClipEncryptDlg.cpp:237
#, c-format
msgid "No recipient found with '%s'"
msgstr ""
@@ -584,8 +584,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
-#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "Signer"
@@ -618,7 +618,7 @@
msgid "Signing key:"
msgstr ""
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1179
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
msgid "No key was selected."
msgstr "Aucune clé n'a été sélectionnée"
@@ -629,8 +629,8 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
-#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
+#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -699,12 +699,12 @@
#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
-#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
-#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
-#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1935
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1949
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:2022 Src/wptKeyEditDlgs.cpp:2035
+#: Src/wptKeyEditDlgs.cpp:2046 Src/wptKeyEditDlgs.cpp:2075
+#: Src/wptKeyEditDlgs.cpp:2080 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr ""
@@ -713,7 +713,7 @@
msgid "Enter preferred keyserver URL"
msgstr ""
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
msgid "Choose Locale Directory"
msgstr ""
@@ -912,29 +912,29 @@
msgid "Unknown error=%d"
msgstr "Erreur inconnue=%d"
-#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
-#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
-#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
-#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
-#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
-#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
-#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
+#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
+#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
+#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
+#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "Gestionnaire de fichier"
-#: Src/wptFileManager.cpp:132
+#: Src/wptFileManager.cpp:129
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
"Set attribute to normal?"
msgstr ""
-#: Src/wptFileManager.cpp:136
+#: Src/wptFileManager.cpp:133
msgid "Could not reset file attribute to normal."
msgstr ""
-#: Src/wptFileManager.cpp:172
+#: Src/wptFileManager.cpp:169
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -942,110 +942,110 @@
"Do you want to disable it?"
msgstr ""
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "Nom"
-#: Src/wptFileManager.cpp:386
+#: Src/wptFileManager.cpp:383
msgid "Operation"
msgstr "Opération"
-#: Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:666
msgid "Please select a file."
msgstr "Sélectionner un fichier."
-#: Src/wptFileManager.cpp:816
+#: Src/wptFileManager.cpp:813
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
"Do you really want to clearsign it?"
msgstr ""
-#: Src/wptFileManager.cpp:930
+#: Src/wptFileManager.cpp:928
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" n'existe pas"
-#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "Status du fichier"
-#: Src/wptFileManager.cpp:1057
+#: Src/wptFileManager.cpp:1055
msgid "Enter filename for encrypted file"
msgstr ""
-#: Src/wptFileManager.cpp:1086
+#: Src/wptFileManager.cpp:1084
msgid "Could not get default secret key."
msgstr "Ne peut obtenir la clé secrète par défaut."
-#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
-#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "Signer"
-#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "Chiffrer"
-#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
-#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
+#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "Symétrique"
-#: Src/wptFileManager.cpp:1195
+#: Src/wptFileManager.cpp:1193
msgid "Encryption failed."
msgstr "Erreur de chiffrement."
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "Bonne signature"
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "MAUVAISE signature"
-#: Src/wptFileManager.cpp:1230
+#: Src/wptFileManager.cpp:1233
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
"%s from \"%s\""
msgstr ""
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1238
msgid "Decrypt Verify"
msgstr ""
-#: Src/wptFileManager.cpp:1311
+#: Src/wptFileManager.cpp:1315
msgid "Choose Filename for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1320
+#: Src/wptFileManager.cpp:1324
msgid "Please enter filename for plaintext file"
msgstr ""
-#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
-#: Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "Déchiffrer"
-#: Src/wptFileManager.cpp:1364
+#: Src/wptFileManager.cpp:1368
#, c-format
msgid ""
"Decryption failed.\n"
"%s: does not exist."
msgstr ""
-#: Src/wptFileManager.cpp:1371
+#: Src/wptFileManager.cpp:1375
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1053,31 +1053,31 @@
"Do you want to use this instead of '%s'?"
msgstr ""
-#: Src/wptFileManager.cpp:1419
+#: Src/wptFileManager.cpp:1423
msgid "Enter filename for signed file"
msgstr ""
-#: Src/wptFileManager.cpp:1523
+#: Src/wptFileManager.cpp:1527
msgid "Could not find detached signature in the clipboard."
msgstr ""
-#: Src/wptFileManager.cpp:1543
+#: Src/wptFileManager.cpp:1547
msgid "No files to check."
msgstr "Aucun fichiers à vérifier."
-#: Src/wptFileManager.cpp:1560
+#: Src/wptFileManager.cpp:1564
msgid "Select Data File"
msgstr ""
-#: Src/wptFileManager.cpp:1562
+#: Src/wptFileManager.cpp:1566
msgid "Selected Output File"
msgstr ""
-#: Src/wptFileManager.cpp:1590
+#: Src/wptFileManager.cpp:1594
msgid "Invalid file name. Exit"
msgstr ""
-#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
+#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
@@ -1086,7 +1086,7 @@
msgid "Import"
msgstr "Importer"
-#: Src/wptFileManager.cpp:1696
+#: Src/wptFileManager.cpp:1700
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1094,58 +1094,58 @@
"Cannot import these key(s)!"
msgstr ""
-#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:251
#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
msgid "No key was selected for export."
msgstr ""
-#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "Exporter"
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "Choisissez un nom de fichier pour la clé"
-#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1023
#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "Status de GnuPG"
-#: Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1753
#, c-format
msgid "Finished (Output: %s)"
msgstr ""
-#: Src/wptFileManager.cpp:1796
+#: Src/wptFileManager.cpp:1799
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr ""
-#: Src/wptFileManager.cpp:1855
+#: Src/wptFileManager.cpp:1859
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr ""
-#: Src/wptFileManager.cpp:1860
+#: Src/wptFileManager.cpp:1864
msgid "Choose File Name for Output"
msgstr ""
-#: Src/wptFileManager.cpp:1929
+#: Src/wptFileManager.cpp:1934
msgid "Choose a Name for the Archive"
msgstr ""
-#: Src/wptFileManager.cpp:1932
+#: Src/wptFileManager.cpp:1937
msgid "Invalid archive name. Exit."
msgstr ""
-#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
msgid "Encrypt Directory"
msgstr ""
-#: Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1944
msgid "Could not create zip archive."
msgstr ""
@@ -1232,7 +1232,7 @@
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:118
msgid "Please select a key."
msgstr "Sélectionner une clé."
@@ -1266,7 +1266,7 @@
msgid "&Encrypt"
msgstr "&Chiffrer"
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:552
+#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
msgid "Encrypt into ZIP"
msgstr "Chiffrer dans ZIP"
@@ -1279,7 +1279,7 @@
msgid "&Sign"
msgstr "&Signer"
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:556
+#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "Signer && Chiffrer"
@@ -1324,7 +1324,7 @@
msgid "&Preferences"
msgstr "&Préférences"
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
msgid "Send as Mail"
msgstr "Envoyer par Mail"
@@ -1336,39 +1336,39 @@
msgid "&Wipe"
msgstr "&Algorithme"
-#: Src/wptFileManagerDlg.cpp:558
+#: Src/wptFileManagerDlg.cpp:559
msgid "Wipe"
msgstr "Algorithme"
-#: Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:561
msgid "List Packets"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:606
+#: Src/wptFileManagerDlg.cpp:607
msgid "&Calc Digest"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:761
+#: Src/wptFileManagerDlg.cpp:762
msgid "Are you sure you want to secure delete these files?"
msgstr ""
-#: Src/wptFileManagerDlg.cpp:762 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "&Oui"
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "&Non"
-#: Src/wptFileManagerDlg.cpp:806
+#: Src/wptFileManagerDlg.cpp:807
msgid "Operation Status: Error"
msgstr "Statut de l'opération : Erreur"
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:808
msgid "Operation Status: Done."
msgstr "Statut de l'opération : Fait"
-#: Src/wptFileManagerDlg.cpp:850
+#: Src/wptFileManagerDlg.cpp:851
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1419,26 +1419,26 @@
msgid "WinPT First Start"
msgstr "Première exécution de WinPT"
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:840
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:841
+#: Src/wptGPG.cpp:843
msgid "GPG Information"
msgstr ""
-#: Src/wptGPG.cpp:845
+#: Src/wptGPG.cpp:847
msgid "Could not reset read-only state."
msgstr ""
-#: Src/wptGPG.cpp:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
+#: Src/wptGPG.cpp:848 Src/wptGPG.cpp:1127 Src/wptGPG.cpp:1136
msgid "GPG Error"
msgstr "Erreur GPG"
-#: Src/wptGPG.cpp:858
+#: Src/wptGPG.cpp:860
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1447,11 +1447,11 @@
"caused by another program which already opened the files.\n"
msgstr ""
-#: Src/wptGPG.cpp:863
+#: Src/wptGPG.cpp:865
msgid "GPG Warning"
msgstr ""
-#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: Src/wptGPG.cpp:889 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
@@ -1463,7 +1463,7 @@
msgid "Preferences"
msgstr "Préférences"
-#: Src/wptGPG.cpp:888
+#: Src/wptGPG.cpp:890
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1472,52 +1472,52 @@
"%s n'existe pas.\n"
"Voulez-vous créer ce répertoire?"
-#: Src/wptGPG.cpp:916
+#: Src/wptGPG.cpp:918
msgid "Please choose your public keyring"
msgstr "Veuillez choisir votre porte-clés public"
-#: Src/wptGPG.cpp:919 Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:921 Src/wptGPG.cpp:941
msgid "No keyring was chosen. Exit."
msgstr "Aucun porte-clés n'a été choisi. Sortie."
-#: Src/wptGPG.cpp:925
+#: Src/wptGPG.cpp:927
msgid "Overwrite old public keyring?"
msgstr ""
-#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:949
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:951
msgid "Could not copy file."
msgstr ""
-#: Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:938
msgid "Please choose your secret keyring"
msgstr "Veuillez choisir votre porte-clés secret"
-#: Src/wptGPG.cpp:944
+#: Src/wptGPG.cpp:946
msgid "Overwrite old secret keyring?"
msgstr ""
-#: Src/wptGPG.cpp:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:996 Src/wptGPG.cpp:1086 Src/wptGPG.cpp:1099
msgid "Backup"
msgstr ""
-#: Src/wptGPG.cpp:994
+#: Src/wptGPG.cpp:996
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr ""
-#: Src/wptGPG.cpp:1085
+#: Src/wptGPG.cpp:1087
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
"Please insert/check the drive to continue."
msgstr ""
-#: Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:1099
#, c-format
msgid "Invalid backup mode %d"
msgstr ""
-#: Src/wptGPG.cpp:1124
+#: Src/wptGPG.cpp:1126
msgid "No GPG error description available."
msgstr ""
@@ -1659,12 +1659,13 @@
msgid "Could not get GPG config file"
msgstr ""
-#: Src/wptGPGPrefsDlg.cpp:306
-msgid "Choose GPG home directory"
-msgstr ""
+#: Src/wptGPGPrefsDlg.cpp:312
+#, fuzzy
+msgid "Choose GPG Home Directory"
+msgstr "Ne peut créer le répertoire personnel GPG"
-#: Src/wptGPGPrefsDlg.cpp:332
-msgid "Choose GPG binary"
+#: Src/wptGPGPrefsDlg.cpp:340
+msgid "Choose GPG Binary"
msgstr ""
#: Src/wptGroupManager.cpp:207 Src/wptGroupManager.cpp:238
@@ -1695,7 +1696,7 @@
#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
-#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1996 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:413
#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
@@ -1954,7 +1955,7 @@
#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
-#: Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1935
msgid "Please select a user ID."
msgstr ""
@@ -2293,31 +2294,31 @@
msgid "Finished to compact key."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1937
+#: Src/wptKeyEditDlgs.cpp:1939
msgid "Do you really want to make this sig exportable?"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2019
+#: Src/wptKeyEditDlgs.cpp:2021
msgid "Could not set subkey window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2032
+#: Src/wptKeyEditDlgs.cpp:2034
msgid "Could not set user ID window procedure."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2041
+#: Src/wptKeyEditDlgs.cpp:2043
msgid "Command>"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2075
msgid "Please select a command."
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:2077
+#: Src/wptKeyEditDlgs.cpp:2079
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr ""
@@ -2624,7 +2625,7 @@
msgid "Invalid User ID"
msgstr ""
-#: Src/wptKeylist.cpp:1005
+#: Src/wptKeylist.cpp:1006
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -2634,18 +2635,18 @@
"Use \"%s\" anyway?"
msgstr ""
-#: Src/wptKeylist.cpp:1013 Src/wptKeylist.cpp:1076
+#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
msgid "Recipients"
msgstr ""
-#: Src/wptKeylist.cpp:1077
+#: Src/wptKeylist.cpp:1079
#, c-format
msgid ""
"KeyID %s.\n"
"Do you really want to export a revoked key?"
msgstr ""
-#: Src/wptKeylist.cpp:1179
+#: Src/wptKeylist.cpp:1181
msgid "Secret Key List"
msgstr ""
@@ -3478,7 +3479,7 @@
msgid "Keyserver Searching"
msgstr ""
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
msgid "Keyserver Search"
msgstr ""
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Po/jp.po 2006-04-10 07:38:06 UTC (rev 197)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-04-02 19:20+0200\n"
+"POT-Creation-Date: 2006-04-09 17:00+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -33,8 +33,8 @@
#: Src/WinPT.cpp:464 Src/WinPT.cpp:471 Src/WinPT.cpp:511 Src/WinPT.cpp:539
#: Src/WinPT.cpp:548 Src/WinPT.cpp:552 Src/WinPT.cpp:569 Src/WinPT.cpp:637
#: Src/WinPT.cpp:650 Src/WinPT.cpp:697 Src/WinPT.cpp:727 Src/WinPT.cpp:745
-#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:919
-#: Src/wptGPG.cpp:930 Src/wptGPG.cpp:939 Src/wptGPG.cpp:949
+#: Src/wptCommonDlg.cpp:221 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:941 Src/wptGPG.cpp:951
#: Src/wptMainProc.cpp:361 Src/wptMainProc.cpp:537
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
@@ -153,7 +153,7 @@
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
#: Src/WinPT.cpp:594 Src/wptFileManagerDlg.cpp:494
-#: Src/wptFileManagerDlg.cpp:809
+#: Src/wptFileManagerDlg.cpp:810
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
@@ -269,7 +269,7 @@
msgid "&About GPG..."
msgstr "GPG‚ɂ‚¢‚Ä..."
-#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2043
+#: Src/wptAboutDlgs.cpp:115 Src/wptKeyEditDlgs.cpp:2045
#: Src/wptKeyManagerDlg.cpp:947
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
@@ -546,7 +546,7 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
#: Src/wptClipDecryptDlg.cpp:53 Src/wptClipDecryptDlg.cpp:56
-#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1234
+#: Src/wptClipDecryptDlg.cpp:194 Src/wptFileManager.cpp:1231
#: Src/wptKeyRevokersDlg.cpp:108 Src/wptKeyRevokersDlg.cpp:160
#: Src/wptVerifyList.cpp:192 Src/wptVerifyList.cpp:258
msgid "user ID not found"
@@ -560,14 +560,14 @@
# c:\oss\winpt\src\wptFileManager.cpp:996
#: Src/wptClipDecryptDlg.cpp:119 Src/wptClipDecryptDlg.cpp:132
#: Src/wptClipDecryptDlg.cpp:140 Src/wptClipDecryptDlg.cpp:147
-#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1302
-#: Src/wptFileManager.cpp:1349
+#: Src/wptClipDecryptDlg.cpp:149 Src/wptFileManager.cpp:1306
+#: Src/wptFileManager.cpp:1353
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1350
+#: Src/wptClipDecryptDlg.cpp:133 Src/wptFileManager.cpp:1354
#, c-format
msgid ""
"Encrypted with %s key, ID %s.%s\n"
@@ -613,7 +613,7 @@
# c:\oss\winpt\src\wptKeyManager.cpp:274
# c:\oss\winpt\src\wptKeyManager.cpp:610
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipDecryptDlg.cpp:162 Src/wptClipEncryptDlg.cpp:213
#: Src/wptClipSignDlg.cpp:122 Src/wptClipSignDlg.cpp:266
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:273
#: Src/wptKeyManager.cpp:751 Src/wptKeyManager.cpp:950 Src/wptSymEnc.cpp:91
@@ -680,7 +680,7 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:114
# c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:576
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:573
msgid "File Open"
msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚"
@@ -699,7 +699,7 @@
msgstr "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚é"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:110
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:107
#, c-format
msgid ""
"\"%s\" already exists.\n"
@@ -747,13 +747,13 @@
msgid "Add quotes"
msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2042
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:2044
#: Src/wptKeyserverDlg.cpp:594 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
-#: Src/wptClipEncryptDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:115
msgid "Recipients unsuable for encryption:\n"
msgstr "ŽóMŽÒ‚½‚¿‚͈Ɖ»Žg—p‚É“K‚³‚È‚¢:\n"
@@ -763,21 +763,21 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
# c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptClipEncryptDlg.cpp:120 Src/wptClipEncryptDlg.cpp:140
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipEncryptDlg.cpp:199
-#: Src/wptClipEncryptDlg.cpp:230 Src/wptMainProc.cpp:144
+#: Src/wptClipEncryptDlg.cpp:126 Src/wptClipEncryptDlg.cpp:146
+#: Src/wptClipEncryptDlg.cpp:199 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipEncryptDlg.cpp:237 Src/wptMainProc.cpp:144
#: Src/wptMainProc.cpp:212
msgid "Encryption"
msgstr "ˆÃ†‰»"
# c:\oss\winpt\src\wptFileSaveDlg.cpp:88
# c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipEncryptDlg.cpp:141
+#: Src/wptClipEncryptDlg.cpp:147
msgid "&Find"
msgstr "ŒŸŽ@(&F)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:148 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:77 Src/wptCommonDlg.cpp:254
#: Src/wptFileManagerDlg.cpp:84 Src/wptFileManagerDlg.cpp:218
#: Src/wptFileManagerDlg.cpp:287 Src/wptFileSaveDlg.cpp:58
@@ -795,12 +795,12 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:109
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:110
-#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipSignEncDlg.cpp:157
+#: Src/wptClipEncryptDlg.cpp:198 Src/wptClipSignEncDlg.cpp:157
msgid "You must select at least one key."
msgstr "‚È‚‚Ä‚àˆê‚‚̃L[‚ð‘I‘ð‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
-#: Src/wptClipEncryptDlg.cpp:230
+#: Src/wptClipEncryptDlg.cpp:237
#, c-format
msgid "No recipient found with '%s'"
msgstr "'%s'‚É‚æ‚éŽóMŽÒ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -837,8 +837,8 @@
#: Src/wptClipSignDlg.cpp:164 Src/wptClipSignDlg.cpp:223
#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:250
#: Src/wptClipSignDlg.cpp:261 Src/wptClipSignEncDlg.cpp:166
-#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1087
-#: Src/wptFileManager.cpp:1103 Src/wptFileManager.cpp:1406
+#: Src/wptClipSignEncDlg.cpp:176 Src/wptFileManager.cpp:1085
+#: Src/wptFileManager.cpp:1101 Src/wptFileManager.cpp:1410
#: Src/wptMainProc.cpp:156 Src/wptMainProc.cpp:218
msgid "Signing"
msgstr "–¼"
@@ -882,7 +882,7 @@
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:119
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1179
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1181
msgid "No key was selected."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -909,8 +909,8 @@
#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1590 Src/wptFileManager.cpp:1643
-#: Src/wptFileManagerDlg.cpp:557 Src/wptFileVerifyDlg.cpp:81
+#: Src/wptFileManager.cpp:1594 Src/wptFileManager.cpp:1647
+#: Src/wptFileManagerDlg.cpp:558 Src/wptFileVerifyDlg.cpp:81
#: Src/wptFileVerifyDlg.cpp:149 Src/wptMainProc.cpp:182
#: Src/wptMainProc.cpp:248 Src/wptMainProc.cpp:260 Src/wptMainProc.cpp:268
#: Src/wptMainProc.cpp:425
@@ -1038,12 +1038,12 @@
#: Src/wptKeyEditDlgs.cpp:1701 Src/wptKeyEditDlgs.cpp:1734
#: Src/wptKeyEditDlgs.cpp:1761 Src/wptKeyEditDlgs.cpp:1765
#: Src/wptKeyEditDlgs.cpp:1776 Src/wptKeyEditDlgs.cpp:1900
-#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1933
-#: Src/wptKeyEditDlgs.cpp:1938 Src/wptKeyEditDlgs.cpp:1947
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeyEditDlgs.cpp:1965
-#: Src/wptKeyEditDlgs.cpp:2020 Src/wptKeyEditDlgs.cpp:2033
-#: Src/wptKeyEditDlgs.cpp:2044 Src/wptKeyEditDlgs.cpp:2073
-#: Src/wptKeyEditDlgs.cpp:2078 Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyEditDlgs.cpp:1902 Src/wptKeyEditDlgs.cpp:1935
+#: Src/wptKeyEditDlgs.cpp:1940 Src/wptKeyEditDlgs.cpp:1949
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeyEditDlgs.cpp:1967
+#: Src/wptKeyEditDlgs.cpp:2022 Src/wptKeyEditDlgs.cpp:2035
+#: Src/wptKeyEditDlgs.cpp:2046 Src/wptKeyEditDlgs.cpp:2075
+#: Src/wptKeyEditDlgs.cpp:2080 Src/wptKeyManagerDlg.cpp:975
#: Src/wptKeyManagerDlg.cpp:1790
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1053,7 +1053,7 @@
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:326
+#: Src/wptCommonDlg.cpp:212 Src/wptGPGPrefsDlg.cpp:334
#, fuzzy
msgid "Choose Locale Directory"
msgstr "'locale'ÃÞ¨Ú¸ÄØ‚Ì‘I‘ð"
@@ -1315,19 +1315,19 @@
# c:\oss\winpt\src\wptFileManager.cpp:1381
# c:\oss\winpt\src\wptFileStatDlg.cpp:124
# c:\oss\winpt\src\wptMainProc.cpp:387 c:\oss\winpt\src\wptMainProc.cpp:526
-#: Src/wptFileManager.cpp:109 Src/wptFileManager.cpp:131
-#: Src/wptFileManager.cpp:137 Src/wptFileManager.cpp:176
-#: Src/wptFileManager.cpp:301 Src/wptFileManager.cpp:670
-#: Src/wptFileManager.cpp:815 Src/wptFileManager.cpp:929
-#: Src/wptFileManager.cpp:1497 Src/wptFileManager.cpp:1524
-#: Src/wptFileManager.cpp:1543 Src/wptFileManager.cpp:1795
-#: Src/wptFileManager.cpp:1856 Src/wptFileManagerDlg.cpp:504
+#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
+#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
+#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:667
+#: Src/wptFileManager.cpp:812 Src/wptFileManager.cpp:927
+#: Src/wptFileManager.cpp:1501 Src/wptFileManager.cpp:1528
+#: Src/wptFileManager.cpp:1547 Src/wptFileManager.cpp:1798
+#: Src/wptFileManager.cpp:1860 Src/wptFileManagerDlg.cpp:504
#: Src/wptFileStatDlg.cpp:152 Src/wptMainProc.cpp:412 Src/wptMDSumDlg.cpp:153
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
# c:\oss\winpt\src\wptFileManager.cpp:102
-#: Src/wptFileManager.cpp:132
+#: Src/wptFileManager.cpp:129
#, c-format
msgid ""
"\"%s\" has read-only attribute.\n"
@@ -1337,12 +1337,12 @@
"‘®«‚ð•’Ê‚Éݒ肵‚Ü‚·‚©H"
# c:\oss\winpt\src\wptCardDlg.cpp:317
-#: Src/wptFileManager.cpp:136
+#: Src/wptFileManager.cpp:133
msgid "Could not reset file attribute to normal."
msgstr "ƒtƒ@ƒCƒ‹‘®«‚ð•’Ê‚É’u‚«’¼‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:137
-#: Src/wptFileManager.cpp:172
+#: Src/wptFileManager.cpp:169
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
"them anyway and this costs a lot of time.\n"
@@ -1358,7 +1358,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:179
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
# c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1044
+#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:1044
#: Src/wptVerifyList.cpp:108
msgid "Status"
msgstr "ó‹µ"
@@ -1367,24 +1367,24 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:919
# c:\oss\winpt\src\wptKeyRevokersDlg.cpp:43
# c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
-#: Src/wptFileManager.cpp:385 Src/wptKeyEditDlgs.cpp:1147
+#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1147
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:107
msgid "Name"
msgstr "–¼‘O"
# c:\oss\winpt\src\wptFileManager.cpp:181
-#: Src/wptFileManager.cpp:386
+#: Src/wptFileManager.cpp:383
msgid "Operation"
msgstr "‘€ì"
# c:\oss\winpt\src\wptFileManager.cpp:503
-#: Src/wptFileManager.cpp:670
+#: Src/wptFileManager.cpp:666
msgid "Please select a file."
msgstr "ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptFileManager.cpp:816
+#: Src/wptFileManager.cpp:813
#, c-format
msgid ""
"\"%s\" does not seems to be a text file.\n"
@@ -1394,25 +1394,25 @@
"‚±‚ê‚ð–{“–‚É'clearsign'‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptFileManager.cpp:704
-#: Src/wptFileManager.cpp:930
+#: Src/wptFileManager.cpp:928
#, c-format
msgid "\"%s\" does not exist"
msgstr "%s ‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:779
# c:\oss\winpt\src\wptFileStatDlg.cpp:225
-#: Src/wptFileManager.cpp:1013 Src/wptFileStatDlg.cpp:274
+#: Src/wptFileManager.cpp:1011 Src/wptFileStatDlg.cpp:274
#: Src/wptFileStatDlg.cpp:281
msgid "File Status"
msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:825
-#: Src/wptFileManager.cpp:1057
+#: Src/wptFileManager.cpp:1055
msgid "Enter filename for encrypted file"
msgstr "ˆÃ†‰»‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:837
-#: Src/wptFileManager.cpp:1086
+#: Src/wptFileManager.cpp:1084
msgid "Could not get default secret key."
msgstr "‹K’è”é–§Œ®‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1421,8 +1421,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:296
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
-#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1442
-#: Src/wptFileManagerDlg.cpp:555 Src/wptMainProc.cpp:200
+#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1446
+#: Src/wptFileManagerDlg.cpp:556 Src/wptMainProc.cpp:200
#: Src/wptMainProc.cpp:422 Src/wptMainProc.cpp:429
msgid "Sign"
msgstr "–¼"
@@ -1430,7 +1430,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:868
# c:\oss\winpt\src\wptFileManagerDlg.cpp:401
# c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
-#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:553
+#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:554
#: Src/wptMainProc.cpp:421 Src/wptMainProc.cpp:426
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1439,28 +1439,28 @@
# c:\oss\winpt\src\wptFileManager.cpp:914
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
-#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1190
-#: Src/wptFileManager.cpp:1195 Src/wptMainProc.cpp:420
+#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1188
+#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:420
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
# c:\oss\winpt\src\wptFileManager.cpp:919
-#: Src/wptFileManager.cpp:1195
+#: Src/wptFileManager.cpp:1193
msgid "Encryption failed."
msgstr "ˆÃ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "Good signature"
msgstr "—LŒø‚È–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptFileManager.cpp:1222
+#: Src/wptFileManager.cpp:1220
msgid "BAD signature"
msgstr "ˆ«‚¢–¼"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptFileManager.cpp:1230
+#: Src/wptFileManager.cpp:1233
#, c-format
msgid ""
"Signature made %s using %s key ID %s\n"
@@ -1470,30 +1470,30 @@
"%s ‚©‚ç \"%s\"‚Å‚·B"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptFileManager.cpp:1235
+#: Src/wptFileManager.cpp:1238
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1311
+#: Src/wptFileManager.cpp:1315
msgid "Choose Filename for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:980
-#: Src/wptFileManager.cpp:1320
+#: Src/wptFileManager.cpp:1324
msgid "Please enter filename for plaintext file"
msgstr "ƒvƒŒ[ƒ“ƒeƒLƒX—p‚̃gƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1006
# c:\oss\winpt\src\wptFileManager.cpp:1011
# c:\oss\winpt\src\wptFileManagerDlg.cpp:402
-#: Src/wptFileManager.cpp:1358 Src/wptFileManager.cpp:1370
-#: Src/wptFileManagerDlg.cpp:554
+#: Src/wptFileManager.cpp:1362 Src/wptFileManager.cpp:1374
+#: Src/wptFileManagerDlg.cpp:555
msgid "Decrypt"
msgstr "•œ†"
# c:\oss\winpt\src\wptErrors.cpp:71
-#: Src/wptFileManager.cpp:1364
+#: Src/wptFileManager.cpp:1368
#, c-format
msgid ""
"Decryption failed.\n"
@@ -1502,7 +1502,7 @@
"•œ†‚ªŽ¸”s‚µ‚Ü‚µ‚½B\n"
"%s: ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ü‚¹‚ñB"
-#: Src/wptFileManager.cpp:1371
+#: Src/wptFileManager.cpp:1375
#, c-format
msgid ""
"The original file name is '%s'.\n"
@@ -1511,32 +1511,32 @@
msgstr ""
# c:\oss\winpt\src\wptFileManager.cpp:1068
-#: Src/wptFileManager.cpp:1419
+#: Src/wptFileManager.cpp:1423
msgid "Enter filename for signed file"
msgstr "–¼‚µ‚½ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1165
-#: Src/wptFileManager.cpp:1523
+#: Src/wptFileManager.cpp:1527
msgid "Could not find detached signature in the clipboard."
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ÉŽæ‚èo‚µ‚½–¼‚ðŒ©‚Â‚¯‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManager.cpp:1184
-#: Src/wptFileManager.cpp:1543
+#: Src/wptFileManager.cpp:1547
msgid "No files to check."
msgstr "ƒ`ƒFƒbƒN‚·‚éƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1560
+#: Src/wptFileManager.cpp:1564
msgid "Select Data File"
msgstr "ƒf[ƒ^ƒtƒ@ƒCƒ‹‚ð‘I‚Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1212
-#: Src/wptFileManager.cpp:1562
+#: Src/wptFileManager.cpp:1566
msgid "Selected Output File"
msgstr "‘I‘ð‚µ‚½o—̓tƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManager.cpp:1218
-#: Src/wptFileManager.cpp:1590
+#: Src/wptFileManager.cpp:1594
msgid "Invalid file name. Exit"
msgstr "–³Œø‚ȃtƒ@ƒCƒ‹–¼BI—¹"
@@ -1551,7 +1551,7 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1699
+#: Src/wptFileManager.cpp:1692 Src/wptFileManager.cpp:1703
#: Src/wptFileManagerDlg.cpp:244 Src/wptImportList.cpp:413
#: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
#: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
@@ -1562,7 +1562,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1285
# c:\oss\winpt\src\wptKeyManager.cpp:513
-#: Src/wptFileManager.cpp:1696
+#: Src/wptFileManager.cpp:1700
msgid ""
"Key without a self signature was dectected!\n"
"(This key is NOT usable for encryption, etc)\n"
@@ -1578,7 +1578,7 @@
# c:\oss\winpt\src\wptKeyManager.cpp:262
# c:\oss\winpt\src\wptKeyManager.cpp:294
# c:\oss\winpt\src\wptKeyManager.cpp:340
-#: Src/wptFileManager.cpp:1722 Src/wptKeyManager.cpp:251
+#: Src/wptFileManager.cpp:1726 Src/wptKeyManager.cpp:251
#: Src/wptKeyManager.cpp:294 Src/wptKeyManager.cpp:329
msgid "No key was selected for export."
msgstr "ƒGƒLƒXƒ|[ƒg‚·‚邽‚߂̃L[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
@@ -1586,7 +1586,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptFileManager.cpp:1722 Src/wptFileManager.cpp:1745
+#: Src/wptFileManager.cpp:1726 Src/wptFileManager.cpp:1749
#: Src/wptKeyserverDlg.cpp:89
msgid "Export"
msgstr "ƒGƒLƒXƒ|[ƒg"
@@ -1594,7 +1594,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1730 Src/wptKeyManagerDlg.cpp:1713
+#: Src/wptFileManager.cpp:1734 Src/wptKeyManagerDlg.cpp:1713
#: Src/wptKeyManagerDlg.cpp:1747
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1604,51 +1604,51 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1113
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1177
# c:\oss\winpt\src\wptKeyserverDlg.cpp:90
-#: Src/wptFileManager.cpp:1749 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptFileManager.cpp:1753 Src/wptKeyEditDlgs.cpp:1023
#: Src/wptKeyEditDlgs.cpp:1322 Src/wptKeyEditDlgs.cpp:1396
#: Src/wptKeyserverDlg.cpp:101
msgid "GnuPG status"
msgstr "GnuPG‚Ìó‘Ô"
# c:\oss\winpt\src\wptFileManager.cpp:1339
-#: Src/wptFileManager.cpp:1749
+#: Src/wptFileManager.cpp:1753
#, c-format
msgid "Finished (Output: %s)"
msgstr "I—¹‚µ‚Ü‚µ‚½ (o—Í: %s)"
# c:\oss\winpt\src\wptFileManager.cpp:1381
-#: Src/wptFileManager.cpp:1796
+#: Src/wptFileManager.cpp:1799
#, c-format
msgid "%s: no valid OpenPGP data found."
msgstr "%s: —LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: Src/wptFileManager.cpp:1855
+#: Src/wptFileManager.cpp:1859
msgid "Encrypting into a ZIP archive makes sense with multiple files"
msgstr "‘½”‚̃tƒ@ƒCƒ‹‚ðZipƒA[ƒJƒCƒu‚ɈƉ»‚·‚邱‚Æ‚ª—Ç‚¢‚±‚Æ‚Å‚·B"
# c:\oss\winpt\src\wptFileManager.cpp:963
-#: Src/wptFileManager.cpp:1860
+#: Src/wptFileManager.cpp:1864
msgid "Choose File Name for Output"
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1929
+#: Src/wptFileManager.cpp:1934
msgid "Choose a Name for the Archive"
msgstr "ƒA[ƒJƒCƒu‚É–¼‘O‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
-#: Src/wptFileManager.cpp:1932
+#: Src/wptFileManager.cpp:1937
msgid "Invalid archive name. Exit."
msgstr "–³Œø‚ȃA[ƒJƒCƒu–¼BI—¹B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1932 Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1937 Src/wptFileManager.cpp:1944
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1939
+#: Src/wptFileManager.cpp:1944
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1777,7 +1777,7 @@
#: Src/wptKeyManagerDlg.cpp:1514 Src/wptKeyManagerDlg.cpp:1548
#: Src/wptKeyManagerDlg.cpp:1567 Src/wptKeyManagerDlg.cpp:1587
#: Src/wptKeyManagerDlg.cpp:1703 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:118
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1821,7 +1821,7 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
# c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:552
+#: Src/wptFileManagerDlg.cpp:478 Src/wptFileManagerDlg.cpp:553
msgid "Encrypt into ZIP"
msgstr "ZIP‚ɈƉ»‚·‚é"
@@ -1840,7 +1840,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:358
# c:\oss\winpt\src\wptFileManagerDlg.cpp:404
# c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
-#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:556
+#: Src/wptFileManagerDlg.cpp:481 Src/wptFileManagerDlg.cpp:557
#: Src/wptMainProc.cpp:423 Src/wptMainProc.cpp:427
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1913,7 +1913,7 @@
msgid "&Preferences"
msgstr "ƒJƒXƒ^ƒ€Ý’è(&P)"
-#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:559
+#: Src/wptFileManagerDlg.cpp:492 Src/wptFileManagerDlg.cpp:560
msgid "Send as Mail"
msgstr "ƒ[ƒ‹‚Æ‚µ‚Ä‘—M‚·‚é"
@@ -1928,44 +1928,44 @@
msgstr "íœ(&W)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:406
-#: Src/wptFileManagerDlg.cpp:558
+#: Src/wptFileManagerDlg.cpp:559
msgid "Wipe"
msgstr "Žæ‚èÁ‚µ"
-#: Src/wptFileManagerDlg.cpp:560
+#: Src/wptFileManagerDlg.cpp:561
msgid "List Packets"
msgstr "ƒpƒPƒbƒg‚ðƒŠƒXƒg‚·‚é"
# c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptFileManagerDlg.cpp:606
+#: Src/wptFileManagerDlg.cpp:607
msgid "&Calc Digest"
msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:761
+#: Src/wptFileManagerDlg.cpp:762
msgid "Are you sure you want to secure delete these files?"
msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘S휂µ‚Ü‚·‚©Hn"
-#: Src/wptFileManagerDlg.cpp:762 Src/wptMainProc.cpp:100
+#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:100
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:763 Src/wptMainProc.cpp:101
+#: Src/wptFileManagerDlg.cpp:764 Src/wptMainProc.cpp:101
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:806
+#: Src/wptFileManagerDlg.cpp:807
msgid "Operation Status: Error"
msgstr "‘€ìó‹µFƒGƒ‰["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:807
+#: Src/wptFileManagerDlg.cpp:808
msgid "Operation Status: Done."
msgstr "‘€ìó‹µFŠ®—¹B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:850
+#: Src/wptFileManagerDlg.cpp:851
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -2030,7 +2030,7 @@
msgstr "WinPTʼn‚̃Xƒ^[ƒg"
# c:\oss\winpt\src\wptGPG.cpp:734
-#: Src/wptGPG.cpp:838
+#: Src/wptGPG.cpp:840
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -2041,23 +2041,23 @@
"‚±‚Ì‘®«‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:737
-#: Src/wptGPG.cpp:841
+#: Src/wptGPG.cpp:843
msgid "GPG Information"
msgstr "GPGƒCƒ“ƒtƒH"
# c:\oss\winpt\src\wptGPG.cpp:741
-#: Src/wptGPG.cpp:845
+#: Src/wptGPG.cpp:847
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:846 Src/wptGPG.cpp:1125 Src/wptGPG.cpp:1134
+#: Src/wptGPG.cpp:848 Src/wptGPG.cpp:1127 Src/wptGPG.cpp:1136
msgid "GPG Error"
msgstr "GPGƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:757
-#: Src/wptGPG.cpp:858
+#: Src/wptGPG.cpp:860
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -2072,7 +2072,7 @@
"ƒvƒƒOƒ‰ƒ€‚ª‚»‚ê‚ðŠJ‚¢‚½‚½‚ß‚Æl‚¦‚ç‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptGPG.cpp:762
-#: Src/wptGPG.cpp:863
+#: Src/wptGPG.cpp:865
msgid "GPG Warning"
msgstr "GPGŒx"
@@ -2096,7 +2096,7 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:216 Src/wptGPGPrefsDlg.cpp:222
+#: Src/wptGPG.cpp:889 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
@@ -2109,7 +2109,7 @@
msgstr "ƒJƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptGPG.cpp:888
+#: Src/wptGPG.cpp:890
#, c-format
msgid ""
"%s does not exit.\n"
@@ -2119,47 +2119,47 @@
"‚±‚̃fƒBƒŒƒNƒgƒŠ[‚ð쬂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:863
-#: Src/wptGPG.cpp:916
+#: Src/wptGPG.cpp:918
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:919 Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:921 Src/wptGPG.cpp:941
msgid "No keyring was chosen. Exit."
msgstr "ƒL[ƒŠƒ“ƒO‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñBI—¹B"
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPG.cpp:925
+#: Src/wptGPG.cpp:927
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:930 Src/wptGPG.cpp:949
+#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:951
msgid "Could not copy file."
msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:883
-#: Src/wptGPG.cpp:936
+#: Src/wptGPG.cpp:938
msgid "Please choose your secret keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:891
-#: Src/wptGPG.cpp:944
+#: Src/wptGPG.cpp:946
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:994 Src/wptGPG.cpp:1084 Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:996 Src/wptGPG.cpp:1086 Src/wptGPG.cpp:1099
msgid "Backup"
msgstr "ƒoƒbƒNƒAƒbƒv"
# c:\oss\winpt\src\wptGPG.cpp:942
-#: Src/wptGPG.cpp:994
+#: Src/wptGPG.cpp:996
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "ˆÈ‰º‚̃oƒbƒNƒAƒbƒvƒL[ƒŠƒ“ƒO‚ª \"%s\" Ž¸”s‚µ‚Ü‚µ‚½B"
-#: Src/wptGPG.cpp:1085
+#: Src/wptGPG.cpp:1087
#, c-format
msgid ""
"The backup drive '%s' does not seems to accessable.\n"
@@ -2169,13 +2169,13 @@
"‘±‚¯‚é‚̂Ƀhƒ‰ƒCƒu‚ð‘}“ü‚Ü‚½‚̓`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:1097
+#: Src/wptGPG.cpp:1099
#, 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:1124
+#: Src/wptGPG.cpp:1126
msgid "No GPG error description available."
msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
@@ -2353,13 +2353,15 @@
msgstr "GPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:306
-msgid "Choose GPG home directory"
+#: Src/wptGPGPrefsDlg.cpp:312
+#, fuzzy
+msgid "Choose GPG Home Directory"
msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
-#: Src/wptGPGPrefsDlg.cpp:332
-msgid "Choose GPG binary"
+#: Src/wptGPGPrefsDlg.cpp:340
+#, fuzzy
+msgid "Choose GPG Binary"
msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð"
# c:\oss\winpt\src\WinPT.cpp:332 c:\oss\winpt\src\wptImagelist.cpp:47
@@ -2457,7 +2459,7 @@
#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1704
#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1727
#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeyManagerDlg.cpp:1821
-#: Src/wptKeyManagerDlg.cpp:1990 Src/wptKeysigDlg.cpp:93
+#: Src/wptKeyManagerDlg.cpp:1996 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:413
#: Src/wptMainProc.cpp:561 Src/wptMainProc.cpp:569
@@ -2847,7 +2849,7 @@
#: Src/wptKeyEditDlgs.cpp:464 Src/wptKeyEditDlgs.cpp:1490
#: Src/wptKeyEditDlgs.cpp:1547 Src/wptKeyEditDlgs.cpp:1592
#: Src/wptKeyEditDlgs.cpp:1734 Src/wptKeyEditDlgs.cpp:1765
-#: Src/wptKeyEditDlgs.cpp:1933
+#: Src/wptKeyEditDlgs.cpp:1935
msgid "Please select a user ID."
msgstr "ƒ†[ƒU[ID‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -3325,7 +3327,7 @@
msgstr ""
# c:\oss\winpt\src\wptKeyManager.cpp:1064
-#: Src/wptKeyEditDlgs.cpp:1937
+#: Src/wptKeyEditDlgs.cpp:1939
#, fuzzy
msgid "Do you really want to make this sig exportable?"
msgstr ""
@@ -3334,32 +3336,32 @@
"%s"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1961 Src/wptKeysignDlg.cpp:395
+#: Src/wptKeyEditDlgs.cpp:1963 Src/wptKeysignDlg.cpp:395
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1525
-#: Src/wptKeyEditDlgs.cpp:2019
+#: Src/wptKeyEditDlgs.cpp:2021
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:2032
+#: Src/wptKeyEditDlgs.cpp:2034
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:2041
+#: Src/wptKeyEditDlgs.cpp:2043
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1561
-#: Src/wptKeyEditDlgs.cpp:2073
+#: Src/wptKeyEditDlgs.cpp:2075
msgid "Please select a command."
msgstr "ƒRƒ}ƒ“ƒh‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1566
-#: Src/wptKeyEditDlgs.cpp:2077
+#: Src/wptKeyEditDlgs.cpp:2079
msgid "This command cannot be used with PGP 2 (v3) keys.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚Í PGP 2 (v3) ‚̃L[‚ÆŽg‚¦‚Ü‚¹‚ñB\n"
@@ -3771,7 +3773,7 @@
msgstr "–³Œø‚ȃ†[ƒU[ID"
# c:\oss\winpt\src\wptKeylist.cpp:745
-#: Src/wptKeylist.cpp:1005
+#: Src/wptKeylist.cpp:1006
#, c-format
msgid ""
"It is NOT certain that the key belongs to the person\n"
@@ -3787,12 +3789,12 @@
"‚Ç‚¤‚¹‚±‚ê‚ð \"%s\" Žg—p‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:753 c:\oss\winpt\src\wptKeylist.cpp:820
-#: Src/wptKeylist.cpp:1013 Src/wptKeylist.cpp:1076
+#: Src/wptKeylist.cpp:1014 Src/wptKeylist.cpp:1078
msgid "Recipients"
msgstr "ŽóMŽÒ"
# c:\oss\winpt\src\wptKeylist.cpp:819
-#: Src/wptKeylist.cpp:1077
+#: Src/wptKeylist.cpp:1079
#, c-format
msgid ""
"KeyID %s.\n"
@@ -3802,7 +3804,7 @@
"–{“–‚É–³Œø‚ȃL[‚ðƒGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeylist.cpp:1179
+#: Src/wptKeylist.cpp:1181
msgid "Secret Key List"
msgstr "”é–§Œ®‚̈ꗗ‚Ђ傤"
@@ -4966,7 +4968,7 @@
msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:155
+#: Src/wptKeyserverSearchDlg.cpp:88 Src/wptKeyserverSearchDlg.cpp:118
msgid "Keyserver Search"
msgstr "ƒL[ƒT[ƒo[ŒŸõ"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/ChangeLog 2006-04-10 07:38:06 UTC (rev 197)
@@ -1,3 +1,34 @@
+2006-04-09 Timo Schulz <ts at g10code.de>
+
+ * wptGPGPrefsDlg.cpp (gpgprefs_dlg_proc): Only return true
+ if the homedir value was changed.
+ * wptGPG.cpp (default_key_from_cache): Only return secret key
+ if public part is available.
+ (set_gnupg_default_key): Fix NULL problem.
+ * wptKeyEditDlgs.cpp (do_editkey_clean): Set update flag.
+ * wptFileCBS.cpp (write_cb, read_cb): Better error handling.
+ * wptFileManagerDlg.cpp (file_manager_dlg_proc): Handle
+ 'always-on-top' correctly.
+ * wptKeylist.cpp (keylist_get_recipients): Allocate enough
+ mem to hold all possible keys.
+ (keylist_enum_keys): Likewise.
+
+2006-04-08 Timo Schulz <ts at g10code.de>
+
+ * wptKeylist.cpp (keylist_get_recipients): Always use utf8 output.
+ * wptKeyserver.cpp (kserver_connect): Fixed proxy support.
+ * wptKeyserverSearchDlg.cpp (fetch_keys): New.
+ * WinPT.cpp (WinMain): if the default key was not found, reset
+ the gpg.conf entry.
+ * wptFileManager.cpp (fm_encrypt_into_zip): Use correct output
+ file name.
+ (show_verify_result): Always use utf8 output.
+ (get_output_file): Case in-sentensive comparison.
+ (fm_assume_onepass_sig): Fixed temp file handling.
+ * wptClipEncryptDlg.cpp (show_invalid_recipients): Fix utf8
+ output.
+ * wptKeyManagerDlg.cpp (keymanager_dlg_proc): Fix possible segv.
+
2006-04-07 Timo Schulz <ts at g10code.de>
* wptW32API.cpp (set_clip_text): Change code so it also
Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/WinPT.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -746,10 +746,7 @@
_("Default key (from the GPG config file) could not be found.\n"
"Please check your gpg.conf or set a new default key to correct it:\n\n"
"%s: public key not found."), p? p : "[null]");
- free_if_alloc (p);
- DestroyWindow (hwnd);
- free_gnupg_table ();
- return 0;
+ set_gnupg_default_key (NULL);
}
if (count_insecure_elgkeys ())
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_ELGWARN, glob_hwnd,
Modified: trunk/Src/wptClipEncryptDlg.cpp
===================================================================
--- trunk/Src/wptClipEncryptDlg.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptClipEncryptDlg.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -18,6 +18,7 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -37,6 +38,7 @@
#include "wptContext.h" /* for passphrase_s */
#include "wptRegistry.h"
#include "wptDlgs.h"
+#include "wptUTF8.h"
/* Encrypt the contents of the clipboard with the keys in @rset.
@@ -63,7 +65,7 @@
goto leave;
err = gpgme_data_new (&ciph);
if (err)
- goto leave;
+ goto leave;
err = gpgme_op_encrypt (ctx, rset,
always_trust?GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
plain, ciph);
@@ -93,7 +95,7 @@
gpgme_invalid_key_t k;
gpgme_key_t key;
size_t len=0;
- char *p;
+ char *uid, *p;
if (!ctx)
return -1;
@@ -102,7 +104,8 @@
return -1;
for (k=res->invalid_recipients; k; k = k->next) {
- get_pubkey (k->fpr, &key);
+ if (get_pubkey (k->fpr, &key))
+ continue;
len += (32 + 16 + strlen (key->uids->name) + 2) + 4;
}
@@ -111,11 +114,14 @@
BUG (NULL);
strcpy (p, _("Recipients unsuable for encryption:\n"));
for (k = res->invalid_recipients; k; k = k->next) {
- get_pubkey (k->fpr, &key);
+ if (get_pubkey (k->fpr, &key))
+ continue;
+ uid = utf8_to_native (key->uids->name);
strcat (p, key->subkeys->keyid+8);
strcat (p, " : ");
- strcat (p, key->uids->name);
+ strcat (p, uid);
strcat (p, "\n");
+ safe_free (uid);
}
msg_box (dlg, p, _("Encryption"), MB_ERR);
free (p);
@@ -135,18 +141,18 @@
int force_trust = 0;
int n;
- switch( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
SetWindowText (dlg, _("Encryption"));
SetDlgItemText (dlg, IDC_ENCRYPT_FNDCMD, _("&Find"));
SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
- kc = keycache_get_ctx( KEYCACHE_PUB );
- if( !kc )
- BUG( NULL );
- lv = keylist_load (GetDlgItem( dlg, IDC_ENCRYPT_KEYLIST ), kc, NULL,
+ kc = keycache_get_ctx (KEYCACHE_PUB);
+ if (!kc)
+ BUG (NULL);
+ lv = keylist_load (GetDlgItem (dlg, IDC_ENCRYPT_KEYLIST), kc, NULL,
KEYLIST_ENCRYPT_MIN, KEY_SORT_USERID);
- center_window( dlg, NULL );
- SetForegroundWindow( dlg );
+ center_window (dlg, NULL);
+ SetForegroundWindow (dlg);
return TRUE;
case WM_DESTROY:
@@ -189,8 +195,9 @@
case IDOK:
rset = keylist_get_recipients (lv, &force_trust, &n);
if (!n) {
- msg_box (dlg, _("You must select at least one key."), _("Encryption"), MB_ERR);
- free (rset);
+ msg_box (dlg, _("You must select at least one key."),
+ _("Encryption"), MB_ERR);
+ safe_free (rset);
return FALSE;
}
err = gpg_clip_encrypt (rset, force_trust, &ctx);
@@ -199,7 +206,7 @@
msg_box (dlg, gpgme_strerror (err), _("Encryption"), MB_ERR);
if (ctx)
gpgme_release (ctx);
- free (rset);
+ safe_free (rset);
return FALSE;
}
else
Modified: trunk/Src/wptFileCBS.cpp
===================================================================
--- trunk/Src/wptFileCBS.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptFileCBS.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -18,6 +18,7 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -46,8 +47,14 @@
struct progress_filter_s *pfx = (struct progress_filter_s *)cb->cb_value;
DWORD nread = 0;
- ReadFile (cb->handle, buffer, size, &nread, NULL);
+ if (cb->error)
+ return -1;
+ if (!ReadFile (cb->handle, buffer, size, &nread, NULL)) {
+ cb->error = (int)GetLastError ();
+ return -1;
+ }
+
/* XXX: there is a sync problem with the progress dialog. */
if (pfx)
progress_callback (pfx, NULL, 0, cb->off, cb->size);
@@ -63,7 +70,8 @@
file_data_t cb = (file_data_t)handle;
DWORD nwritten;
- /* XXX: check if fd == INVALID_HANDLE_VALUE. */
+ if (cb->error)
+ return -1;
if (!cb->handle) {
SECURITY_ATTRIBUTES sec_attr;
@@ -73,9 +81,16 @@
sec_attr.nLength = sizeof (sec_attr);
cb->handle = CreateFile (cb->name, GENERIC_WRITE, FILE_SHARE_WRITE,
&sec_attr, CREATE_ALWAYS, 0, NULL);
+ if (cb->handle == INVALID_HANDLE_VALUE) {
+ cb->error = (int)GetLastError ();
+ return -1;
+ }
}
- WriteFile (cb->handle, buffer, size, &nwritten, NULL);
+ if (!WriteFile (cb->handle, buffer, size, &nwritten, NULL)) {
+ cb->error = (int)GetLastError ();
+ return -1;
+ }
return (long)nwritten;
}
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptFileManager.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -18,9 +18,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* TODO:
- * check_armor_type: we should check the whole file and not only the first line!
- */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -602,32 +599,34 @@
else {
char *p = make_filename (path, name, NULL);
rc = add_single_file (lv, p);
- free (p);
+ safe_free (p);
}
n++;
}
if (n == 1) /* single file selected. */
rc = add_single_file (lv, path);
- if (path)
- free (path);
+ safe_free (path);
return rc;
}
int
fm_assume_onepass_sig (const char * fname)
-{
- gpgme_data_t dat;
+{
armor_filter_context_t afx;
gpg_iobuf_t fp;
- PACKET * pkt = (PACKET *)calloc (1, sizeof *pkt);
+ gpgme_data_t dat;
+ PACKET *pkt;
+ char tmpfile[MAX_PATH+1];
int check = 0;
+ pkt = (PACKET *)calloc (1, sizeof *pkt);
if (!fname) {
+ get_temp_name (tmpfile, sizeof (tmpfile)-1, "gpgme.tmp");
gpg_data_new_from_clipboard (&dat, 0);
- gpg_data_release_and_set_file (dat, "gpgme.tmp");
+ gpg_data_release_and_set_file (dat, tmpfile);
- fp = gpg_iobuf_open ("gpgme.tmp");
+ fp = gpg_iobuf_open (tmpfile);
if (!fp)
return 0;
gpg_iobuf_ioctl (fp, 3, 1, NULL);
@@ -640,11 +639,11 @@
&& pkt->pkttype == PKT_COMPRESSED)
check = 1;
gpg_free_packet (pkt);
- safe_free (pkt);
gpg_iobuf_close (fp);
- remove ("gpgme.tmp");
+ remove (tmpfile);
}
/* XXX: implement it for real files */
+ safe_free (pkt);
return check;
}
@@ -657,34 +656,32 @@
items = listview_count_items (lv, 0);
if (!items)
return -1;
- else if (items == 1)
- {
+ else if (items == 1) {
listview_select_one (lv, 0);
return 0;
}
- else if (items > 1)
- {
+ else if (items > 1) {
i = listview_get_curr_pos (lv);
- if (i == -1)
- {
- msg_box (lv->ctrl, _("Please select a file."), _("File Manager"), MB_ERR);
+ if (i == -1) {
+ msg_box (lv->ctrl, _("Please select a file."),
+ _("File Manager"), MB_ERR);
return -1;
}
return i;
}
return -1;
-} /* fm_get_current_pos */
+}
static int
-fm_check_detached_sig( listview_ctrl_t lv, int pos )
+fm_check_detached_sig (listview_ctrl_t lv, int pos)
{
char type[128];
- listview_get_item_text( lv, pos, 0, type, 127 );
- return !strcmp( type, "SIGNED-DETACH" )? 1 : 0;
-} /* fm_check_detached_sig */
+ listview_get_item_text (lv, pos, 0, type, sizeof (type)-1);
+ return !strcmp (type, "SIGNED-DETACH")? 1 : 0;
+}
int
@@ -741,7 +738,7 @@
}
return rc;
-} /* fm_check_file_type */
+}
/* Set the file status of the given command @fm_cmd.
@@ -812,7 +809,7 @@
if (!cnt)
return 0;
n = -1;
- i = log_box (_("File Manager"), MB_WARN|MB_YESNO,
+ i = log_box (_("File Manager"), MB_WARN|MB_YESNO,
_("\"%s\" does not seems to be a text file.\n"
"Do you really want to clearsign it?"), name);
if (i == IDYES)
@@ -820,6 +817,7 @@
return n;
}
+
int
fm_parse_files (listview_ctrl_t lv, HWND dlg, int cmd)
{
@@ -1213,26 +1211,32 @@
gpgme_key_t key=NULL;
gpgme_signature_t sig=sigres->signatures;
const char *s, *keyid;
+ char *uid;
+ char buf[384];
int sigok = 0;
- int type;
- char buf[384];
sig = sigres->signatures;
sigok = sig->summary & GPGME_SIGSUM_GREEN;
s = sigok? _("Good signature") : _("BAD signature");
- type = sigok? MB_OK: MB_ICONWARNING|MB_OK;
keyid = sig->fpr;
if (!keyid)
return;
keyid = strlen (sig->fpr) == 40? sig->fpr+32 : sig->fpr + 24;
get_pubkey (sig->fpr, &key);
+
+ if (key)
+ uid = utf8_to_native (key->uids->uid);
+ else
+ uid = strdup (_("user ID not found"));
+
_snprintf (buf, sizeof (buf)-1, _("Signature made %s using %s key ID %s\n"
"%s from \"%s\""),
strtimestamp (sig->timestamp),
get_key_pubalgo (sig->pubkey_algo),
- keyid, s, key? key->uids->uid : _("user ID not found"));
- msg_box (NULL, buf, _("Decrypt Verify"), type);
+ keyid, s, uid);
+ msg_box (NULL, buf, _("Decrypt Verify"), sigok? MB_OK: MB_ICONWARNING|MB_OK);
+ safe_free (uid);
}
@@ -1259,7 +1263,7 @@
/* If the decrypt result contains the original file name,
we use it instead of the artificial "output - .gpg" string. */
static int
-restore_original_name (const char *output, const char *plaintext_filename)
+restore_original_name (const char *output, const char *file_name)
{
char *dir;
char *orig;
@@ -1267,14 +1271,14 @@
dir = strrchr (output, '\\');
if (!dir)
- orig = strdup (plaintext_filename);
+ orig = strdup (file_name);
else {
- orig = (char*)calloc (1, strlen (plaintext_filename)+ 1 +
+ orig = (char*)calloc (1, strlen (file_name)+ 1 +
strlen (output)+1);
if (!orig)
BUG (0);
memcpy (orig, output, (dir-output)+1);
- strcat (orig, plaintext_filename);
+ strcat (orig, file_name);
}
if (overwrite_file (orig)) {
DeleteFile (orig);
@@ -1561,9 +1565,9 @@
else
title = _("Selected Output File");
- if (strstr (name, ".sig")
- || strstr (name, ".asc")
- || strstr (name, ".gpg")) {
+ if (stristr (name, ".sig") ||
+ stristr (name, ".asc") ||
+ stristr (name, ".gpg")) {
_snprintf (fname, sizeof (fname) - 1, "%s", name);
fname[strlen (fname) - 4] = '\0';
if (file_exist_check (fname) == 0 && detached)
@@ -1593,7 +1597,7 @@
if (detached)
c->sigmode = GPGME_SIG_MODE_DETACH;
else {
- if (strstr (name, ".asc"))
+ if (stristr (name, ".asc"))
c->sigmode = GPGME_SIG_MODE_CLEAR;
else
c->sigmode = GPGME_SIG_MODE_NORMAL;
@@ -1615,7 +1619,7 @@
file_data_t in=NULL, out=NULL;
int rc = 0;
- if (strstr (name, ".sig"))
+ if (stristr (name, ".sig"))
detached = 1;
if (get_output_file (c, name, detached))
@@ -1709,14 +1713,14 @@
/* Export the selected keys from the File Manager to a file. */
int
fm_export (fm_state_t c)
-{
- int rc = 0;
+{
gpgme_ctx_t ctx = c->ctx;
gpgme_error_t err;
gpgme_key_t *rset = c->recp;
file_data_t keydata = NULL;
const char *name;
char *p = NULL, *patt = NULL;
+ int rc = 0;
if (!rset || !rset[0]) {
msg_box (c->dlg, _("No key was selected for export."), _("Export"), MB_ERR);
@@ -1751,8 +1755,7 @@
leave:
if (keydata)
gpg_file_data_release (keydata);
- if (patt)
- free (patt);
+ safe_free (patt);
free_if_alloc (p);
return rc;
}
@@ -1845,12 +1848,13 @@
fm_encrypt_into_zip (fm_state_t ctx, listview_ctrl_t lv)
{
PK_FILE_LIST list=NULL;
- const char *outfile;
+ const char *outfile, *ext;
char *out_enc;
- int nitems = listview_count_items (lv, 0);
+ int nitems;
int i, idx = -1;
int rc;
+ nitems = listview_count_items (lv, 0);
if (!nitems) {
msg_box (NULL, _("Encrypting into a ZIP archive makes sense with multiple files"),
_("File Manager"), MB_ERR);
@@ -1880,7 +1884,8 @@
if (rc)
return rc;
- out_enc = make_filename (NULL, outfile, "gpg");
+ ext = file_get_extension (ctx->ctx, ctx->sigmode)+1;
+ out_enc = make_filename (NULL, outfile, ext);
fm_set_status (lv, idx, FM_ENCRYPT, (gpgme_sig_mode_t)0, 1, out_enc);
free_if_alloc (out_enc);
@@ -1955,7 +1960,7 @@
const char *a = 0;
const char *b = 0;
- switch( (int)sortby ) {
+ switch ((int)sortby) {
case FM_SORT_STAT:
break;
case FM_SORT_NAME:
@@ -1971,7 +1976,7 @@
int
fm_sort (listview_ctrl_t lv, int sortby)
{
- return listview_sort_items( lv, sortby, fm_cmp_cb );
+ return listview_sort_items (lv, sortby, fm_cmp_cb);
}
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptFileManagerDlg.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -508,8 +508,9 @@
SetMenu (dlg, menu);
if (!always_ontop)
set_menu_state (menu, ID_FILEMISC_ONTOP, MFS_UNCHECKED);
+ else
+ center_window2 (dlg, NULL, HWND_TOPMOST);
fm_build (&lv, GetDlgItem (dlg, IDC_FILE_LIST));
- center_window2 (dlg, NULL, HWND_TOPMOST);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
statbar = setup_status_bar (dlg);
Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptGPG.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -200,25 +200,27 @@
Return value: the keyid of the secret key. */
static char *
default_key_from_cache (int *ret_no_useable)
-{
+{
+ gpgme_key_t key, pk;
+ gpg_keycache_t sec, pub;
const char *s;
char *keyid = NULL;
- gpgme_key_t key;
- gpg_keycache_t sec = keycache_get_ctx (0);
+ sec = keycache_get_ctx (0);
if (!sec)
BUG (0);
+ pub = keycache_get_ctx (1);
gpg_keycache_rewind (sec);
while (!gpg_keycache_next_key (sec, 1, &key)) {
- if (key_is_useable (key)) {
+ if (key_is_useable (key) && !get_pubkey (key->subkeys->keyid, &pk)) {
s = key->subkeys->keyid;
if (s)
- keyid = m_strdup (s+8);
+ keyid = m_strdup (s+8);
break;
}
}
if (!keyid)
- *ret_no_useable = 1;
+ *ret_no_useable = 1;
return keyid;
}
@@ -257,7 +259,7 @@
{
gpg_optfile_t opt = NULL;
gpg_option_t e;
- char * keyid = NULL, * optfile = NULL;
+ char *keyid = NULL, *optfile = NULL;
int no_usable=0, rc = 0;
optfile = get_gnupg_cfgfile ();
@@ -268,26 +270,26 @@
free_if_alloc (optfile);
return default_key_from_cache (&no_usable);
}
- e = find_option( opt, "default-key" );
- if ( e )
- keyid = m_strdup( e->val );
- if( !e ) {
- e = find_option( opt, "local-user" );
- if( e )
- keyid = m_strdup( e->val );
+ e = find_option (opt, "default-key");
+ if (e)
+ keyid = m_strdup (e->val);
+ if (!e) {
+ e = find_option (opt, "local-user");
+ if (e)
+ keyid = m_strdup (e->val);
}
- if( !e ) {
- e = find_option( opt, "encrypt-to" );
- if( e )
- keyid = m_strdup( e->val );
+ if (!e) {
+ e = find_option (opt, "encrypt-to");
+ if (e)
+ keyid = m_strdup (e->val);
}
free_if_alloc (optfile);
- release_gpg_options (opt);
+ release_gpg_options (opt);
if (!keyid)
keyid = default_key_from_cache (&no_usable);
return keyid;
-} /* get_gnupg_default_key */
+}
/* Check if GPG4WIN is available and if so, use the
@@ -583,7 +585,7 @@
e->val = m_strdup (key);
e->used = 1;
}
- else
+ else if (key)
add_entry (opt, ENTRY_MULTI, "default-key", key);
rc = commit_gpg_options (optfile, opt);
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -299,15 +299,23 @@
commit_gpg_options (p, opt);
release_gpg_options (opt);
- EndDialog (dlg, TRUE);
+ /* only return TRUE if the home dir has been changed. */
+ if (SendDlgItemMessage (dlg, IDC_GPGPREFS_HOMEDIR, EM_GETMODIFY, 0, 0)) {
+ set_gnupg_default_key (NULL);
+ EndDialog (dlg, TRUE);
+ }
+ else
+ EndDialog (dlg, FALSE);
return TRUE;
case IDC_GPGPREFS_HOMEDLG:
- folder = get_folder_dlg (dlg, _("Choose GPG home directory"), NULL);
+ folder = get_folder_dlg (dlg, _("Choose GPG Home Directory"), NULL);
if (folder) {
char *name;
SetDlgItemText (dlg, IDC_GPGPREFS_HOMEDIR, folder);
+ SendDlgItemMessage (dlg, IDC_GPGPREFS_HOMEDIR,
+ EM_SETMODIFY, (WPARAM)(UINT)TRUE, 0);
if (GetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR,
exedir, DIM (exedir)-1) > 0)
break;
@@ -329,7 +337,7 @@
return TRUE;
case IDC_GPGREFS_EXEDLG:
- s = get_fileopen_dlg (dlg, _("Choose GPG binary"),
+ s = get_fileopen_dlg (dlg, _("Choose GPG Binary"),
"Executable Files (*.exe)\0*.exe\0\0",
NULL);
if (s)
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -1584,7 +1584,7 @@
gpgme_error_t err;
GpgKeyEdit *ke;
int j, id, cancel=0;
- char buf[256], * pass = NULL;
+ char buf[256], *pass = NULL;
if (listview_count_items (lv, 0) == 1)
return TRUE;
@@ -1595,7 +1595,7 @@
listview_get_item_text (lv, j, 2, buf, sizeof buf-1);
id = do_find_userid (k->keyid, buf, NULL, NULL);
if (id == -1)
- BUG (dlg);
+ BUG (0);
if (k->is_protected) {
pass = request_passphrase (_("Key Edit"), 1, &cancel);
if (cancel)
@@ -1897,9 +1897,11 @@
BUG (0);
err = ke->cleanKey ();
if (err)
- msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
- else
+ msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+ else {
msg_box (dlg, _("Finished to compact key."), _("Key Edit"), MB_OK);
+ k->update = 1;
+ }
delete ke;
}
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -1674,8 +1674,8 @@
dlg, gpgprefs_dlg_proc, 0,
_("GnuPG Preferences"), IDS_WINPT_GPGPREFS);
if (rc == TRUE) {
- /* XXX: TRUE should indicate a value changed. */
reload_keycache (kmi);
+ update_default_key_str (kmi->statbar);
}
return TRUE;
@@ -1962,9 +1962,12 @@
key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
if (!key)
BUG (NULL);
+ memset (&k, 0, sizeof (k));
+ strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);
+ k.keyid = k.tmp_keyid;
rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
if (!rc)
- update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
+ update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
/* XXX: switching a key from disabled -> enabled. does not
change the validity field in the KM. */
break;
@@ -1977,9 +1980,12 @@
key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
if (!key)
BUG (NULL);
+ memset (&k, 0, sizeof (k));
+ strncpy (k.tmp_keyid, key->subkeys->keyid+8, 8);
+ k.keyid = k.tmp_keyid;
rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
if (!rc)
- update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
+ update_key (kmi->lv, kmi->lv_idx, k.tmp_keyid, 0);
break;
case ID_KEYCTX_SETDEFKEY:
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptKeylist.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -987,7 +987,7 @@
if (!ka)
BUG (NULL);
- keybuf = (gpgme_key_t*)calloc (n, sizeof (gpgme_key_t));
+ keybuf = (gpgme_key_t*)calloc (n+1, sizeof (gpgme_key_t));
if (!keybuf)
BUG (NULL);
@@ -998,7 +998,8 @@
BUG (0);
if (!key_check_validity (key) &&
!key_array_search (ka, ka_pos, key->subkeys->keyid)) {
- char *warn = new char[512+strlen (key->uids->uid) + 1];
+ char *utf8_uid = utf8_to_native (key->uids->uid);
+ char *warn = new char[512+strlen (utf8_uid) + 1];
if (!warn)
BUG (0);
sprintf (warn,
@@ -1006,7 +1007,7 @@
"named in the user ID. If you *really* know what you are\n"
"doing, you may answer the next question with yes\n"
"\n"
- "Use \"%s\" anyway?"), key->uids->uid);
+ "Use \"%s\" anyway?"), utf8_uid);
if (reg_prefs.always_trust)
rc = IDYES;
else
@@ -1018,6 +1019,7 @@
strcpy (ka[ka_pos++].keyid, key->subkeys->keyid);
count++;
}
+ safe_free (utf8_uid);
free_if_alloc (warn);
}
else {
@@ -1061,7 +1063,7 @@
n = listview_count_items (lv, 0);
if (!n)
return 0;
- rset = (gpgme_key_t*)calloc (n, sizeof (gpgme_key_t));
+ rset = (gpgme_key_t*)calloc (n+1, sizeof (gpgme_key_t));
if (!rset)
BUG (NULL);
for (i = 0; i < n; i++) {
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptKeyserver.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -660,12 +660,12 @@
Return value: 0 on success */
int
kserver_connect (const char *hostname, WORD port, int *conn_fd)
-{
- int rc, fd;
- DWORD iaddr;
- char host[128] = {0};
+{
struct hostent *hp;
struct sockaddr_in sock;
+ char host[128] = {0};
+ DWORD iaddr;
+ int rc, fd;
log_debug ("kserver_connect: %s:%d\r\n", hostname, port);
@@ -675,14 +675,16 @@
*conn_fd = 0;
hostname = skip_type_prefix (hostname);
+ if (proxy.host && proxy.proto == PROXY_PROTO_HTTP)
+ port = proxy.port;
memset (&sock, 0, sizeof (sock));
sock.sin_family = AF_INET;
- sock.sin_port = proxy.host? htons (proxy.port) : htons (port);
+ sock.sin_port = htons (port);
if (proxy.host)
strncpy (host, proxy.host, 127);
else
strncpy (host, hostname, 127);
-
+
if ((iaddr = inet_addr (host)) != INADDR_NONE)
memcpy (&sock.sin_addr, &iaddr, sizeof (iaddr));
else if ((hp = gethostbyname (host))) {
Modified: trunk/Src/wptKeyserverSearchDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverSearchDlg.cpp 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/Src/wptKeyserverSearchDlg.cpp 2006-04-10 07:38:06 UTC (rev 197)
@@ -105,15 +105,41 @@
}
+/* Fetch all selected keys from the keyserver in @ksc. */
+static void
+fetch_keys (HWND dlg, listview_ctrl_t lv, keyserver_ctx *ksc)
+{
+ char keyid[32];
+ char *fpr;
+ int n, rc = 0;
+
+ n = listview_count_items (lv, 1);
+ if (!n) {
+ msg_box (dlg, _("Please select a key."), _("Keyserver Search"), MB_ERR);
+ return;
+ }
+
+ for (n=0; n < listview_count_items (lv, 0); n++) {
+ if (!listview_get_item_state (lv, n))
+ continue;
+
+ listview_get_item_text (lv, n, KSS_COL_KEYID, keyid, sizeof (keyid)-1);
+ rc = hkp_recv_key2 (dlg, ksc->name, ksc->port, keyid, 0, &fpr);
+ if (!rc && fpr != NULL) {
+ keycache_update (0, fpr);
+ free_if_alloc (fpr);
+ }
+ }
+}
+
+
/* Dialog box procedure for keyserver searching. */
BOOL CALLBACK
hkpsearch_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
static listview_ctrl_t lv = NULL;
static keyserver_ctx *ksc;
- char *fpr = NULL, t[32];
- int pos;
- int rc;
+ int rc = 0;
switch (msg) {
case WM_INITDIALOG:
@@ -151,16 +177,7 @@
return FALSE;
case IDC_HKPSEARCH_RECV:
- if ((pos = listview_get_curr_pos (lv)) == -1) {
- msg_box (dlg, _("Please select a key."), _("Keyserver Search"), MB_ERR);
- return FALSE;
- }
- listview_get_item_text (lv, pos, 1, t, sizeof (t) -1);
- rc = hkp_recv_key2 (dlg, ksc->name, ksc->port, t, 0, &fpr);
- if (!rc && fpr != NULL) {
- keycache_update (0, fpr);
- free_if_alloc (fpr);
- }
+ fetch_keys (dlg, lv, ksc);
return TRUE;
}
break;
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/THANKS 2006-04-10 07:38:06 UTC (rev 197)
@@ -28,6 +28,7 @@
Davar Pishva
David Marsh
David Shaw dshaw at jabberwockey.com
+David Vallier timemaster at sillydog.org
Dugan Chen
Ed Suominen ed at eepatents.com
Emanuel de Jesus ejesus at bigfoot.com
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-04-07 10:47:37 UTC (rev 196)
+++ trunk/configure.ac 2006-04-10 07:38:06 UTC (rev 197)
@@ -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.11rc1, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.11, 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