[Winpt-commits] r178 - in trunk: . Po Src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Feb 21 13:12:25 CET 2006


Author: twoaday
Date: 2006-02-21 13:12:23 +0100 (Tue, 21 Feb 2006)
New Revision: 178

Modified:
   trunk/Po/de.po
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/wptFileManagerDlg.cpp
   trunk/Src/wptFileStatDlg.cpp
   trunk/Src/wptKeysignDlg.cpp
   trunk/configure.ac
Log:
2006-02-15  Timo Schulz  <ts at g10code.de>
 
        * wptKeysignDlg.cpp (keysign_dlg_proc): Localize new checkbox.
        * wptFileStatDlg.cpp (get_s2k_algo): New.
        * wptFileManagerDlg.cpp (update_status_bar): Use human readable
        formats.



Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Po/de.po	2006-02-21 12:12:23 UTC (rev 178)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 0.11.6\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-02-09 15:39+0100\n"
+"POT-Creation-Date: 2006-02-14 18:38+0100\n"
 "PO-Revision-Date: 2005-12-28 16:10+0100\n"
 "Last-Translator: Timo Schulz <ts at g10code.de>\n"
 "Language-Team: DE <twoaday at freakmail.de>\n"
@@ -132,7 +132,7 @@
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
 #: Src/WinPT.cpp:565 Src/wptFileManagerDlg.cpp:488
-#: Src/wptFileManagerDlg.cpp:802
+#: Src/wptFileManagerDlg.cpp:803
 msgid "Wipe Free Space"
 msgstr "Freien Speicher Löschen"
 
@@ -232,7 +232,7 @@
 msgstr "Über &GPG"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1981
+#: Src/wptAboutDlgs.cpp:113 Src/wptKeyEditDlgs.cpp:1982
 #: Src/wptKeyManagerDlg.cpp:963
 msgid "&Help"
 msgstr "&Hilfe"
@@ -443,19 +443,19 @@
 "OK zum Fortfahren oder Abbrechen"
 
 #: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
-#: Src/wptClipDecryptDlg.cpp:200 Src/wptFileManager.cpp:1233
+#: Src/wptClipDecryptDlg.cpp:200 Src/wptFileManager.cpp:1239
 #: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:158
 msgid "user ID not found"
 msgstr "Benutzerkennung nicht gefunden"
 
 #: Src/wptClipDecryptDlg.cpp:118 Src/wptClipDecryptDlg.cpp:130
 #: Src/wptClipDecryptDlg.cpp:138 Src/wptClipDecryptDlg.cpp:146
-#: Src/wptClipDecryptDlg.cpp:148 Src/wptFileManager.cpp:1271
-#: Src/wptFileManager.cpp:1322
+#: Src/wptClipDecryptDlg.cpp:148 Src/wptFileManager.cpp:1277
+#: Src/wptFileManager.cpp:1328
 msgid "Decryption"
 msgstr "Entschlüsselung"
 
-#: Src/wptClipDecryptDlg.cpp:131 Src/wptFileManager.cpp:1323
+#: Src/wptClipDecryptDlg.cpp:131 Src/wptFileManager.cpp:1329
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -577,7 +577,7 @@
 msgid "Add quotes"
 msgstr "'>' hinzufügen"
 
-#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1980
+#: Src/wptClipEditDlg.cpp:200 Src/wptKeyEditDlgs.cpp:1981
 #: Src/wptKeyserverDlg.cpp:610 Src/wptMDSumDlg.cpp:104
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
@@ -603,13 +603,13 @@
 #: Src/wptCommonDlg.cpp:68 Src/wptFileManagerDlg.cpp:84
 #: Src/wptFileManagerDlg.cpp:218 Src/wptFileManagerDlg.cpp:286
 #: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:47
-#: Src/wptKeyEditDlgs.cpp:337 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeyEditDlgs.cpp:516 Src/wptKeyEditDlgs.cpp:650
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
-#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
-#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverSearchDlg.cpp:68
-#: Src/wptKeysignDlg.cpp:269 Src/wptPassphraseCB.cpp:83
-#: Src/wptPassphraseDlg.cpp:68 Src/wptPINDlg.cpp:55
+#: Src/wptGPGPrefsDlg.cpp:156 Src/wptKeyEditDlgs.cpp:337
+#: Src/wptKeyEditDlgs.cpp:439 Src/wptKeyEditDlgs.cpp:516
+#: Src/wptKeyEditDlgs.cpp:650 Src/wptKeyEditOwnertrustDlg.cpp:67
+#: Src/wptKeygenDlg.cpp:383 Src/wptKeygenDlg.cpp:546
+#: Src/wptKeyRevokeDlg.cpp:101 Src/wptKeyserverDlg.cpp:542
+#: Src/wptKeyserverSearchDlg.cpp:68 Src/wptKeysignDlg.cpp:269
+#: Src/wptPassphraseCB.cpp:83 Src/wptPassphraseDlg.cpp:68 Src/wptPINDlg.cpp:55
 #: Src/wptPreferencesDlg.cpp:132 Src/wptTextInputDlg.cpp:84
 msgid "&Cancel"
 msgstr "&Abbrechen"
@@ -638,8 +638,8 @@
 #: Src/wptClipSignDlg.cpp:219 Src/wptClipSignDlg.cpp:227
 #: Src/wptClipSignDlg.cpp:246 Src/wptClipSignDlg.cpp:257
 #: Src/wptClipSignEncDlg.cpp:166 Src/wptClipSignEncDlg.cpp:176
-#: Src/wptFileManager.cpp:1086 Src/wptFileManager.cpp:1104
-#: Src/wptFileManager.cpp:1366 Src/wptMainProc.cpp:153 Src/wptMainProc.cpp:215
+#: Src/wptFileManager.cpp:1090 Src/wptFileManager.cpp:1108
+#: Src/wptFileManager.cpp:1372 Src/wptMainProc.cpp:153 Src/wptMainProc.cpp:215
 msgid "Signing"
 msgstr "Signieren"
 
@@ -678,7 +678,7 @@
 #: 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:1552 Src/wptFileManager.cpp:1607
+#: Src/wptFileManager.cpp:1558 Src/wptFileManager.cpp:1613
 #: Src/wptFileManagerDlg.cpp:551 Src/wptFileVerifyDlg.cpp:81
 #: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:179
 #: Src/wptMainProc.cpp:245 Src/wptMainProc.cpp:257 Src/wptMainProc.cpp:265
@@ -751,11 +751,11 @@
 #: Src/wptKeyEditDlgs.cpp:1585 Src/wptKeyEditDlgs.cpp:1686
 #: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyEditDlgs.cpp:1746
 #: Src/wptKeyEditDlgs.cpp:1750 Src/wptKeyEditDlgs.cpp:1759
-#: Src/wptKeyEditDlgs.cpp:1878 Src/wptKeyEditDlgs.cpp:1883
-#: Src/wptKeyEditDlgs.cpp:1892 Src/wptKeyEditDlgs.cpp:1906
-#: Src/wptKeyEditDlgs.cpp:1910 Src/wptKeyEditDlgs.cpp:1961
-#: Src/wptKeyEditDlgs.cpp:1971 Src/wptKeyEditDlgs.cpp:1982
-#: Src/wptKeyEditDlgs.cpp:2011 Src/wptKeyEditDlgs.cpp:2016
+#: Src/wptKeyEditDlgs.cpp:1879 Src/wptKeyEditDlgs.cpp:1884
+#: Src/wptKeyEditDlgs.cpp:1893 Src/wptKeyEditDlgs.cpp:1907
+#: Src/wptKeyEditDlgs.cpp:1911 Src/wptKeyEditDlgs.cpp:1962
+#: Src/wptKeyEditDlgs.cpp:1972 Src/wptKeyEditDlgs.cpp:1983
+#: Src/wptKeyEditDlgs.cpp:2012 Src/wptKeyEditDlgs.cpp:2017
 #: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1791
 msgid "Key Edit"
 msgstr "Schlüssel bearbeiten"
@@ -1057,9 +1057,9 @@
 #: Src/wptFileManager.cpp:136 Src/wptFileManager.cpp:175
 #: Src/wptFileManager.cpp:300 Src/wptFileManager.cpp:669
 #: Src/wptFileManager.cpp:814 Src/wptFileManager.cpp:928
-#: Src/wptFileManager.cpp:1457 Src/wptFileManager.cpp:1484
-#: Src/wptFileManager.cpp:1503 Src/wptFileManager.cpp:1761
-#: Src/wptFileManager.cpp:1823 Src/wptFileManagerDlg.cpp:498
+#: Src/wptFileManager.cpp:1463 Src/wptFileManager.cpp:1490
+#: Src/wptFileManager.cpp:1509 Src/wptFileManager.cpp:1767
+#: Src/wptFileManager.cpp:1829 Src/wptFileManagerDlg.cpp:498
 #: Src/wptFileStatDlg.cpp:137 Src/wptMainProc.cpp:400 Src/wptMDSumDlg.cpp:153
 msgid "File Manager"
 msgstr "Dateimanager"
@@ -1124,48 +1124,48 @@
 msgid "\"%s\" does not exist"
 msgstr "\"%s\" existiert nicht"
 
-#: Src/wptFileManager.cpp:1010 Src/wptFileStatDlg.cpp:259
+#: Src/wptFileManager.cpp:1014 Src/wptFileStatDlg.cpp:259
 #: Src/wptFileStatDlg.cpp:266
 msgid "File Status"
 msgstr "Dateistatus"
 
-#: Src/wptFileManager.cpp:1056
+#: Src/wptFileManager.cpp:1060
 msgid "Enter filename for encrypted file"
 msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
 
-#: Src/wptFileManager.cpp:1085
+#: Src/wptFileManager.cpp:1089
 msgid "Could not get default secret key."
 msgstr "Konnte den geheimen Standardschlüssel nicht finden."
 
-#: Src/wptFileManager.cpp:1118 Src/wptFileManager.cpp:1402
+#: Src/wptFileManager.cpp:1122 Src/wptFileManager.cpp:1408
 #: Src/wptFileManagerDlg.cpp:549 Src/wptMainProc.cpp:197
 #: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:423
 msgid "Sign"
 msgstr "Signieren"
 
-#: Src/wptFileManager.cpp:1131 Src/wptFileManagerDlg.cpp:547
+#: Src/wptFileManager.cpp:1135 Src/wptFileManagerDlg.cpp:547
 #: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:420
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: Src/wptFileManager.cpp:1158 Src/wptFileManager.cpp:1189
-#: Src/wptFileManager.cpp:1194 Src/wptMainProc.cpp:414
+#: Src/wptFileManager.cpp:1162 Src/wptFileManager.cpp:1195
+#: Src/wptFileManager.cpp:1200 Src/wptMainProc.cpp:414
 msgid "Symmetric"
 msgstr "Symmetrisch"
 
-#: Src/wptFileManager.cpp:1194
+#: Src/wptFileManager.cpp:1200
 msgid "Encryption failed."
 msgstr "Verschlüsselung fehlgeschlagen."
 
-#: Src/wptFileManager.cpp:1221
+#: Src/wptFileManager.cpp:1227
 msgid "Good signature"
 msgstr "Korrekte Signatur"
 
-#: Src/wptFileManager.cpp:1221
+#: Src/wptFileManager.cpp:1227
 msgid "BAD signature"
 msgstr "Falsche Signatur"
 
-#: Src/wptFileManager.cpp:1229
+#: Src/wptFileManager.cpp:1235
 #, c-format
 msgid ""
 "Signature made %s using %s key ID %s\n"
@@ -1174,23 +1174,23 @@
 "Signatur erstellt %s mit %s key ID %s\n"
 "%s von \"%s\""
 
-#: Src/wptFileManager.cpp:1234
+#: Src/wptFileManager.cpp:1240
 msgid "Decrypt Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
-#: Src/wptFileManager.cpp:1282
+#: Src/wptFileManager.cpp:1288
 msgid "Choose Filename for Output"
 msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1293
+#: Src/wptFileManager.cpp:1299
 msgid "Please enter filename for plaintext file"
 msgstr "Wählen Sie einen Namen für die Klartext-Datei"
 
-#: Src/wptFileManager.cpp:1331 Src/wptFileManagerDlg.cpp:548
+#: Src/wptFileManager.cpp:1337 Src/wptFileManagerDlg.cpp:548
 msgid "Decrypt"
 msgstr "Entschlüsseln"
 
-#: Src/wptFileManager.cpp:1337
+#: Src/wptFileManager.cpp:1343
 #, c-format
 msgid ""
 "Decryption failed.\n"
@@ -1199,32 +1199,32 @@
 "Entshlüsselung fehlgeschlagen.\n"
 "%s: existiert nicht."
 
-#: Src/wptFileManager.cpp:1379
+#: Src/wptFileManager.cpp:1385
 msgid "Enter filename for signed file"
 msgstr "Wählen Sie einen Namen für die signierte Datei"
 
-#: Src/wptFileManager.cpp:1483
+#: Src/wptFileManager.cpp:1489
 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:1503
+#: Src/wptFileManager.cpp:1509
 msgid "No files to check."
 msgstr "Keine Datei(en) zu pruefen."
 
-#: Src/wptFileManager.cpp:1520
+#: Src/wptFileManager.cpp:1526
 msgid "Select Data File"
 msgstr "Bitte Datendatei auswählen"
 
-#: Src/wptFileManager.cpp:1522
+#: Src/wptFileManager.cpp:1528
 msgid "Selected Output File"
 msgstr "Bitte Ausgabedatei auswählen"
 
-#: Src/wptFileManager.cpp:1552
+#: Src/wptFileManager.cpp:1558
 msgid "Invalid file name. Exit"
 msgstr "Ungültiger Dateiname. Abbruch"
 
-#: Src/wptFileManager.cpp:1654 Src/wptFileManager.cpp:1665
+#: Src/wptFileManager.cpp:1660 Src/wptFileManager.cpp:1671
 #: Src/wptFileManagerDlg.cpp:243 Src/wptImportList.cpp:413
 #: Src/wptImportList.cpp:419 Src/wptImportList.cpp:429
 #: Src/wptImportList.cpp:437 Src/wptImportList.cpp:446
@@ -1233,7 +1233,7 @@
 msgid "Import"
 msgstr "Importieren"
 
-#: Src/wptFileManager.cpp:1662
+#: Src/wptFileManager.cpp:1668
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -1245,58 +1245,58 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren!"
 
-#: Src/wptFileManager.cpp:1688 Src/wptKeyManager.cpp:312
+#: Src/wptFileManager.cpp:1694 Src/wptKeyManager.cpp:312
 #: Src/wptKeyManager.cpp:348 Src/wptKeyManager.cpp:383
 msgid "No key was selected for export."
 msgstr "Kein Schlüssel zum Exportieren ausgewählt."
 
-#: Src/wptFileManager.cpp:1688 Src/wptFileManager.cpp:1711
+#: Src/wptFileManager.cpp:1694 Src/wptFileManager.cpp:1717
 #: Src/wptKeyserverDlg.cpp:95
 msgid "Export"
 msgstr "Exportieren"
 
-#: Src/wptFileManager.cpp:1696 Src/wptKeyManagerDlg.cpp:1714
+#: Src/wptFileManager.cpp:1702 Src/wptKeyManagerDlg.cpp:1714
 #: Src/wptKeyManagerDlg.cpp:1748
 msgid "Choose Name for Key File"
 msgstr "Den Namen der Schlüsseldatei wählen"
 
-#: Src/wptFileManager.cpp:1715 Src/wptKeyEditDlgs.cpp:1010
+#: Src/wptFileManager.cpp:1721 Src/wptKeyEditDlgs.cpp:1010
 #: Src/wptKeyEditDlgs.cpp:1307 Src/wptKeyEditDlgs.cpp:1381
 #: Src/wptKeyserverDlg.cpp:106
 msgid "GnuPG status"
 msgstr "GnuPG Status"
 
-#: Src/wptFileManager.cpp:1715
+#: Src/wptFileManager.cpp:1721
 #, c-format
 msgid "Finished (Output: %s)"
 msgstr "Fertig (Datei: %s)"
 
-#: Src/wptFileManager.cpp:1762
+#: Src/wptFileManager.cpp:1768
 #, c-format
 msgid "%s: no valid OpenPGP data found."
 msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
 
-#: Src/wptFileManager.cpp:1822
+#: Src/wptFileManager.cpp:1828
 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:1827
+#: Src/wptFileManager.cpp:1833
 msgid "Choose File Name for Output"
 msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1896
+#: Src/wptFileManager.cpp:1902
 msgid "Choose a Name for the Archive"
 msgstr "Wählen Sie den Namen für das Archiv"
 
-#: Src/wptFileManager.cpp:1899
+#: Src/wptFileManager.cpp:1905
 msgid "Invalid archive name. Exit."
 msgstr "Ungültiger Archivename. Abbruch."
 
-#: Src/wptFileManager.cpp:1899 Src/wptFileManager.cpp:1906
+#: Src/wptFileManager.cpp:1905 Src/wptFileManager.cpp:1912
 msgid "Encrypt Directory"
 msgstr "Verzeichnis verschlüsseln"
 
-#: Src/wptFileManager.cpp:1906
+#: Src/wptFileManager.cpp:1912
 msgid "Could not create zip archive."
 msgstr "Konnte ZIP-Datei nicht erstellen."
 
@@ -1499,6 +1499,11 @@
 msgid "&Wipe"
 msgstr "&Löschen"
 
+#: Src/wptFileManagerDlg.cpp:497
+#, fuzzy
+msgid "Could not set filelist window procedure."
+msgstr "Konnte \"keylist window procedure\" nicht setzen."
+
 #: Src/wptFileManagerDlg.cpp:552
 msgid "Wipe"
 msgstr "Löschen"
@@ -1508,32 +1513,32 @@
 msgstr "Pakete anzeigen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:599
+#: Src/wptFileManagerDlg.cpp:600
 msgid "&Calc Digest"
 msgstr "Digest &berechnen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:754
+#: Src/wptFileManagerDlg.cpp:755
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
 
-#: Src/wptFileManagerDlg.cpp:755 Src/wptMainProc.cpp:97
+#: Src/wptFileManagerDlg.cpp:756 Src/wptMainProc.cpp:97
 msgid "&Yes"
 msgstr "&Ja"
 
-#: Src/wptFileManagerDlg.cpp:756 Src/wptMainProc.cpp:98
+#: Src/wptFileManagerDlg.cpp:757 Src/wptMainProc.cpp:98
 msgid "&No"
 msgstr "&Nein"
 
-#: Src/wptFileManagerDlg.cpp:799
+#: Src/wptFileManagerDlg.cpp:800
 msgid "Operation Status: Error"
 msgstr "Prozess-Status: Fehler"
 
-#: Src/wptFileManagerDlg.cpp:800
+#: Src/wptFileManagerDlg.cpp:801
 msgid "Operation Status: Done."
 msgstr "Prozess-Status: Fertig"
 
-#: Src/wptFileManagerDlg.cpp:843
+#: Src/wptFileManagerDlg.cpp:844
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1629,10 +1634,10 @@
 msgid "GPG Warning"
 msgstr "GPG Warnung"
 
-#: Src/wptGPG.cpp:880 Src/wptGPGPrefsDlg.cpp:210 Src/wptGPGPrefsDlg.cpp:216
-#: Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
-#: Src/wptGPGPrefsDlg.cpp:233 Src/wptGPGPrefsDlg.cpp:238
-#: Src/wptGPGPrefsDlg.cpp:244 Src/wptGPGPrefsDlg.cpp:258
+#: Src/wptGPG.cpp:880 Src/wptGPGPrefsDlg.cpp:213 Src/wptGPGPrefsDlg.cpp:219
+#: Src/wptGPGPrefsDlg.cpp:225 Src/wptGPGPrefsDlg.cpp:231
+#: Src/wptGPGPrefsDlg.cpp:236 Src/wptGPGPrefsDlg.cpp:241
+#: Src/wptGPGPrefsDlg.cpp:247 Src/wptGPGPrefsDlg.cpp:261
 #: Src/wptKeyEditDlgs.cpp:1693 Src/wptKeyManagerDlg.cpp:956
 #: Src/wptMainProc.cpp:433 Src/wptPreferencesDlg.cpp:210
 #: Src/wptPreferencesDlg.cpp:253 Src/wptPreferencesDlg.cpp:265
@@ -1815,39 +1820,39 @@
 msgid "&Overwrite default settings"
 msgstr "&Überschreibe Voreinstellungen"
 
-#: Src/wptGPGPrefsDlg.cpp:209
+#: Src/wptGPGPrefsDlg.cpp:212
 msgid "Please enter the GnuPG home directory."
 msgstr "Bitte GnuPG-HOME-Verzeichnis eingeben."
 
-#: Src/wptGPGPrefsDlg.cpp:221
+#: Src/wptGPGPrefsDlg.cpp:224
 msgid "Could not save 'HomeDir' in the registry."
 msgstr "Konnte 'HomeDir' nicht in Registry schreiben"
 
-#: Src/wptGPGPrefsDlg.cpp:227
+#: Src/wptGPGPrefsDlg.cpp:230
 msgid "Please enter where GPG.exe is located."
 msgstr "Bitte Pfad zu GPG.EXE eingeben."
 
-#: Src/wptGPGPrefsDlg.cpp:232
+#: Src/wptGPGPrefsDlg.cpp:235
 msgid "Could not find the GPG program in this directory."
 msgstr "Konnte GPG-Programm nicht in diesem Verzeichnis finden."
 
-#: Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:240
 msgid "Could not save 'gpgProgram' in the registry"
 msgstr "Konnte 'gpgProgram' nicht in Registry schreiben"
 
-#: Src/wptGPGPrefsDlg.cpp:257
+#: Src/wptGPGPrefsDlg.cpp:260
 msgid "Could not get GPG config file"
 msgstr "Konnte Konfigurationsdatei nicht öffnen"
 
-#: Src/wptGPGPrefsDlg.cpp:291
+#: Src/wptGPGPrefsDlg.cpp:294
 msgid "Choose GPG home directory"
 msgstr "Wählen Sie das GPG HOME-Verzeichnis"
 
-#: Src/wptGPGPrefsDlg.cpp:311
+#: Src/wptGPGPrefsDlg.cpp:314
 msgid "Choose locale directory"
 msgstr "Verzeichnis für Sprachdateien auswählen"
 
-#: Src/wptGPGPrefsDlg.cpp:317
+#: Src/wptGPGPrefsDlg.cpp:320
 msgid "Choose GPG binary"
 msgstr "Wählen Sie GPG.EXE Datei"
 
@@ -1927,8 +1932,8 @@
 #: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
 #: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1820
 #: Src/wptKeyManagerDlg.cpp:2001 Src/wptKeysigDlg.cpp:93
-#: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:277 Src/wptKeysigDlg.cpp:354
-#: Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:407 Src/wptMainProc.cpp:401
+#: Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:284 Src/wptKeysigDlg.cpp:358
+#: Src/wptKeysigDlg.cpp:367 Src/wptKeysigDlg.cpp:412 Src/wptMainProc.cpp:401
 #: Src/wptMainProc.cpp:554 Src/wptMainProc.cpp:562
 msgid "Key Manager"
 msgstr "Schlüsselverwaltung"
@@ -2114,7 +2119,7 @@
 #: Src/wptKeyEditDlgs.cpp:1443 Src/wptKeyEditDlgs.cpp:1515
 #: Src/wptKeyEditDlgs.cpp:1600 Src/wptKeyEditDlgs.cpp:1778
 #: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
-#: Src/wptKeyPropsDlg.cpp:361 Src/wptOwnertrustDlg.cpp:124
+#: Src/wptKeyPropsDlg.cpp:359 Src/wptOwnertrustDlg.cpp:124
 #: Src/wptOwnertrustDlg.cpp:136
 msgid "GnuPG Status"
 msgstr "GnuPG-Status"
@@ -2139,7 +2144,7 @@
 #: Src/wptKeyEditDlgs.cpp:456 Src/wptKeyEditDlgs.cpp:1475
 #: Src/wptKeyEditDlgs.cpp:1532 Src/wptKeyEditDlgs.cpp:1577
 #: Src/wptKeyEditDlgs.cpp:1719 Src/wptKeyEditDlgs.cpp:1750
-#: Src/wptKeyEditDlgs.cpp:1878
+#: Src/wptKeyEditDlgs.cpp:1879
 msgid "Please select a user ID."
 msgstr "Bitte eine Benutzerkennung wählen."
 
@@ -2242,7 +2247,7 @@
 msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
 
 #: Src/wptKeyEditDlgs.cpp:927 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:353
+#: Src/wptKeyPropsDlg.cpp:351
 msgid "Change Ownertrust"
 msgstr "Besitzervertrauen ändern"
 
@@ -2510,32 +2515,32 @@
 msgid "User ID successfully deleted"
 msgstr "Benutzerkennung erfolgreich gelöscht"
 
-#: Src/wptKeyEditDlgs.cpp:1882
+#: Src/wptKeyEditDlgs.cpp:1883
 msgid "Do you really want to make this sig exportable?"
 msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
 
-#: Src/wptKeyEditDlgs.cpp:1906 Src/wptKeysignDlg.cpp:359
+#: Src/wptKeyEditDlgs.cpp:1907 Src/wptKeysignDlg.cpp:368
 msgid "Key successfully signed."
 msgstr "Schlüssel erfolgreich signiert."
 
-#: Src/wptKeyEditDlgs.cpp:1961
+#: Src/wptKeyEditDlgs.cpp:1962
 msgid "Could not set subkey window procedure."
 msgstr "Konnte \"subkey window procedure\" nicht setzen."
 
-#: Src/wptKeyEditDlgs.cpp:1971
+#: Src/wptKeyEditDlgs.cpp:1972
 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:1979
+#: Src/wptKeyEditDlgs.cpp:1980
 msgid "Command>"
 msgstr "Kommando>"
 
-#: Src/wptKeyEditDlgs.cpp:2011
+#: Src/wptKeyEditDlgs.cpp:2012
 msgid "Please select a command."
 msgstr "Bitte einen Befehl auswählen."
 
-#: Src/wptKeyEditDlgs.cpp:2015
+#: Src/wptKeyEditDlgs.cpp:2016
 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"
 
@@ -2575,7 +2580,7 @@
 
 #: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
 #: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:293
+#: Src/wptKeyManagerDlg.cpp:1772 Src/wptKeyPropsDlg.cpp:291
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
 #: Src/wptOwnertrustDlg.cpp:133
 msgid "Ownertrust"
@@ -3145,7 +3150,7 @@
 msgstr "&Importieren..."
 
 #: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyManagerDlg.cpp:990
-#: Src/wptKeysigDlg.cpp:392
+#: Src/wptKeysigDlg.cpp:397
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
@@ -3318,9 +3323,9 @@
 msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
 
 #: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeysignDlg.cpp:241
-#: Src/wptKeysignDlg.cpp:259 Src/wptKeysignDlg.cpp:335
-#: Src/wptKeysignDlg.cpp:352 Src/wptKeysignDlg.cpp:357
-#: Src/wptKeysignDlg.cpp:359
+#: Src/wptKeysignDlg.cpp:259 Src/wptKeysignDlg.cpp:344
+#: Src/wptKeysignDlg.cpp:361 Src/wptKeysignDlg.cpp:366
+#: Src/wptKeysignDlg.cpp:368
 msgid "Key Signing"
 msgstr "Schlüsselsignierung"
 
@@ -3343,7 +3348,7 @@
 msgid "Key Signature List"
 msgstr "Schlüssel-Signatur-Liste"
 
-#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:289
+#: Src/wptKeyManagerDlg.cpp:1603 Src/wptKeyPropsDlg.cpp:287
 msgid "Key Properties"
 msgstr "Schlüsseleigenschaften"
 
@@ -3440,25 +3445,25 @@
 "Cipher: %s\r\n"
 "%s\r\n"
 
-#: Src/wptKeyPropsDlg.cpp:290
+#: Src/wptKeyPropsDlg.cpp:288
 msgid "&Change"
 msgstr "&Ändern"
 
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:289
 msgid "&Revokers"
 msgstr "\"&Revokers\""
 
-#: Src/wptKeyPropsDlg.cpp:292
+#: Src/wptKeyPropsDlg.cpp:290
 msgid "Change &Password"
 msgstr "&Passwort ändern"
 
-#: Src/wptKeyPropsDlg.cpp:299
+#: Src/wptKeyPropsDlg.cpp:297
 msgid "Photo-ID not validated."
 msgstr "Foto-ID nicht geprüft."
 
 # msgid "Unknown"
 # msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:337
+#: Src/wptKeyPropsDlg.cpp:335
 msgid ""
 "The status of this key is 'revoked' or 'expired'.\n"
 "You cannot change the ownertrust of such keys."
@@ -3466,11 +3471,11 @@
 "Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
 "Sie können das Vertrauen in solche Schlüssel nicht ändern."
 
-#: Src/wptKeyPropsDlg.cpp:339 Src/wptKeyPropsDlg.cpp:346
+#: Src/wptKeyPropsDlg.cpp:337 Src/wptKeyPropsDlg.cpp:344
 msgid "WinPT Warning"
 msgstr "WinPT Warnung"
 
-#: Src/wptKeyPropsDlg.cpp:343
+#: Src/wptKeyPropsDlg.cpp:341
 msgid ""
 "This is a non-valid key.\n"
 "Modifying the ownertrust has no effect on such keys.\n"
@@ -3481,11 +3486,11 @@
 "Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptKeyPropsDlg.cpp:360
+#: Src/wptKeyPropsDlg.cpp:358
 msgid "Ownertrust successfully changed."
 msgstr "Besitzervertrauen erfolgreich geändert."
 
-#: Src/wptKeyPropsDlg.cpp:373 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptKeyPropsDlg.cpp:371 Src/wptKeyRevokersDlg.cpp:146
 msgid "Key Revokers"
 msgstr "Schlüsselwiderrufer"
 
@@ -3834,7 +3839,7 @@
 msgid "Signature Properties"
 msgstr "Signatur Eigenschaften"
 
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:169 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:164 Src/wptKeysigDlg.cpp:206
 msgid "Exportable"
 msgstr "Exportierbar"
 
@@ -3860,44 +3865,48 @@
 msgid "Issuer key ID"
 msgstr "Key ID des Ausstellers"
 
-#: Src/wptKeysigDlg.cpp:169
+#: Src/wptKeysigDlg.cpp:164
 msgid "Non-exportable"
 msgstr "Nicht-exportierbar"
 
-#: Src/wptKeysigDlg.cpp:276
+#: Src/wptKeysigDlg.cpp:177 Src/wptSigList.cpp:156
+msgid "  user ID not found"
+msgstr "  Benutzerkennung nicht gefunden"
+
+#: Src/wptKeysigDlg.cpp:283
 msgid "Really receive all missing keys?"
 msgstr "Alle fehlenden Schlüssel empfangen?"
 
-#: Src/wptKeysigDlg.cpp:311
+#: Src/wptKeysigDlg.cpp:317
 msgid "Signature &Properties"
 msgstr "Signatur-&Eigenschaften"
 
-#: Src/wptKeysigDlg.cpp:312
+#: Src/wptKeysigDlg.cpp:318
 msgid "Signing &Key Properties"
 msgstr "Signing Key-Eigenschaften"
 
 # c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:294
-#: Src/wptKeysigDlg.cpp:353
+#: Src/wptKeysigDlg.cpp:357
 msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
 msgstr ""
 "Schlüssel nicht im Schlüsselbund gefunden, wollen Sie den Schlüssel "
 "runterladen?"
 
 # c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:363
+#: Src/wptKeysigDlg.cpp:367
 msgid "Key not found in keyring."
 msgstr "Schlüssel im Keyring nicht gefunden."
 
-#: Src/wptKeysigDlg.cpp:389
+#: Src/wptKeysigDlg.cpp:394
 #, c-format
 msgid "Signature List for \"%s\""
 msgstr "Signaturliste für \"%s\""
 
-#: Src/wptKeysigDlg.cpp:391
+#: Src/wptKeysigDlg.cpp:396
 msgid "&Receive Key"
 msgstr "&Schlüssel empfangen"
 
-#: Src/wptKeysignDlg.cpp:165 Src/wptKeysignDlg.cpp:309
+#: Src/wptKeysignDlg.cpp:165 Src/wptKeysignDlg.cpp:318
 msgid "Choose Signature Class"
 msgstr "Signaturklasse auswählen"
 
@@ -3980,11 +3989,11 @@
 msgid "&Show photo"
 msgstr "&Photo anzeigen"
 
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:344
 msgid "Could not get Key ID from key."
 msgstr "Schlüssel-ID konnte nicht aus dem Schlüssel gelesen werden."
 
-#: Src/wptKeysignDlg.cpp:356
+#: Src/wptKeysignDlg.cpp:365
 msgid "This key is already signed by your key"
 msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
 
@@ -4440,10 +4449,6 @@
 msgid "Expiration"
 msgstr "Ablauf"
 
-#: Src/wptSigList.cpp:156
-msgid "  user ID not found"
-msgstr "  Benutzerkennung nicht gefunden"
-
 #: Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:88
 msgid "Symmetric Encryption"
 msgstr "Symmetrisch verschlüsseln"

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Src/ChangeLog	2006-02-21 12:12:23 UTC (rev 178)
@@ -1,3 +1,10 @@
+2006-02-15  Timo Schulz  <ts at g10code.de>
+
+	* wptKeysignDlg.cpp (keysign_dlg_proc): Localize new checkbox.
+	* wptFileStatDlg.cpp (get_s2k_algo): New.
+	* wptFileManagerDlg.cpp (update_status_bar): Use human readable
+	formats.
+	
 2006-02-14  Timo Schulz  <ts at g10code.de>
 
 	* wptGPGPrefsDlg.cpp (gpgprefs_dlg_proc): Localize 'Cancel'.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Src/WinPT-en.rc	2006-02-21 12:12:23 UTC (rev 178)
@@ -469,7 +469,7 @@
     EDITTEXT        IDC_KEYSIGN_PASSPHRASE,53,153,144,13,ES_PASSWORD | 
                     ES_AUTOHSCROLL
     CONTROL         "&Hide typing",IDC_KEYSIGN_HIDE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,135,168,60,9
+                    WS_TABSTOP,127,168,74,9
     PUSHBUTTON      "&Show photo",IDC_KEYSIGN_SHOWIMG,2,189,67,14,
                     WS_DISABLED
     DEFPUSHBUTTON   "&OK",IDOK,174,189,50,14
@@ -798,10 +798,10 @@
 BEGIN
     LTEXT           "Enter passphrase",IDC_PASSWD_INFO,9,7,108,8
     EDITTEXT        IDC_PASSWD_PWD,9,18,202,12,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "&OK",IDOK,107,50,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,160,50,50,14
     CONTROL         "&Hide Typing",IDC_PASSWD_HIDE,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,134,31,78,10
-    DEFPUSHBUTTON   "&OK",IDOK,107,50,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,160,50,50,14
 END
 
 IDD_WINPT_DATE DIALOG DISCARDABLE  0, 0, 93, 58
@@ -885,13 +885,13 @@
     PUSHBUTTON      "&Cancel",IDCANCEL,126,102,50,14
 END
 
-IDD_WINPT_FILE_STAT DIALOG DISCARDABLE  0, 0, 288, 133
+IDD_WINPT_FILE_STAT DIALOG DISCARDABLE  0, 0, 309, 133
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "File Status"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,227,108,50,14
-    LISTBOX         IDC_FILE_STAT_LIST,5,7,272,99,LBS_NOINTEGRALHEIGHT | 
+    DEFPUSHBUTTON   "&OK",IDOK,246,108,50,14
+    LISTBOX         IDC_FILE_STAT_LIST,5,7,291,99,LBS_NOINTEGRALHEIGHT | 
                     LBS_NOSEL | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -1187,10 +1187,10 @@
 BEGIN
     LTEXT           "Static",IDC_PIN_INFO,9,8,166,40
     EDITTEXT        IDC_PIN_VALUE,10,54,163,12,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "&OK",IDOK,90,85,44,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,135,85,44,14
     CONTROL         "&Hide Typing",IDC_PIN_HIDE,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,117,68,54,10
-    DEFPUSHBUTTON   "&OK",IDOK,90,85,44,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,135,85,44,14
 END
 
 IDD_WINPT_CARD_CHPIN DIALOG DISCARDABLE  0, 0, 153, 143
@@ -1692,7 +1692,7 @@
     IDD_WINPT_FILE_STAT, DIALOG
     BEGIN
         LEFTMARGIN, 2
-        RIGHTMARGIN, 281
+        RIGHTMARGIN, 302
         TOPMARGIN, 3
         BOTTOMMARGIN, 128
     END

Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Src/wptFileManagerDlg.cpp	2006-02-21 12:12:23 UTC (rev 178)
@@ -387,7 +387,7 @@
     int n;
 
     if (!lv) { /* flush */
-	SendMessage (statbar, SB_SETTEXT, 1, (LPARAM)"0 KB");
+	SendMessage (statbar, SB_SETTEXT, 1, (LPARAM)"0 Byte");
 	SendMessage (statbar, SB_SETTEXT, 0, (LPARAM)_("0 Objects marked"));
 	return;
     }
@@ -396,11 +396,16 @@
     SendMessage (statbar, SB_SETTEXT, 0, (LPARAM)buf);
     listview_get_item_text (lv, listview_get_curr_pos (lv), 1, buf, 127);
     if (stat (buf, &st) == 0) {
-	_snprintf (buf, sizeof (buf)-1, "%d KB", st.st_size/1024);
+	if (st.st_size < 1024)
+	    _snprintf (buf, sizeof (buf)-1, "%d Byte", st.st_size);
+	else if (st.st_size < 1048576)
+	    _snprintf (buf, sizeof (buf)-1, "%d KB", st.st_size/1024);
+	else
+	    _snprintf (buf, sizeof (buf)-1, "%d MB", st.st_size/1024/1024);
 	SendMessage (statbar, SB_SETTEXT, 1, (LPARAM)buf);
     }
     else
-	SendMessage (statbar, SB_SETTEXT, 1, (LPARAM)"0 KB");
+	SendMessage (statbar, SB_SETTEXT, 1, (LPARAM)"0 Byte");
 }
 
 
@@ -494,7 +499,7 @@
 	filelist_proc.old = (WNDPROC)GetWindowLong (fl, GWL_WNDPROC);
 	if (filelist_proc.old) {
 	    if (!SetWindowLong (fl, GWL_WNDPROC, (LONG)filelist_proc.current)) {
-		msg_box (dlg, _("Could not set filelist window procedure."), 
+		msg_box (dlg, "Could not set filelist window procedure.", 
 			 _("File Manager"), MB_ERR);
 		BUG (NULL);
 	    }

Modified: trunk/Src/wptFileStatDlg.cpp
===================================================================
--- trunk/Src/wptFileStatDlg.cpp	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Src/wptFileStatDlg.cpp	2006-02-21 12:12:23 UTC (rev 178)
@@ -17,7 +17,6 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -64,6 +63,7 @@
     case 7: return "AES";
     case 8: return "AES-192";
     case 9: return "AES-256";
+    default: break;
     }    
     return "UNKNOWN";
 }
@@ -84,6 +84,7 @@
     case 8: return "SHA256";
     case 9: return "SHA384";
     case 10:return "SHA512";
+    default: break;
     }
     return "UNKNOWN";
 }
@@ -97,12 +98,26 @@
     case 1: return "ZIB";
     case 2: return "ZLIB";
     case 3: return "BZIP2";
+    default: break;
     }
     return "UNKNOWN";
 }
 
 
 static const char*
+get_s2k_algo (int algo)
+{
+    switch (algo) {
+    case 0: return "SIMPLE";
+    case 1: return "SALTED";
+    case 3: return "ITER+SALTED";
+    default:break;
+    }
+    return "INVALID";
+}
+
+
+static const char*
 get_timestring (long timestamp)
 {
     static char ts[64];
@@ -161,11 +176,11 @@
 	    {PKT_symkey_enc *enc = pkt->pkt.symkey_enc;	n++;
 	    if (!enc)
 		break;
-	    _snprintf( inf, sizeof(inf)-1,	
-		"symmetric key encrypted packet: version %d, cipher %s, s2k %d, hash %s",		
+	    _snprintf (inf, sizeof(inf)-1,
+		"symmetric key encrypted packet: version %d, cipher %s, s2k %s, hash %s",
 		enc->version, get_symkey_algo(enc->cipher_algo),		
-		enc->s2k.mode, get_digest_algo(enc->s2k.hash_algo) );
-	    listbox_add_string( list, inf ); }
+		get_s2k_algo (enc->s2k.mode), get_digest_algo(enc->s2k.hash_algo));
+	    listbox_add_string (list, inf); }
 	    break;
 
 	case PKT_ENCRYPTED:	
@@ -233,7 +248,7 @@
 		get_compress_algo(zip->algorithm), zip->len );
 	    listbox_add_string( list, inf ); }
 	    break;
-	    
+
 	default:
 	    break;
 	}

Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/Src/wptKeysignDlg.cpp	2006-02-21 12:12:23 UTC (rev 178)
@@ -268,6 +268,7 @@
 	SetDlgItemText (dlg, IDC_KEYSIGN_PWDINF, _("Passphrase"));
 	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
 	SetDlgItemText (dlg, IDC_KEYSIGN_SHOWIMG, _("&Show photo"));
+	SetDlgItemText (dlg, IDC_KEYSIGN_HIDE, _("&Hide Typing"));
         CheckDlgButton (dlg, IDC_KEYSIGN_LOCAL, BST_CHECKED);
 	CheckDlgButton (dlg, IDC_KEYSIGN_EXPSIG, BST_UNCHECKED);
 	CheckDlgButton (dlg, IDC_KEYSIGN_ASKLEVEL, BST_UNCHECKED);

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-02-14 15:46:29 UTC (rev 177)
+++ trunk/configure.ac	2006-02-21 12:12:23 UTC (rev 178)
@@ -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.8rc1, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.8-cvs, 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