[Winpt-commits] r161 - in trunk: Include Po Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Jan 19 17:10:39 CET 2006
Author: twoaday
Date: 2006-01-19 17:10:37 +0100 (Thu, 19 Jan 2006)
New Revision: 161
Modified:
trunk/Include/wptErrors.h
trunk/Po/de.po
trunk/Src/ChangeLog
trunk/Src/wptClipVerifyDlg.cpp
trunk/Src/wptErrors.cpp
trunk/Src/wptFileVerifyDlg.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeyManager.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyPropsDlg.cpp
trunk/Src/wptKeyRevokersDlg.cpp
trunk/Src/wptKeylist.cpp
Log:
2006-01-19 Timo Schulz <ts at g10code.com>
* wptClipVerifyDlg.cpp (clip_verify_dlg_proc): Do not
reload the entire cache, just update the key.
* wptFileVerifyDlg.cpp (file_verify_dlg_proc): Likewise.
* wptKeyPropsDlg.cpp (keyprops_dlg_proc): Set update flag.
* wptKeyRevokersDlg.cpp (key_revokers_dlg_proc): Likewise.
* wptKeyManagerDlg.cpp (keymanager_dlg_proc): Update key
if need after showing the properties.
Modified: trunk/Include/wptErrors.h
===================================================================
--- trunk/Include/wptErrors.h 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Include/wptErrors.h 2006-01-19 16:10:37 UTC (rev 161)
@@ -1,5 +1,5 @@
/* wptErrors.h - Errors headerfile
- * Copyright (C) 2000-2005 Timo Schulz
+ * Copyright (C) 2000-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -58,6 +58,7 @@
WPTERR_DIR_CREAT = 34,
WPTERR_CURR_WND = 35,
WPTERR_CONFIG_FILE = 36,
+ WPTERR_NODATA = 37,
WPTERR_GPG_EXEFILE = 51,
WPTERR_GPG_KEYRINGS = 52,
WPTERR_GPG_OPT_KEYRINGS= 53,
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Po/de.po 2006-01-19 16:10:37 UTC (rev 161)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.5\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-01-18 22:39+0100\n"
+"POT-Creation-Date: 2006-01-19 12:29+0100\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
@@ -30,7 +30,7 @@
#: Src/WinPT.cpp:379 Src/WinPT.cpp:386 Src/WinPT.cpp:428 Src/WinPT.cpp:456
#: Src/WinPT.cpp:465 Src/WinPT.cpp:469 Src/WinPT.cpp:486 Src/WinPT.cpp:556
#: Src/WinPT.cpp:569 Src/WinPT.cpp:615 Src/WinPT.cpp:636 Src/WinPT.cpp:653
-#: Src/wptErrors.cpp:140 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
+#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:919 Src/wptGPG.cpp:930
#: Src/wptGPG.cpp:939 Src/wptGPG.cpp:949 Src/wptMainProc.cpp:345
#: Src/wptMainProc.cpp:527
msgid "WinPT Error"
@@ -58,7 +58,7 @@
msgstr "Konnte WinPT Verzeichnis nicht erstellen"
#: Src/WinPT.cpp:246 Src/WinPT.cpp:264 Src/WinPT.cpp:275
-#: Src/wptKeyManagerDlg.cpp:945 Src/wptKeyserver.cpp:537
+#: Src/wptKeyManagerDlg.cpp:946 Src/wptKeyserver.cpp:537
#: Src/wptKeyserverDlg.cpp:66 Src/wptKeyserverDlg.cpp:196
#: Src/wptKeyserverDlg.cpp:204 Src/wptKeyserverDlg.cpp:220
#: Src/wptKeyserverDlg.cpp:378 Src/wptKeyserverDlg.cpp:384
@@ -185,7 +185,7 @@
msgid "About GnuPG"
msgstr "Über GnuPG"
-#: Src/wptAboutDlgs.cpp:97 Src/wptKeyManagerDlg.cpp:1673
+#: Src/wptAboutDlgs.cpp:97 Src/wptKeyManagerDlg.cpp:1684
#: Src/wptMainProc.cpp:576
msgid "About WinPT"
msgstr "Über WinPT"
@@ -236,7 +236,7 @@
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
#: Src/wptAboutDlgs.cpp:116 Src/wptKeyEditDlgs.cpp:1829
-#: Src/wptKeyManagerDlg.cpp:951
+#: Src/wptKeyManagerDlg.cpp:952
msgid "&Help"
msgstr "&Hilfe"
@@ -353,7 +353,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
-#: Src/wptCardDlg.cpp:608 Src/wptKeyManagerDlg.cpp:1566
+#: Src/wptCardDlg.cpp:608 Src/wptKeyManagerDlg.cpp:1577
msgid "Card Key Generation"
msgstr "Karten-Schlüsselerzeugung"
@@ -447,7 +447,7 @@
#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
#: Src/wptClipDecryptDlg.cpp:200 Src/wptFileManager.cpp:1232
-#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:157
+#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:158
msgid "user ID not found"
msgstr "Benutzerkennung nicht gefunden"
@@ -802,8 +802,8 @@
#: Src/wptKeyEditDlgs.cpp:1698 Src/wptKeyEditDlgs.cpp:1707
#: Src/wptKeyEditDlgs.cpp:1809 Src/wptKeyEditDlgs.cpp:1819
#: Src/wptKeyEditDlgs.cpp:1830 Src/wptKeyEditDlgs.cpp:1859
-#: Src/wptKeyEditDlgs.cpp:1865 Src/wptKeyManagerDlg.cpp:979
-#: Src/wptKeyManagerDlg.cpp:1708
+#: Src/wptKeyEditDlgs.cpp:1865 Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:1719
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -1055,43 +1055,47 @@
msgstr "Konnte Konfigurationsdatei nicht laden"
#: Src/wptErrors.cpp:115
+msgid "No data available"
+msgstr "Keine Daten verfügbar"
+
+#: Src/wptErrors.cpp:116
msgid "There is no card in the reader"
msgstr "Keine Karte im Kartenleser"
-#: Src/wptErrors.cpp:116
+#: Src/wptErrors.cpp:117
msgid "There was no reader found"
msgstr "Es wurde kein Kartenleser gefunden"
-#: Src/wptErrors.cpp:117
+#: Src/wptErrors.cpp:118
msgid "This is not an OpenPGP card"
msgstr "Das ist keine OpenPGP-Karte"
-#: Src/wptErrors.cpp:118
+#: Src/wptErrors.cpp:119
msgid "Could not lock or unlock volume"
msgstr "Konnte Volume nicht sperren oder entsperren"
-#: Src/wptErrors.cpp:119
+#: Src/wptErrors.cpp:120
msgid "Could not mount volume"
msgstr "Konnte Volumen nicht mounten"
-#: Src/wptErrors.cpp:120
+#: Src/wptErrors.cpp:121
msgid "Could not unmount volume"
msgstr "Konnte Volumen nicht unmounten"
-#: Src/wptErrors.cpp:121
+#: Src/wptErrors.cpp:122
msgid "Could not open volume"
msgstr "Konnte Volumen nicht öffnen"
# c:\oss\winpt-gpgme\src\wptErrors.cpp:117
-#: Src/wptErrors.cpp:122
+#: Src/wptErrors.cpp:123
msgid "Drive that belongs to the volume is busy"
msgstr "Laufwerk das zu dem Volumen gehört ist \"busy\""
-#: Src/wptErrors.cpp:123
+#: Src/wptErrors.cpp:124
msgid "Could not query volume information"
msgstr "Konnte Volume Informationen nicht extrahieren"
-#: Src/wptErrors.cpp:124
+#: Src/wptErrors.cpp:125
#, c-format
msgid "Unknown error=%d"
msgstr "Unbekannter Fehler=%d"
@@ -1289,8 +1293,8 @@
msgid "Export"
msgstr "Exportieren"
-#: Src/wptFileManager.cpp:1695 Src/wptKeyManagerDlg.cpp:1631
-#: Src/wptKeyManagerDlg.cpp:1665
+#: Src/wptFileManager.cpp:1695 Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1676
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
@@ -1388,17 +1392,17 @@
msgid "Signature mode"
msgstr "Signaturmodus"
-#: Src/wptFileManagerDlg.cpp:276 Src/wptKeyManagerDlg.cpp:943
+#: Src/wptFileManagerDlg.cpp:276 Src/wptKeyManagerDlg.cpp:944
msgid "Options"
msgstr "Optionen"
#: Src/wptFileManagerDlg.cpp:322 Src/wptKeyEditDlgs.cpp:1241
#: Src/wptKeyEditDlgs.cpp:1290 Src/wptKeyEditDlgs.cpp:1364
#: Src/wptKeyManager.cpp:619 Src/wptKeyManager.cpp:720
-#: Src/wptKeyManager.cpp:757 Src/wptKeyManagerDlg.cpp:1401
-#: Src/wptKeyManagerDlg.cpp:1421 Src/wptKeyManagerDlg.cpp:1455
-#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1494
-#: Src/wptKeyManagerDlg.cpp:1621 Src/wptKeyManagerDlg.cpp:1640
+#: Src/wptKeyManager.cpp:757 Src/wptKeyManagerDlg.cpp:1410
+#: Src/wptKeyManagerDlg.cpp:1430 Src/wptKeyManagerDlg.cpp:1464
+#: Src/wptKeyManagerDlg.cpp:1483 Src/wptKeyManagerDlg.cpp:1503
+#: Src/wptKeyManagerDlg.cpp:1632 Src/wptKeyManagerDlg.cpp:1651
#: Src/wptKeyserverSearchDlg.cpp:132
msgid "Please select a key."
msgstr "Bitte Schlüssel wählen."
@@ -1416,17 +1420,17 @@
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:458 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptFileManagerDlg.cpp:458 Src/wptKeyManagerDlg.cpp:917
#: Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
-#: Src/wptFileManagerDlg.cpp:459 Src/wptKeyManagerDlg.cpp:917
-#: Src/wptKeyManagerDlg.cpp:922 Src/wptKeyManagerDlg.cpp:933
+#: Src/wptFileManagerDlg.cpp:459 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyManagerDlg.cpp:923 Src/wptKeyManagerDlg.cpp:934
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:460 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptFileManagerDlg.cpp:460 Src/wptKeyManagerDlg.cpp:919
msgid "View"
msgstr "Ansicht"
@@ -1446,8 +1450,8 @@
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptFileManagerDlg.cpp:465 Src/wptKeyManagerDlg.cpp:934
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptFileManagerDlg.cpp:465 Src/wptKeyManagerDlg.cpp:935
+#: Src/wptKeyManagerDlg.cpp:983
msgid "&Sign"
msgstr "&Signieren"
@@ -1641,11 +1645,11 @@
msgid "GPG Warning"
msgstr "GPG Warnung"
-#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:184 Src/wptGPGPrefsDlg.cpp:190
-#: Src/wptGPGPrefsDlg.cpp:196 Src/wptGPGPrefsDlg.cpp:202
-#: Src/wptGPGPrefsDlg.cpp:207 Src/wptGPGPrefsDlg.cpp:212
-#: Src/wptGPGPrefsDlg.cpp:217 Src/wptGPGPrefsDlg.cpp:231
-#: Src/wptKeyEditDlgs.cpp:1641 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptGPG.cpp:887 Src/wptGPGPrefsDlg.cpp:206 Src/wptGPGPrefsDlg.cpp:212
+#: Src/wptGPGPrefsDlg.cpp:218 Src/wptGPGPrefsDlg.cpp:224
+#: Src/wptGPGPrefsDlg.cpp:229 Src/wptGPGPrefsDlg.cpp:234
+#: Src/wptGPGPrefsDlg.cpp:239 Src/wptGPGPrefsDlg.cpp:253
+#: Src/wptKeyEditDlgs.cpp:1641 Src/wptKeyManagerDlg.cpp:945
#: Src/wptMainProc.cpp:430 Src/wptPreferencesDlg.cpp:209
#: Src/wptPreferencesDlg.cpp:252 Src/wptPreferencesDlg.cpp:263
#: Src/wptPreferencesDlg.cpp:275 Src/wptPreferencesDlg.cpp:308
@@ -1784,86 +1788,86 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:128 Src/wptKeyManagerDlg.cpp:1591
+#: Src/wptGPGPrefsDlg.cpp:141 Src/wptKeyManagerDlg.cpp:1602
#: Src/wptMainProc.cpp:588
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
-#: Src/wptGPGPrefsDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:143
msgid "GnuPG home directory (where both keyrings are located)"
msgstr "GnuPG Home-Dir (wo sich die Keyrings befinden)"
-#: Src/wptGPGPrefsDlg.cpp:132
+#: Src/wptGPGPrefsDlg.cpp:145
msgid "GnuPG exe file location (full path with added gpg.exe)"
msgstr "Vollständige Pfadangabe für GPG.EXE"
-#: Src/wptGPGPrefsDlg.cpp:134
+#: Src/wptGPGPrefsDlg.cpp:147
msgid "Locale directory (to access the translation files)"
msgstr "Verzeichnis der Sprachdateien"
-#: Src/wptGPGPrefsDlg.cpp:135
+#: Src/wptGPGPrefsDlg.cpp:148
msgid "Ask for the signature class during key sign"
msgstr "Signaturlevel erfragen während Key-Sign"
-#: Src/wptGPGPrefsDlg.cpp:136
+#: Src/wptGPGPrefsDlg.cpp:149
msgid "Comment in armored files"
msgstr "Kommentar in Armor-Dateien"
-#: Src/wptGPGPrefsDlg.cpp:137
+#: Src/wptGPGPrefsDlg.cpp:150
msgid "Encrypt to this key"
msgstr "Mit diesem Key verschlüsseln"
-#: Src/wptGPGPrefsDlg.cpp:138
+#: Src/wptGPGPrefsDlg.cpp:151
msgid "General GPG options"
msgstr "Allgemeine GPG Optionen"
-#: Src/wptGPGPrefsDlg.cpp:139 Src/wptGPGPrefsDlg.cpp:140
-#: Src/wptGPGPrefsDlg.cpp:141 Src/wptPreferencesDlg.cpp:149
+#: Src/wptGPGPrefsDlg.cpp:152 Src/wptGPGPrefsDlg.cpp:153
+#: Src/wptGPGPrefsDlg.cpp:154 Src/wptPreferencesDlg.cpp:149
#: Src/wptPreferencesDlg.cpp:150
msgid "Browse..."
msgstr "Ändern..."
-#: Src/wptGPGPrefsDlg.cpp:142
+#: Src/wptGPGPrefsDlg.cpp:155
msgid "&Overwrite default settings"
msgstr "&Überschreibe Voreinstellungen"
-#: Src/wptGPGPrefsDlg.cpp:183
+#: Src/wptGPGPrefsDlg.cpp:205
msgid "Please enter the GnuPG home directory."
msgstr "Bitte GnuPG-HOME-Verzeichnis eingeben."
-#: Src/wptGPGPrefsDlg.cpp:195
+#: Src/wptGPGPrefsDlg.cpp:217
msgid "Could not save 'HomeDir' in the registry."
msgstr "Konnte 'HomeDir' nicht in Registry schreiben"
-#: Src/wptGPGPrefsDlg.cpp:201
+#: Src/wptGPGPrefsDlg.cpp:223
msgid "Please enter where GPG.exe is located."
msgstr "Bitte Pfad zu GPG.EXE eingeben."
-#: Src/wptGPGPrefsDlg.cpp:206
+#: Src/wptGPGPrefsDlg.cpp:228
msgid "Could not find the GPG program in this directory."
msgstr "Konnte GPG-Programm nicht in diesem Verzeichnis finden."
-#: Src/wptGPGPrefsDlg.cpp:211
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Could not save 'gpgProgram' in the registry"
msgstr "Konnte 'gpgProgram' nicht in Registry schreiben"
-#: Src/wptGPGPrefsDlg.cpp:230
+#: Src/wptGPGPrefsDlg.cpp:252
msgid "Could not get GPG config file"
msgstr "Konnte Konfigurationsdatei nicht öffnen"
-#: Src/wptGPGPrefsDlg.cpp:263
+#: Src/wptGPGPrefsDlg.cpp:285
msgid "Choose GPG home directory"
msgstr "Wählen Sie das GPG HOME-Verzeichnis"
-#: Src/wptGPGPrefsDlg.cpp:282
+#: Src/wptGPGPrefsDlg.cpp:304
msgid "Choose locale directory"
msgstr "Verzeichnis für Sprachdateien auswählen"
-#: Src/wptGPGPrefsDlg.cpp:288
+#: Src/wptGPGPrefsDlg.cpp:310
msgid "Choose GPG binary"
msgstr "Wählen Sie GPG.EXE Datei"
-#: Src/wptGPGPrefsDlg.cpp:289
+#: Src/wptGPGPrefsDlg.cpp:311
msgid "Executable Files (*.exe)"
msgstr ""
@@ -1932,16 +1936,16 @@
#: Src/wptKeyManager.cpp:752 Src/wptKeyManager.cpp:757
#: Src/wptKeyManager.cpp:785 Src/wptKeyManager.cpp:827
#: Src/wptKeyManager.cpp:834 Src/wptKeyManager.cpp:894
-#: Src/wptKeyManager.cpp:924 Src/wptKeyManagerDlg.cpp:1089
-#: Src/wptKeyManagerDlg.cpp:1106 Src/wptKeyManagerDlg.cpp:1380
-#: Src/wptKeyManagerDlg.cpp:1402 Src/wptKeyManagerDlg.cpp:1421
-#: Src/wptKeyManagerDlg.cpp:1429 Src/wptKeyManagerDlg.cpp:1439
-#: Src/wptKeyManagerDlg.cpp:1455 Src/wptKeyManagerDlg.cpp:1461
-#: Src/wptKeyManagerDlg.cpp:1474 Src/wptKeyManagerDlg.cpp:1494
-#: Src/wptKeyManagerDlg.cpp:1524 Src/wptKeyManagerDlg.cpp:1562
-#: Src/wptKeyManagerDlg.cpp:1622 Src/wptKeyManagerDlg.cpp:1640
-#: Src/wptKeyManagerDlg.cpp:1645 Src/wptKeyManagerDlg.cpp:1650
-#: Src/wptKeyManagerDlg.cpp:1738 Src/wptKeyManagerDlg.cpp:1917
+#: Src/wptKeyManager.cpp:924 Src/wptKeyManagerDlg.cpp:1091
+#: Src/wptKeyManagerDlg.cpp:1108 Src/wptKeyManagerDlg.cpp:1389
+#: Src/wptKeyManagerDlg.cpp:1411 Src/wptKeyManagerDlg.cpp:1430
+#: Src/wptKeyManagerDlg.cpp:1438 Src/wptKeyManagerDlg.cpp:1448
+#: Src/wptKeyManagerDlg.cpp:1464 Src/wptKeyManagerDlg.cpp:1470
+#: Src/wptKeyManagerDlg.cpp:1483 Src/wptKeyManagerDlg.cpp:1503
+#: Src/wptKeyManagerDlg.cpp:1535 Src/wptKeyManagerDlg.cpp:1573
+#: Src/wptKeyManagerDlg.cpp:1633 Src/wptKeyManagerDlg.cpp:1651
+#: Src/wptKeyManagerDlg.cpp:1656 Src/wptKeyManagerDlg.cpp:1661
+#: Src/wptKeyManagerDlg.cpp:1749 Src/wptKeyManagerDlg.cpp:1928
#: 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:398 Src/wptMainProc.cpp:551 Src/wptMainProc.cpp:559
@@ -1977,20 +1981,20 @@
msgstr "Ungültige Benutzerkennung"
#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:539 Src/wptKeylist.cpp:547
-#: Src/wptKeyManagerDlg.cpp:862 Src/wptKeyManagerDlg.cpp:930
+#: Src/wptKeyManagerDlg.cpp:863 Src/wptKeyManagerDlg.cpp:931
#: Src/wptKeyserverSearchDlg.cpp:54 Src/wptSigList.cpp:51
#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
msgid "User ID"
msgstr "Benutzerkennung"
#: Src/wptImportList.cpp:353 Src/wptKeylist.cpp:541 Src/wptKeylist.cpp:550
-#: Src/wptKeyManagerDlg.cpp:865 Src/wptKeyserverSearchDlg.cpp:51
+#: Src/wptKeyManagerDlg.cpp:866 Src/wptKeyserverSearchDlg.cpp:51
msgid "Size"
msgstr "Größe"
#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:965 Src/wptKeylist.cpp:540
-#: Src/wptKeylist.cpp:548 Src/wptKeyManagerDlg.cpp:863
-#: Src/wptKeyManagerDlg.cpp:953 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:548 Src/wptKeyManagerDlg.cpp:864
+#: Src/wptKeyManagerDlg.cpp:954 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
#: Src/wptVerifyList.cpp:109
msgid "Key ID"
@@ -1998,13 +2002,13 @@
#: Src/wptImportList.cpp:355 Src/wptKeyEditDlgs.cpp:966
#: Src/wptKeyEditDlgs.cpp:1073 Src/wptKeylist.cpp:554
-#: Src/wptKeyManagerDlg.cpp:869 Src/wptKeyManagerDlg.cpp:956
+#: Src/wptKeyManagerDlg.cpp:870 Src/wptKeyManagerDlg.cpp:957
#: Src/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:54
msgid "Creation"
msgstr "Erstellung"
#: Src/wptImportList.cpp:356 Src/wptKeylist.cpp:549
-#: Src/wptKeyManagerDlg.cpp:864 Src/wptKeyManagerDlg.cpp:955
+#: Src/wptKeyManagerDlg.cpp:865 Src/wptKeyManagerDlg.cpp:956
msgid "Type"
msgstr "Typ"
@@ -2243,7 +2247,7 @@
#: Src/wptKeyEditDlgs.cpp:855 Src/wptKeyEditDlgs.cpp:868
#: Src/wptKeyEditDlgs.cpp:909 Src/wptKeyEditDlgs.cpp:1286
#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1419
-#: Src/wptKeyManagerDlg.cpp:1428
+#: Src/wptKeyManagerDlg.cpp:1437
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
@@ -2304,7 +2308,7 @@
msgstr "Kein(e) Unterschlüssel gefunden."
#: Src/wptKeyEditDlgs.cpp:1070 Src/wptKeylist.cpp:543 Src/wptKeylist.cpp:552
-#: Src/wptKeyManagerDlg.cpp:867
+#: Src/wptKeyManagerDlg.cpp:868
msgid "Validity"
msgstr "Gültigkeit"
@@ -2566,8 +2570,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:924
-#: Src/wptKeyManagerDlg.cpp:1689 Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyPropsDlg.cpp:291
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
#: Src/wptOwnertrustDlg.cpp:133
msgid "Ownertrust"
@@ -2590,7 +2594,7 @@
#: Src/wptKeygenDlg.cpp:421 Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:432
#: Src/wptKeygenDlg.cpp:439 Src/wptKeygenDlg.cpp:451 Src/wptKeygenDlg.cpp:458
#: Src/wptKeygenDlg.cpp:493 Src/wptKeygenDlg.cpp:586
-#: Src/wptKeyManagerDlg.cpp:1553 Src/wptPassphraseDlg.cpp:94
+#: Src/wptKeyManagerDlg.cpp:1564 Src/wptPassphraseDlg.cpp:94
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
@@ -2744,7 +2748,7 @@
#: Src/wptKeygenDlg.cpp:545 Src/wptKeygenDlg.cpp:567 Src/wptKeygenDlg.cpp:572
#: Src/wptKeygenDlg.cpp:578 Src/wptKeygenDlg.cpp:583 Src/wptKeygenDlg.cpp:607
-#: Src/wptKeyManagerDlg.cpp:1576
+#: Src/wptKeyManagerDlg.cpp:1587
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
@@ -2833,12 +2837,12 @@
msgid "Disabled"
msgstr "Inaktiv"
-#: Src/wptKeylist.cpp:542 Src/wptKeylist.cpp:551 Src/wptKeyManagerDlg.cpp:866
-#: Src/wptKeyManagerDlg.cpp:954
+#: Src/wptKeylist.cpp:542 Src/wptKeylist.cpp:551 Src/wptKeyManagerDlg.cpp:867
+#: Src/wptKeyManagerDlg.cpp:955
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:868
+#: Src/wptKeylist.cpp:553 Src/wptKeyManagerDlg.cpp:869
#: Src/wptVerifyList.cpp:100 Src/wptVerifyList.cpp:108
msgid "Trust"
msgstr "Vertrauen"
@@ -3028,7 +3032,7 @@
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
-#: Src/wptKeyManagerDlg.cpp:436 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:436 Src/wptKeyManagerDlg.cpp:975
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
@@ -3053,274 +3057,274 @@
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:919
+#: Src/wptKeyManagerDlg.cpp:920
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1119
+#: Src/wptKeyManagerDlg.cpp:921 Src/wptKeyManagerDlg.cpp:1121
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:923
+#: Src/wptKeyManagerDlg.cpp:924
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:925
+#: Src/wptKeyManagerDlg.cpp:926
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:926
+#: Src/wptKeyManagerDlg.cpp:927
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:927
+#: Src/wptKeyManagerDlg.cpp:928
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:928
+#: Src/wptKeyManagerDlg.cpp:929
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:929
+#: Src/wptKeyManagerDlg.cpp:930
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:931
+#: Src/wptKeyManagerDlg.cpp:932
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:932
+#: Src/wptKeyManagerDlg.cpp:933
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:935 Src/wptKeyManagerDlg.cpp:936
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:936 Src/wptKeyManagerDlg.cpp:937
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:937 Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:982
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:938 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:939 Src/wptKeyManagerDlg.cpp:978
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:939 Src/wptKeyManagerDlg.cpp:1469
+#: Src/wptKeyManagerDlg.cpp:940 Src/wptKeyManagerDlg.cpp:1478
#: Src/wptKeyTrustPathDlg.cpp:130
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:940
+#: Src/wptKeyManagerDlg.cpp:941
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:941
+#: Src/wptKeyManagerDlg.cpp:942
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:942 Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:943 Src/wptKeyManagerDlg.cpp:979
#: Src/wptKeysigDlg.cpp:392
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:946
+#: Src/wptKeyManagerDlg.cpp:947
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:947
+#: Src/wptKeyManagerDlg.cpp:948
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:948
+#: Src/wptKeyManagerDlg.cpp:949
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:949
+#: Src/wptKeyManagerDlg.cpp:950
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:950 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:951 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:969
+#: Src/wptKeyManagerDlg.cpp:970
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:971
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:971
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:973
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:973
+#: Src/wptKeyManagerDlg.cpp:974
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:984
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:985
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:986
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:987
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:988
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:988
+#: Src/wptKeyManagerDlg.cpp:989
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:991
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:991
+#: Src/wptKeyManagerDlg.cpp:992
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:993
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:994
msgid "Revoker..."
msgstr "Revoker..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:997
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:999
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1105
+#: Src/wptKeyManagerDlg.cpp:1107
msgid "Could not set keylist window procedure."
msgstr "Konnte \"keylist window procedure\" nicht setzen."
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1221
+#: Src/wptKeyManagerDlg.cpp:1223
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1225
+#: Src/wptKeyManagerDlg.cpp:1227
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1229
+#: Src/wptKeyManagerDlg.cpp:1231
msgid "Delete key from keyring"
msgstr "Schlüssel aus Keyring löschen"
-#: Src/wptKeyManagerDlg.cpp:1233
+#: Src/wptKeyManagerDlg.cpp:1235
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1237
+#: Src/wptKeyManagerDlg.cpp:1239
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1241
+#: Src/wptKeyManagerDlg.cpp:1243
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1245
+#: Src/wptKeyManagerDlg.cpp:1247
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1249
+#: Src/wptKeyManagerDlg.cpp:1251
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1253
+#: Src/wptKeyManagerDlg.cpp:1255
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1372
+#: Src/wptKeyManagerDlg.cpp:1374
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1379
+#: Src/wptKeyManagerDlg.cpp:1388
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1414 Src/wptKeysignDlg.cpp:230
+#: Src/wptKeyManagerDlg.cpp:1423 Src/wptKeysignDlg.cpp:230
#: Src/wptKeysignDlg.cpp:249 Src/wptKeysignDlg.cpp:326
#: Src/wptKeysignDlg.cpp:343 Src/wptKeysignDlg.cpp:348
msgid "Key Signing"
msgstr "Schlüsselsignierung"
-#: Src/wptKeyManagerDlg.cpp:1438
+#: Src/wptKeyManagerDlg.cpp:1447
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1450 Src/wptKeyRevokeDlg.cpp:72
+#: Src/wptKeyManagerDlg.cpp:1459 Src/wptKeyRevokeDlg.cpp:72
#: Src/wptKeyRevokeDlg.cpp:100 Src/wptKeyRevokeDlg.cpp:138
#: Src/wptKeyRevokeDlg.cpp:143 Src/wptKeyRevokeDlg.cpp:151
#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:173
msgid "Key Revocation Cert"
msgstr "Schlüsselwiderruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:1460
+#: Src/wptKeyManagerDlg.cpp:1469
msgid "It does not make any sense with a key pair!"
msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
-#: Src/wptKeyManagerDlg.cpp:1487
+#: Src/wptKeyManagerDlg.cpp:1496
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1508 Src/wptKeyPropsDlg.cpp:287
+#: Src/wptKeyManagerDlg.cpp:1517 Src/wptKeyPropsDlg.cpp:287
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1521
+#: Src/wptKeyManagerDlg.cpp:1532
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3329,31 +3333,31 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1561
+#: Src/wptKeyManagerDlg.cpp:1572
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1584 Src/wptKeyserverDlg.cpp:599
+#: Src/wptKeyManagerDlg.cpp:1595 Src/wptKeyserverDlg.cpp:599
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
-#: Src/wptKeyManagerDlg.cpp:1597
+#: Src/wptKeyManagerDlg.cpp:1608
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
-#: Src/wptKeyManagerDlg.cpp:1602
+#: Src/wptKeyManagerDlg.cpp:1613
msgid "Choose Name of the Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptKeyManagerDlg.cpp:1644
+#: Src/wptKeyManagerDlg.cpp:1655
msgid "There is no corresponding secret key for this key."
msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel vorhanden."
-#: Src/wptKeyManagerDlg.cpp:1649
+#: Src/wptKeyManagerDlg.cpp:1660
msgid "You can only export one secret key."
msgstr "Sie können nur einen geheimen Schlüssel exportieren."
-#: Src/wptKeyManagerDlg.cpp:1654
+#: Src/wptKeyManagerDlg.cpp:1665
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3371,11 +3375,11 @@
"\n"
"Wirklich den Schlüssel exportieren?"
-#: Src/wptKeyManagerDlg.cpp:1659
+#: Src/wptKeyManagerDlg.cpp:1670
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1737
+#: Src/wptKeyManagerDlg.cpp:1748
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
@@ -3462,7 +3466,7 @@
msgid "Ownertrust successfully changed."
msgstr "Besitzervertrauen erfolgreich geändert."
-#: Src/wptKeyPropsDlg.cpp:368 Src/wptKeyRevokersDlg.cpp:145
+#: Src/wptKeyPropsDlg.cpp:369 Src/wptKeyRevokersDlg.cpp:146
msgid "Key Revokers"
msgstr "Schlüsselwiderrufer"
@@ -3526,15 +3530,15 @@
msgid "Algorithm"
msgstr "Algorithmus"
-#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:158
+#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:159
msgid "Designated Key Revokers"
msgstr "\"Designated Key Revokers\""
-#: Src/wptKeyRevokersDlg.cpp:144
+#: Src/wptKeyRevokersDlg.cpp:145
msgid "Designated Revoker Keys"
msgstr "List der Schlüsselwiderrufer"
-#: Src/wptKeyRevokersDlg.cpp:159
+#: Src/wptKeyRevokersDlg.cpp:160
#, c-format
msgid "Do you want to retrieve 0x%s via the default keyserver?"
msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/ChangeLog 2006-01-19 16:10:37 UTC (rev 161)
@@ -1,3 +1,13 @@
+2006-01-19 Timo Schulz <ts at g10code.com>
+
+ * wptClipVerifyDlg.cpp (clip_verify_dlg_proc): Do not
+ reload the entire cache, just update the key.
+ * wptFileVerifyDlg.cpp (file_verify_dlg_proc): Likewise.
+ * wptKeyPropsDlg.cpp (keyprops_dlg_proc): Set update flag.
+ * wptKeyRevokersDlg.cpp (key_revokers_dlg_proc): Likewise.
+ * wptKeyManagerDlg.cpp (keymanager_dlg_proc): Update key
+ if need after showing the properties.
+
2006-01-18 Timo Schulz <ts at g10code.com>
* wptKeyEditCB.cpp (cmd_delsig_handler): Do not assume
Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptClipVerifyDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -212,7 +212,7 @@
port = default_keyserver_port;
}
if (!hkp_recv_key (dlg, kserv, port, keyid+8, 0, 0)) {
- keycache_reload (dlg);
+ keycache_update (0, keyid+8);
kc = keycache_get_ctx (KEYCACHE_PUB);
if (!kc)
BUG (dlg);
Modified: trunk/Src/wptErrors.cpp
===================================================================
--- trunk/Src/wptErrors.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptErrors.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -112,6 +112,7 @@
case WPTERR_GPG_EXEFILE:
case WPTERR_GPG_OPT_KEYRINGS:
case WPTERR_GPG_KEYRINGS: return gpg_strerror (errid);
+ case WPTERR_NODATA: return _("No data available");
case WPTERR_NOCARD: return _("There is no card in the reader");
case WPTERR_NOREADER: return _("There was no reader found");
case WPTERR_NOPGPCARD: return _("This is not an OpenPGP card");
Modified: trunk/Src/wptFileVerifyDlg.cpp
===================================================================
--- trunk/Src/wptFileVerifyDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptFileVerifyDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -82,7 +82,7 @@
if (rc == IDYES) {
if (!hkp_recv_key (dlg, default_keyserver,
default_keyserver_port, buf, 0, 0))
- keycache_reload (dlg);
+ keycache_update (0, buf);
}
}
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -34,6 +34,19 @@
#include "wptW32API.h"
+/* Enable all edit items if @val is TRUE, disable them otherwise. */
+static void
+enable_disable_items (HWND dlg, BOOL val)
+{
+ EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_EXEDIR), val);
+ EnableWindow (GetDlgItem (dlg, IDC_GPGREFS_EXEDLG), val);
+ EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_LOCALE), val);
+ EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_LOCDLG), val);
+ EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_HOMEDIR), val);
+ EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_HOMEDLG), val);
+}
+
+
/* Load the GPG4WIN default values and disabled the
dialog items to indicate these are fixed values.
Return value: true if GPG4win was found. */
@@ -142,10 +155,10 @@
SetDlgItemText (dlg, IDC_GPGPREFS_OVRDEFAULT, _("&Overwrite default settings"));
gpg4win = load_gpg4win_values (dlg);
- if (!gpg4win)
+ if (!gpg4win) {
load_registry_values (dlg);
- EnableWindow (GetDlgItem (dlg, IDC_GPGPREFS_OVRDEFAULT),
- gpg4win? TRUE : FALSE);
+ CheckDlgButton (dlg, IDC_GPGPREFS_OVRDEFAULT, BST_CHECKED);
+ }
p = get_gnupg_cfgfile ();
if (p) {
@@ -176,6 +189,15 @@
return FALSE;
case WM_COMMAND:
+ if (HIWORD (wparam) == BN_CLICKED &&
+ LOWORD (wparam) == IDC_GPGPREFS_OVRDEFAULT) {
+ if (IsDlgButtonChecked (dlg, LOWORD (wparam)))
+ enable_disable_items (dlg, TRUE);
+ else
+ enable_disable_items (dlg, FALSE);
+ break;
+ }
+
switch (LOWORD (wparam)) {
case IDC_GPGPREFS_SAVE:
if (!GetDlgItemText (dlg, IDC_GPGPREFS_HOMEDIR,
Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptKeyManager.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -445,12 +445,12 @@
if (!has_data) {
msg_box (dlg, _("No valid OpenPGP data found."),
_("Key Manager"), MB_ERR);
- return WPTERR_GENERAL;
+ return WPTERR_NODATA;
}
if (!(pgptype & PGP_PUBKEY) && !(pgptype & PGP_SECKEY)) {
msg_box (dlg, _("No valid OpenPGP keys found."),
_("Key Manager"), MB_ERR);
- return WPTERR_GENERAL;
+ return WPTERR_NODATA;
}
if (pgptype & PGP_DASH_ESCAPED) {
id = msg_box (dlg, _("The key you want to import is dash escacped.\n"
@@ -467,7 +467,7 @@
clip_import_dlg_proc, 0,
_("Key Import"), IDS_WINPT_IMPORT);
if (!has_data)
- return WPTERR_GENERAL;
+ return WPTERR_NODATA;
return 0;
}
@@ -584,7 +584,7 @@
gpgme_release (ctx);
free_if_alloc (fm_stat.opaque);
if (no_data)
- return WPTERR_GENERAL;
+ return WPTERR_NODATA;
return (int)err;
}
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -815,6 +815,7 @@
address of the pointer in the ListView control. */
get_pubkey (keyid, &key);
keylist_upd_key (lv, pos, key);
+ keyring_check_last_access ();
}
@@ -1049,6 +1050,7 @@
}
keylist_sort (kmi->lv, KEY_SORT_USERID);
update_status_bar (kmi->statbar, kmi->lv);
+ keyring_check_last_access ();
}
@@ -1371,6 +1373,13 @@
HMENU h = (HMENU)wparam;
set_menu_text_bypos (h, 0, _("New"));
}
+ /* XXX: before we can use it, we need to find a way to
+ update the gpg access timestamp after each operation.
+ if (keyring_check_last_access ()) {
+ keycache_reload (dlg);
+ keylist_reload (kmi->lv, keycache_get_ctx (1),
+ KEYLIST_LIST, KEY_SORT_USERID);
+ }*/
return FALSE;
case WM_COMMAND:
@@ -1510,6 +1519,8 @@
t = get_key_trust_str (k.callback.new_val);
listview_add_sub_item (kmi->lv, kmi->lv_idx, 6, t);
}
+ if (k.update)
+ refresh_keylist (kmi);
return TRUE;
case ID_KEYMISC_RECACHE:
Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptKeyPropsDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -363,9 +363,10 @@
return TRUE;
case IDC_KEYPROPS_REVOKERS:
- dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYREVOKERS, dlg,
- key_revokers_dlg_proc, (LPARAM)key,
- _("Key Revokers"), IDS_WINPT_KEY_REVOKERS);
+ k->update = dialog_box_param (
+ glob_hinst, (LPCTSTR)IDD_WINPT_KEYREVOKERS, dlg,
+ key_revokers_dlg_proc, (LPARAM)key,
+ _("Key Revokers"), IDS_WINPT_KEY_REVOKERS);
break;
}
}
Modified: trunk/Src/wptKeyRevokersDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokersDlg.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptKeyRevokersDlg.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -126,6 +126,7 @@
key_revokers_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
static listview_ctrl_t lv;
+ static int key_update = 0;
gpgme_key_t key;
char buf[128], keyid[32];
int rc;
@@ -162,7 +163,8 @@
rc = hkp_recv_key (dlg, default_keyserver,
default_keyserver_port, keyid, 0, 0);
if (!rc) {
- keycache_reload (dlg);
+ keycache_update (0, keyid);
+ key_update = 1;
if (get_pubkey (keyid, &key))
BUG (NULL);
if (key->uids && key->uids->name) {
@@ -192,7 +194,7 @@
case WM_COMMAND:
switch (LOWORD (wparam)) {
case IDOK:
- EndDialog (dlg, TRUE);
+ EndDialog (dlg, key_update);
break;
}
break;
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-01-19 09:22:09 UTC (rev 160)
+++ trunk/Src/wptKeylist.cpp 2006-01-19 16:10:37 UTC (rev 161)
@@ -643,7 +643,7 @@
keylist_reload (listview_ctrl_t lv, gpg_keycache_t pubkc, int mode, int sortby)
{
listview_del_all_items (lv);
- keylist_load_keycache( lv, mode, pubkc, NULL );
+ keylist_load_keycache (lv, mode, pubkc, NULL);
keylist_sort (lv, sortby);
return 0;
}
More information about the Winpt-commits
mailing list