[Winpt-commits] r160 - in trunk: . Po Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Jan 19 10:22:11 CET 2006
Author: twoaday
Date: 2006-01-19 10:22:09 +0100 (Thu, 19 Jan 2006)
New Revision: 160
Modified:
trunk/Po/ChangeLog
trunk/Po/de.po
trunk/Src/ChangeLog
trunk/Src/wptKeyEditCB.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManager.cpp
trunk/Src/wptPassphraseCB.cpp
trunk/THANKS
trunk/TODO
Log:
2006-01-18 Timo Schulz <ts at g10code.com>
* wptKeyEditCB.cpp (cmd_delsig_handler): Do not assume
the self sig is always index 0. Noted by Kurt.
* wptPassphraseCB.cpp (passphrase_dlg_proc): Do not assume
the key user-ID contains an email address.
* wptKeyEditDlgs.cpp (do_find_userid): Likewise.
(do_editkey_deluid): Likewise.
(do_editkey_revuid): Likewise.
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Po/ChangeLog 2006-01-19 09:22:09 UTC (rev 160)
@@ -2,6 +2,7 @@
* de.po: Always use one translation for "email address".
Noted by Ralf.
+ Fixed wrong translation for "revoke" confirmation.
2006-01-16 Timo Schulz <ts at g10code.com>
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Po/de.po 2006-01-19 09:22:09 UTC (rev 160)
@@ -1,7 +1,7 @@
# WinPT - German translation file
# Copyright (C)
-# Timo Schulz <ts at winpt.org>, 2002, 2004, 2005
-# g10 Code GmbH <twoaday at g10code.de>, 2005
+# Timo Schulz <twoaday at freakmail.de>, 2002, 2004, 2005, 2006
+# g10 Code GmbH <twoaday at g10code.de>, 2005, 2006
# Thomas Henlich <henlich at mmers1.mw.tu-dresden.de>, 2001
# Ralf Kreutzmann <ralf.kreutzmann at equipmente.de>, 2004,2005
#
@@ -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 13:44+0100\n"
+"POT-Creation-Date: 2006-01-18 22:39+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"
@@ -57,7 +57,7 @@
msgid "Failed to create WinPT directory"
msgstr "Konnte WinPT Verzeichnis nicht erstellen"
-#: Src/WinPT.cpp:246 Src/WinPT.cpp:260 Src/WinPT.cpp:264 Src/WinPT.cpp:275
+#: Src/WinPT.cpp:246 Src/WinPT.cpp:264 Src/WinPT.cpp:275
#: Src/wptKeyManagerDlg.cpp:945 Src/wptKeyserver.cpp:537
#: Src/wptKeyserverDlg.cpp:66 Src/wptKeyserverDlg.cpp:196
#: Src/wptKeyserverDlg.cpp:204 Src/wptKeyserverDlg.cpp:220
@@ -71,11 +71,6 @@
msgid "Keyserver"
msgstr "Schlüsselserver"
-#: Src/WinPT.cpp:261
-#, c-format
-msgid "keyserver.conf will be copied to \"%s\"\r\n"
-msgstr "keyserver.conf wird nach \"%s\" kopiert\r\n"
-
#: Src/WinPT.cpp:263
msgid "Failed to copy the keyserver.conf"
msgstr "Das Kopieren der keyserver.conf ist fehlgeschlagen"
@@ -240,7 +235,7 @@
msgstr "Über &GPG"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:116 Src/wptKeyEditDlgs.cpp:1802
+#: Src/wptAboutDlgs.cpp:116 Src/wptKeyEditDlgs.cpp:1829
#: Src/wptKeyManagerDlg.cpp:951
msgid "&Help"
msgstr "&Hilfe"
@@ -326,7 +321,7 @@
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:463
+#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:482
msgid "&Name"
msgstr "&Name"
@@ -342,7 +337,7 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:601 Src/wptKeygenDlg.cpp:382
+#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:620 Src/wptKeygenDlg.cpp:382
msgid "&Never"
msgstr "&Niemals"
@@ -387,7 +382,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1295
+#: Src/wptCardDlg.cpp:683 Src/wptKeyEditDlgs.cpp:1314
msgid "The date you have chosen lies in the past."
msgstr "Das gewählte Datum ist in der Vergangenheit."
@@ -486,7 +481,7 @@
#: Src/wptClipDecryptDlg.cpp:164 Src/wptClipEncryptDlg.cpp:206
#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:229
#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:329
-#: Src/wptKeyManager.cpp:699 Src/wptKeyManager.cpp:894 Src/wptSymEnc.cpp:90
+#: Src/wptKeyManager.cpp:701 Src/wptKeyManager.cpp:896 Src/wptSymEnc.cpp:90
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
@@ -590,7 +585,7 @@
msgid "Add quotes"
msgstr "'>' hinzufügen"
-#: Src/wptClipEditDlg.cpp:202 Src/wptKeyEditDlgs.cpp:1801
+#: Src/wptClipEditDlg.cpp:202 Src/wptKeyEditDlgs.cpp:1828
#: Src/wptKeyserverDlg.cpp:608 Src/wptMDSumDlg.cpp:104
#: Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
@@ -616,8 +611,8 @@
#: Src/wptCommonDlg.cpp:68 Src/wptFileManagerDlg.cpp:84
#: Src/wptFileManagerDlg.cpp:215 Src/wptFileManagerDlg.cpp:277
#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:51
-#: Src/wptKeyEditDlgs.cpp:291 Src/wptKeyEditDlgs.cpp:391
-#: Src/wptKeyEditDlgs.cpp:466 Src/wptKeyEditDlgs.cpp:602
+#: Src/wptKeyEditDlgs.cpp:310 Src/wptKeyEditDlgs.cpp:410
+#: Src/wptKeyEditDlgs.cpp:485 Src/wptKeyEditDlgs.cpp:621
#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:383
#: Src/wptKeygenDlg.cpp:546 Src/wptKeyRevokeDlg.cpp:101
#: Src/wptKeyserverDlg.cpp:542 Src/wptKeyserverSearchDlg.cpp:68
@@ -785,29 +780,29 @@
msgid "Please enter a valid URL."
msgstr "Bitte eine gültige URL eingeben."
-#: Src/wptCommonDlg.cpp:124 Src/wptKeyEditDlgs.cpp:713
-#: Src/wptKeyEditDlgs.cpp:771 Src/wptKeyEditDlgs.cpp:809
-#: Src/wptKeyEditDlgs.cpp:821 Src/wptKeyEditDlgs.cpp:890
-#: Src/wptKeyEditDlgs.cpp:897 Src/wptKeyEditDlgs.cpp:915
-#: Src/wptKeyEditDlgs.cpp:962 Src/wptKeyEditDlgs.cpp:969
-#: Src/wptKeyEditDlgs.cpp:1060 Src/wptKeyEditDlgs.cpp:1066
-#: Src/wptKeyEditDlgs.cpp:1218 Src/wptKeyEditDlgs.cpp:1222
-#: Src/wptKeyEditDlgs.cpp:1226 Src/wptKeyEditDlgs.cpp:1231
-#: Src/wptKeyEditDlgs.cpp:1267 Src/wptKeyEditDlgs.cpp:1271
-#: Src/wptKeyEditDlgs.cpp:1281 Src/wptKeyEditDlgs.cpp:1296
-#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1340
-#: Src/wptKeyEditDlgs.cpp:1345 Src/wptKeyEditDlgs.cpp:1352
-#: Src/wptKeyEditDlgs.cpp:1358 Src/wptKeyEditDlgs.cpp:1363
-#: Src/wptKeyEditDlgs.cpp:1404 Src/wptKeyEditDlgs.cpp:1409
-#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1422
-#: Src/wptKeyEditDlgs.cpp:1425 Src/wptKeyEditDlgs.cpp:1462
-#: Src/wptKeyEditDlgs.cpp:1470 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1512 Src/wptKeyEditDlgs.cpp:1610
-#: Src/wptKeyEditDlgs.cpp:1643 Src/wptKeyEditDlgs.cpp:1668
-#: Src/wptKeyEditDlgs.cpp:1672 Src/wptKeyEditDlgs.cpp:1681
-#: Src/wptKeyEditDlgs.cpp:1782 Src/wptKeyEditDlgs.cpp:1792
-#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1832
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptCommonDlg.cpp:124 Src/wptKeyEditDlgs.cpp:732
+#: Src/wptKeyEditDlgs.cpp:790 Src/wptKeyEditDlgs.cpp:828
+#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:909
+#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeyEditDlgs.cpp:934
+#: Src/wptKeyEditDlgs.cpp:981 Src/wptKeyEditDlgs.cpp:988
+#: Src/wptKeyEditDlgs.cpp:1079 Src/wptKeyEditDlgs.cpp:1085
+#: Src/wptKeyEditDlgs.cpp:1237 Src/wptKeyEditDlgs.cpp:1241
+#: Src/wptKeyEditDlgs.cpp:1245 Src/wptKeyEditDlgs.cpp:1250
+#: Src/wptKeyEditDlgs.cpp:1286 Src/wptKeyEditDlgs.cpp:1290
+#: Src/wptKeyEditDlgs.cpp:1300 Src/wptKeyEditDlgs.cpp:1315
+#: Src/wptKeyEditDlgs.cpp:1319 Src/wptKeyEditDlgs.cpp:1359
+#: Src/wptKeyEditDlgs.cpp:1364 Src/wptKeyEditDlgs.cpp:1371
+#: Src/wptKeyEditDlgs.cpp:1377 Src/wptKeyEditDlgs.cpp:1382
+#: Src/wptKeyEditDlgs.cpp:1425 Src/wptKeyEditDlgs.cpp:1430
+#: Src/wptKeyEditDlgs.cpp:1437 Src/wptKeyEditDlgs.cpp:1444
+#: Src/wptKeyEditDlgs.cpp:1447 Src/wptKeyEditDlgs.cpp:1485
+#: Src/wptKeyEditDlgs.cpp:1493 Src/wptKeyEditDlgs.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:1535 Src/wptKeyEditDlgs.cpp:1634
+#: Src/wptKeyEditDlgs.cpp:1667 Src/wptKeyEditDlgs.cpp:1694
+#: 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
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -826,7 +821,7 @@
msgstr "&Nein"
#: Src/wptCommonDlg.cpp:215 Src/wptKeyEditDlgs.cpp:210
-#: Src/wptKeyEditDlgs.cpp:1026
+#: Src/wptKeyEditDlgs.cpp:1045
msgid "OK"
msgstr "OK"
@@ -1139,12 +1134,12 @@
"\n"
"Möchten Sie die Kompression ausschalten?"
-#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:949
+#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:968
#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
msgid "Status"
msgstr "Status"
-#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1052
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1071
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:73
#: Src/wptVerifyList.cpp:97
msgid "Name"
@@ -1299,8 +1294,8 @@
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
-#: Src/wptFileManager.cpp:1714 Src/wptKeyEditDlgs.cpp:930
-#: Src/wptKeyEditDlgs.cpp:1248 Src/wptKeyEditDlgs.cpp:1319
+#: Src/wptFileManager.cpp:1714 Src/wptKeyEditDlgs.cpp:949
+#: Src/wptKeyEditDlgs.cpp:1267 Src/wptKeyEditDlgs.cpp:1338
#: Src/wptKeyserverDlg.cpp:106
msgid "GnuPG status"
msgstr "GnuPG Status"
@@ -1397,10 +1392,10 @@
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:322 Src/wptKeyEditDlgs.cpp:1222
-#: Src/wptKeyEditDlgs.cpp:1271 Src/wptKeyEditDlgs.cpp:1345
-#: Src/wptKeyManager.cpp:617 Src/wptKeyManager.cpp:718
-#: Src/wptKeyManager.cpp:755 Src/wptKeyManagerDlg.cpp:1401
+#: 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
@@ -1650,7 +1645,7 @@
#: 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:1617 Src/wptKeyManagerDlg.cpp:944
+#: Src/wptKeyEditDlgs.cpp:1641 Src/wptKeyManagerDlg.cpp:944
#: Src/wptMainProc.cpp:430 Src/wptPreferencesDlg.cpp:209
#: Src/wptPreferencesDlg.cpp:252 Src/wptPreferencesDlg.cpp:263
#: Src/wptPreferencesDlg.cpp:275 Src/wptPreferencesDlg.cpp:308
@@ -1930,14 +1925,14 @@
#: Src/wptKeyManager.cpp:444 Src/wptKeyManager.cpp:447
#: Src/wptKeyManager.cpp:452 Src/wptKeyManager.cpp:458
#: Src/wptKeyManager.cpp:463 Src/wptKeyManager.cpp:551
-#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:617
-#: Src/wptKeyManager.cpp:646 Src/wptKeyManager.cpp:656
-#: Src/wptKeyManager.cpp:667 Src/wptKeyManager.cpp:693
-#: Src/wptKeyManager.cpp:718 Src/wptKeyManager.cpp:725
-#: Src/wptKeyManager.cpp:750 Src/wptKeyManager.cpp:755
-#: Src/wptKeyManager.cpp:783 Src/wptKeyManager.cpp:825
-#: Src/wptKeyManager.cpp:832 Src/wptKeyManager.cpp:892
-#: Src/wptKeyManager.cpp:922 Src/wptKeyManagerDlg.cpp:1089
+#: Src/wptKeyManager.cpp:559 Src/wptKeyManager.cpp:619
+#: Src/wptKeyManager.cpp:648 Src/wptKeyManager.cpp:658
+#: Src/wptKeyManager.cpp:669 Src/wptKeyManager.cpp:695
+#: Src/wptKeyManager.cpp:720 Src/wptKeyManager.cpp:727
+#: 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
@@ -1954,16 +1949,16 @@
msgstr "Schlüsselverwaltung"
#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:206
-#: Src/wptKeyEditDlgs.cpp:1024 Src/wptKeyEditDlgs.cpp:1085
-#: Src/wptKeyEditDlgs.cpp:1357 Src/wptKeyEditDlgs.cpp:1377
-#: Src/wptKeyEditDlgs.cpp:1414 Src/wptKeyEditDlgs.cpp:1443
+#: Src/wptKeyEditDlgs.cpp:1043 Src/wptKeyEditDlgs.cpp:1104
+#: Src/wptKeyEditDlgs.cpp:1376 Src/wptKeyEditDlgs.cpp:1396
+#: Src/wptKeyEditDlgs.cpp:1435 Src/wptKeyEditDlgs.cpp:1466
#: Src/wptKeylist.cpp:392 Src/wptKeyPropsDlg.cpp:161 Src/wptKeysigDlg.cpp:143
#: Src/wptKeysigDlg.cpp:208
msgid "Revoked"
msgstr "Widerrufen"
#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:208
-#: Src/wptKeyEditDlgs.cpp:1022 Src/wptKeyEditDlgs.cpp:1278
+#: Src/wptKeyEditDlgs.cpp:1041 Src/wptKeyEditDlgs.cpp:1297
#: Src/wptKeylist.cpp:394 Src/wptKeyPropsDlg.cpp:158 Src/wptKeysigDlg.cpp:142
#: Src/wptKeysigDlg.cpp:209
msgid "Expired"
@@ -1977,7 +1972,7 @@
msgid "public key"
msgstr "öffentlicher Schlüssel"
-#: Src/wptImportList.cpp:303 Src/wptKeyEditDlgs.cpp:1102
+#: Src/wptImportList.cpp:303 Src/wptKeyEditDlgs.cpp:1121
msgid "Invalid user ID"
msgstr "Ungültige Benutzerkennung"
@@ -1993,7 +1988,7 @@
msgid "Size"
msgstr "Größe"
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:946 Src/wptKeylist.cpp:540
+#: 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/wptKeyserverSearchDlg.cpp:52 Src/wptSigList.cpp:55
@@ -2001,8 +1996,8 @@
msgid "Key ID"
msgstr "Schlüssel-ID"
-#: Src/wptImportList.cpp:355 Src/wptKeyEditDlgs.cpp:947
-#: Src/wptKeyEditDlgs.cpp:1054 Src/wptKeylist.cpp:554
+#: 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/wptKeyserverSearchDlg.cpp:53 Src/wptSigList.cpp:54
msgid "Creation"
@@ -2043,16 +2038,16 @@
msgid "Ultimate"
msgstr "Absolut"
-#: Src/wptKeyEditDlgs.cpp:194 Src/wptKeyEditDlgs.cpp:1019
+#: Src/wptKeyEditDlgs.cpp:194 Src/wptKeyEditDlgs.cpp:1038
#: Src/wptKeylist.cpp:235 Src/wptKeylist.cpp:354
msgid "Never"
msgstr "Niemals"
-#: Src/wptKeyEditDlgs.cpp:232
+#: Src/wptKeyEditDlgs.cpp:234
msgid "user ID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:233
+#: Src/wptKeyEditDlgs.cpp:235
#, c-format
msgid ""
"Could not get key information for: \"%s\":\n"
@@ -2062,7 +2057,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:258
-#: Src/wptKeyEditDlgs.cpp:288
+#: Src/wptKeyEditDlgs.cpp:307
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
@@ -2073,7 +2068,7 @@
"240x288 grosses Bild ist eine gute Größe."
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:259
-#: Src/wptKeyEditDlgs.cpp:289
+#: Src/wptKeyEditDlgs.cpp:308
msgid ""
"Pick an image to use for your photo ID.\n"
"The image must be a JPEG file."
@@ -2081,39 +2076,39 @@
"Bitte ein Bild auswaehlen fuer die photo ID.\n"
"Das Bild muss eine JPEG Datei sein."
-#: Src/wptKeyEditDlgs.cpp:290 Src/wptKeyEditDlgs.cpp:390
+#: Src/wptKeyEditDlgs.cpp:309 Src/wptKeyEditDlgs.cpp:409
#: Src/wptKeysignDlg.cpp:257
msgid "Passphrase"
msgstr "Passwort"
-#: Src/wptKeyEditDlgs.cpp:292
+#: Src/wptKeyEditDlgs.cpp:311
msgid "Add Photo ID"
msgstr "Photo ID hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:308
+#: Src/wptKeyEditDlgs.cpp:327
msgid "Select Image File"
msgstr "Bilddatei auswählen"
-#: Src/wptKeyEditDlgs.cpp:309
+#: Src/wptKeyEditDlgs.cpp:328
msgid "JPEG Files (*.jpg, *.jpeg)"
msgstr ""
-#: Src/wptKeyEditDlgs.cpp:312 Src/wptKeyEditDlgs.cpp:322
-#: Src/wptKeyEditDlgs.cpp:328 Src/wptKeyEditDlgs.cpp:334
-#: Src/wptKeyEditDlgs.cpp:346 Src/wptKeyEditDlgs.cpp:836
+#: Src/wptKeyEditDlgs.cpp:331 Src/wptKeyEditDlgs.cpp:341
+#: Src/wptKeyEditDlgs.cpp:347 Src/wptKeyEditDlgs.cpp:353
+#: Src/wptKeyEditDlgs.cpp:365 Src/wptKeyEditDlgs.cpp:855
msgid "Add Photo"
msgstr "Foto hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:313
+#: Src/wptKeyEditDlgs.cpp:332
#, c-format
msgid "'%s' is not a valid JPEG file."
msgstr "'%s' is keine gültige JPEG Datei."
-#: Src/wptKeyEditDlgs.cpp:322 Src/wptKeyRevokeDlg.cpp:142
+#: Src/wptKeyEditDlgs.cpp:341 Src/wptKeyRevokeDlg.cpp:142
msgid "Please enter a file name."
msgstr "Bitte Dateinamen eingeben."
-#: Src/wptKeyEditDlgs.cpp:326
+#: Src/wptKeyEditDlgs.cpp:345
msgid ""
"The JPEG is really large.\n"
"Are you sure you want to use it?"
@@ -2121,18 +2116,18 @@
"Das JPEG ist sehr groß.\n"
"Sind Sie sicher, dass Sie es benutzen wollen?"
-#: Src/wptKeyEditDlgs.cpp:334
+#: Src/wptKeyEditDlgs.cpp:353
msgid "Please enter a passphrase."
msgstr "Bitte ein Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:351
+#: Src/wptKeyEditDlgs.cpp:370
msgid "Photo successfully added."
msgstr "Foto erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:352 Src/wptKeyEditDlgs.cpp:431
-#: Src/wptKeyEditDlgs.cpp:513 Src/wptKeyEditDlgs.cpp:680
-#: Src/wptKeyEditDlgs.cpp:1379 Src/wptKeyEditDlgs.cpp:1445
-#: Src/wptKeyEditDlgs.cpp:1525 Src/wptKeyEditDlgs.cpp:1699
+#: Src/wptKeyEditDlgs.cpp:371 Src/wptKeyEditDlgs.cpp:450
+#: Src/wptKeyEditDlgs.cpp:532 Src/wptKeyEditDlgs.cpp:699
+#: Src/wptKeyEditDlgs.cpp:1398 Src/wptKeyEditDlgs.cpp:1468
+#: Src/wptKeyEditDlgs.cpp:1548 Src/wptKeyEditDlgs.cpp:1726
#: Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:612
#: Src/wptKeyPropsDlg.cpp:356 Src/wptOwnertrustDlg.cpp:124
#: Src/wptOwnertrustDlg.cpp:136
@@ -2140,127 +2135,127 @@
msgstr "GnuPG-Status"
# c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:350
-#: Src/wptKeyEditDlgs.cpp:388
+#: Src/wptKeyEditDlgs.cpp:407
msgid "Appointing a key as designated revoker cannot be undone."
msgstr ""
"Hinzufügen eines \"Revokers\" kann nicht mehr\n"
"rückgängig gemacht werden."
-#: Src/wptKeyEditDlgs.cpp:389
+#: Src/wptKeyEditDlgs.cpp:408
msgid "Public key"
msgstr "öff. Schlüssel"
-#: Src/wptKeyEditDlgs.cpp:392 Src/wptKeyEditDlgs.cpp:408
-#: Src/wptKeyEditDlgs.cpp:414 Src/wptKeyEditDlgs.cpp:425
-#: Src/wptKeyEditDlgs.cpp:849
+#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:427
+#: Src/wptKeyEditDlgs.cpp:433 Src/wptKeyEditDlgs.cpp:444
+#: Src/wptKeyEditDlgs.cpp:868
msgid "Add Revoker"
msgstr "\"Revoker\" hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:408 Src/wptKeyEditDlgs.cpp:1409
-#: Src/wptKeyEditDlgs.cpp:1462 Src/wptKeyEditDlgs.cpp:1504
-#: Src/wptKeyEditDlgs.cpp:1643 Src/wptKeyEditDlgs.cpp:1672
+#: Src/wptKeyEditDlgs.cpp:427 Src/wptKeyEditDlgs.cpp:1430
+#: Src/wptKeyEditDlgs.cpp:1485 Src/wptKeyEditDlgs.cpp:1527
+#: Src/wptKeyEditDlgs.cpp:1667 Src/wptKeyEditDlgs.cpp:1698
msgid "Please select a user ID."
msgstr "Bitte eine Benutzerkennung wählen."
-#: Src/wptKeyEditDlgs.cpp:414 Src/wptKeygenDlg.cpp:457
+#: Src/wptKeyEditDlgs.cpp:433 Src/wptKeygenDlg.cpp:457
#: Src/wptKeyRevokeDlg.cpp:150
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeyEditDlgs.cpp:430
+#: Src/wptKeyEditDlgs.cpp:449
msgid "Revoker successfully addded."
-msgstr "Widerruf erfolgreich hinzugefügt."
+msgstr "Widerrufer erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:462
+#: Src/wptKeyEditDlgs.cpp:481
msgid "Add new User ID"
msgstr "Neue Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:464
+#: Src/wptKeyEditDlgs.cpp:483
msgid "&Email"
msgstr "&E-Mail"
-#: Src/wptKeyEditDlgs.cpp:465
+#: Src/wptKeyEditDlgs.cpp:484
msgid "&Comment"
msgstr "&Kommentar"
-#: Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:500
msgid "Please enter a name (min. 5 chars.)"
msgstr "Bitte Namen eingeben (mindestens 5 Zeichen)"
-#: Src/wptKeyEditDlgs.cpp:481 Src/wptKeyEditDlgs.cpp:485
-#: Src/wptKeyEditDlgs.cpp:490 Src/wptKeyEditDlgs.cpp:494
-#: Src/wptKeyEditDlgs.cpp:511
+#: Src/wptKeyEditDlgs.cpp:500 Src/wptKeyEditDlgs.cpp:504
+#: Src/wptKeyEditDlgs.cpp:509 Src/wptKeyEditDlgs.cpp:513
+#: Src/wptKeyEditDlgs.cpp:530
msgid "UserID"
msgstr "Benutzerkennung"
-#: Src/wptKeyEditDlgs.cpp:485
+#: Src/wptKeyEditDlgs.cpp:504
msgid ""
"Please enter the email address in the email field and not in the name field"
msgstr ""
"Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
-#: Src/wptKeyEditDlgs.cpp:490
+#: Src/wptKeyEditDlgs.cpp:509
msgid "Please enter an email address."
msgstr "Bitte eine E-Mail-Adresse eingeben."
-#: Src/wptKeyEditDlgs.cpp:494
+#: Src/wptKeyEditDlgs.cpp:513
msgid "Invalid email address."
msgstr "Ungültige E-Mail-Adresse"
-#: Src/wptKeyEditDlgs.cpp:513
+#: Src/wptKeyEditDlgs.cpp:532
msgid "user ID successfully added."
msgstr "Benutzerkennung erfolgreich hinzugefügt"
-#: Src/wptKeyEditDlgs.cpp:597 Src/wptKeyEditDlgs.cpp:784
+#: Src/wptKeyEditDlgs.cpp:616 Src/wptKeyEditDlgs.cpp:803
msgid "Add new Subkey"
msgstr "Neuen Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:598
+#: Src/wptKeyEditDlgs.cpp:617
msgid "Key type"
msgstr "Schlüssel Typ"
-#: Src/wptKeyEditDlgs.cpp:599
+#: Src/wptKeyEditDlgs.cpp:618
msgid "Size in bits"
msgstr "Größe in Bits"
-#: Src/wptKeyEditDlgs.cpp:600
+#: Src/wptKeyEditDlgs.cpp:619
msgid "Key expiration"
msgstr "Key Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:645
+#: Src/wptKeyEditDlgs.cpp:664
msgid "Please select one entry."
msgstr "Bitte einen Eintrag wählen."
-#: Src/wptKeyEditDlgs.cpp:645 Src/wptKeyEditDlgs.cpp:651
-#: Src/wptKeyEditDlgs.cpp:678 Src/wptKeyEditDlgs.cpp:767
+#: Src/wptKeyEditDlgs.cpp:664 Src/wptKeyEditDlgs.cpp:670
+#: Src/wptKeyEditDlgs.cpp:697 Src/wptKeyEditDlgs.cpp:786
msgid "Add Subkey"
msgstr "Unterschlüssel hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:650
+#: Src/wptKeyEditDlgs.cpp:669
msgid "DSS uses a fixed keysize of 1024. Size changed."
msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
-#: Src/wptKeyEditDlgs.cpp:680
+#: Src/wptKeyEditDlgs.cpp:699
msgid "Subkey successfully added."
msgstr "Unterschlüssel erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:708 Src/wptKeyEditDlgs.cpp:767
-#: Src/wptKeyEditDlgs.cpp:836 Src/wptKeyEditDlgs.cpp:849
-#: Src/wptKeyEditDlgs.cpp:890 Src/wptKeyEditDlgs.cpp:1267
-#: Src/wptKeyEditDlgs.cpp:1340 Src/wptKeyEditDlgs.cpp:1399
+#: Src/wptKeyEditDlgs.cpp:727 Src/wptKeyEditDlgs.cpp:786
+#: 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
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
-#: Src/wptKeyEditDlgs.cpp:708 Src/wptKeyEditDlgs.cpp:724
+#: Src/wptKeyEditDlgs.cpp:727 Src/wptKeyEditDlgs.cpp:743
msgid "Add user ID"
msgstr "Benutzerkennung hinzufügen"
-#: Src/wptKeyEditDlgs.cpp:821
+#: Src/wptKeyEditDlgs.cpp:840
msgid "Preferred keyserver successfully set."
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
-#: Src/wptKeyEditDlgs.cpp:895
+#: Src/wptKeyEditDlgs.cpp:914
msgid ""
"Cannot change passphrase because the key\n"
"is protected with the IDEA encryption algorithm."
@@ -2268,15 +2263,15 @@
"Kann das Passwort das Schlüssels nicht ändern, da der \n"
"Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
-#: Src/wptKeyEditDlgs.cpp:902
+#: Src/wptKeyEditDlgs.cpp:921
msgid "Current (old) Passphrase"
msgstr "Aktuelles (altes) Passwort"
-#: Src/wptKeyEditDlgs.cpp:906
+#: Src/wptKeyEditDlgs.cpp:925
msgid "New Passphrase"
msgstr "Neues Passwort"
-#: Src/wptKeyEditDlgs.cpp:913 Src/wptPassphraseDlg.cpp:174
+#: Src/wptKeyEditDlgs.cpp:932 Src/wptPassphraseDlg.cpp:174
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters."
@@ -2284,44 +2279,44 @@
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
-#: Src/wptKeyEditDlgs.cpp:928
+#: Src/wptKeyEditDlgs.cpp:947
msgid "Change Passwd"
msgstr "Passwort ändern"
-#: Src/wptKeyEditDlgs.cpp:930
+#: Src/wptKeyEditDlgs.cpp:949
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:945
+#: Src/wptKeyEditDlgs.cpp:964
msgid "Description"
msgstr "Beschreibung"
-#: Src/wptKeyEditDlgs.cpp:948
+#: Src/wptKeyEditDlgs.cpp:967
msgid "Expires"
msgstr "Verfällt"
-#: Src/wptKeyEditDlgs.cpp:962 Src/wptKeyEditDlgs.cpp:1060
+#: Src/wptKeyEditDlgs.cpp:981 Src/wptKeyEditDlgs.cpp:1079
msgid "Could not find key."
msgstr "Konnte Schlüssel nicht finden"
-#: Src/wptKeyEditDlgs.cpp:969
+#: Src/wptKeyEditDlgs.cpp:988
msgid "No subkey(s) found."
msgstr "Kein(e) Unterschlüssel gefunden."
-#: Src/wptKeyEditDlgs.cpp:1051 Src/wptKeylist.cpp:543 Src/wptKeylist.cpp:552
+#: Src/wptKeyEditDlgs.cpp:1070 Src/wptKeylist.cpp:543 Src/wptKeylist.cpp:552
#: Src/wptKeyManagerDlg.cpp:867
msgid "Validity"
msgstr "Gültigkeit"
-#: Src/wptKeyEditDlgs.cpp:1053
+#: Src/wptKeyEditDlgs.cpp:1072
msgid "Email"
msgstr "Email"
-#: Src/wptKeyEditDlgs.cpp:1066
+#: Src/wptKeyEditDlgs.cpp:1085
msgid "No user ID(s) found."
msgstr "Keine Benutzerkennung(en) gefunden."
-#: Src/wptKeyEditDlgs.cpp:1181
+#: Src/wptKeyEditDlgs.cpp:1200
msgid ""
"ADDUID \t\tadd a user ID\r\n"
"ADDPHOTO \t\tadd a photo ID\r\n"
@@ -2356,19 +2351,19 @@
"ENABLE \t\tSchlüssel aktivieren\r\n"
"SHOWPHOTO \t\tFoto ID anzeigen\r\n"
-#: Src/wptKeyEditDlgs.cpp:1202
+#: Src/wptKeyEditDlgs.cpp:1221
msgid "Key Edit Help"
msgstr "Hilfe zum Schlüssel bearbeiten"
-#: Src/wptKeyEditDlgs.cpp:1218
+#: Src/wptKeyEditDlgs.cpp:1237
msgid "Primary key can not be deleted!"
msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1226
+#: Src/wptKeyEditDlgs.cpp:1245
msgid "Primary subkey can not be deleted!"
msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1232
+#: Src/wptKeyEditDlgs.cpp:1251
#, c-format
msgid ""
"\"Subkey %s.\"\n"
@@ -2385,15 +2380,15 @@
"\n"
"Möchten Sie diesen Unterschlüssel wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1244
+#: Src/wptKeyEditDlgs.cpp:1263
msgid "Delete Subkey"
msgstr "Unterschlüssel löschen"
-#: Src/wptKeyEditDlgs.cpp:1248
+#: Src/wptKeyEditDlgs.cpp:1267
msgid "Subkey successfully deleted."
msgstr "Unterschlüssel erfolgreich gelöscht."
-#: Src/wptKeyEditDlgs.cpp:1279
+#: Src/wptKeyEditDlgs.cpp:1298
msgid ""
"Key already expired.\n"
"\n"
@@ -2403,19 +2398,19 @@
"\n"
"Wollen Sie das Ablaufdatum ändern?"
-#: Src/wptKeyEditDlgs.cpp:1288 Src/wptKeyEditDlgs.cpp:1291
+#: Src/wptKeyEditDlgs.cpp:1307 Src/wptKeyEditDlgs.cpp:1310
msgid "Key Expiration Date"
msgstr "Ablaufdatum"
-#: Src/wptKeyEditDlgs.cpp:1312
+#: Src/wptKeyEditDlgs.cpp:1331
msgid "Expire Subkey"
msgstr "Untschlüssel Ablauf"
-#: Src/wptKeyEditDlgs.cpp:1318
+#: Src/wptKeyEditDlgs.cpp:1337
msgid "Subkey expire date successfully set."
msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
-#: Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptKeyEditDlgs.cpp:1368
msgid ""
"No subkeys were found, if you want to revoke the\n"
"whole key, please use the Key Manager command directly.\n"
@@ -2427,31 +2422,31 @@
"\n"
"Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
-#: Src/wptKeyEditDlgs.cpp:1358
+#: Src/wptKeyEditDlgs.cpp:1377
msgid "Key already revoked."
-msgstr "Der Schlüssel ist bereits widerrufen worden!"
+msgstr "Der Schlüssel ist bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1375
+#: Src/wptKeyEditDlgs.cpp:1394
msgid "Revoke Subkey"
msgstr "Unterschlüssel widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1379
+#: Src/wptKeyEditDlgs.cpp:1398
msgid "Subkey successfully revoked."
msgstr "Unterschlüssel erfolgreich widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1399
+#: Src/wptKeyEditDlgs.cpp:1420
msgid "Revoke user ID"
msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1404
+#: Src/wptKeyEditDlgs.cpp:1425
msgid "Key has only one user ID."
msgstr "Schlüssel hat nur eine Benutzerkennung."
-#: Src/wptKeyEditDlgs.cpp:1415
+#: Src/wptKeyEditDlgs.cpp:1436
msgid "This user ID has been already revoked."
msgstr "Diese Benutzerkennung wurde bereits widerrufen."
-#: Src/wptKeyEditDlgs.cpp:1420
+#: Src/wptKeyEditDlgs.cpp:1442
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2459,41 +2454,41 @@
"Do you really want to revoke this user ID?"
msgstr ""
"Benutzerkennung %s.\r\n"
-"Diese Benutzerkennung wirklich löschen?"
+"Diese Benutzerkennung wirklich widerrufen?"
-#: Src/wptKeyEditDlgs.cpp:1441
-msgid "Revoke Signature"
-msgstr "Signatur widerrufen"
+#: Src/wptKeyEditDlgs.cpp:1464
+msgid "Revoke User ID"
+msgstr "Benutzerkennung widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1445
+#: Src/wptKeyEditDlgs.cpp:1468
msgid "User ID successfully revoked"
msgstr "Benutzerkennung erfolgreich widerrufen"
-#: Src/wptKeyEditDlgs.cpp:1522
+#: Src/wptKeyEditDlgs.cpp:1545
msgid "Primary"
msgstr "Primär"
-#: Src/wptKeyEditDlgs.cpp:1525
+#: Src/wptKeyEditDlgs.cpp:1548
msgid "User ID successfully flagged"
msgstr "Benutzerkennung erfolgreich gekennzeichnet"
-#: Src/wptKeyEditDlgs.cpp:1610
+#: Src/wptKeyEditDlgs.cpp:1634
msgid "No preferences available."
msgstr "Keine Präferenzen verfübar."
-#: Src/wptKeyEditDlgs.cpp:1616
+#: Src/wptKeyEditDlgs.cpp:1640
msgid "MDC feature"
msgstr "Unterstützt MDC"
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1642 Src/wptKeyeditSetPrefDlg.cpp:116
msgid "Key Preferences"
msgstr "Schlüsseleinstellungen"
-#: Src/wptKeyEditDlgs.cpp:1668
+#: Src/wptKeyEditDlgs.cpp:1693
msgid "Primary user ID can not be deleted!"
msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
-#: Src/wptKeyEditDlgs.cpp:1678
+#: Src/wptKeyEditDlgs.cpp:1704
#, c-format
msgid ""
"user ID \"%s\".\n"
@@ -2503,32 +2498,32 @@
"Benutzerkennung %s.\r\n"
"Diese Benutzerkennung wirklich löschen?"
-#: Src/wptKeyEditDlgs.cpp:1695
+#: Src/wptKeyEditDlgs.cpp:1722
msgid "Delete user ID"
msgstr "Benutzerkennung löschen"
-#: Src/wptKeyEditDlgs.cpp:1699
+#: Src/wptKeyEditDlgs.cpp:1726
msgid "User ID successfully deleted"
msgstr "Benutzerkennung erfolgreich gelöscht"
-#: Src/wptKeyEditDlgs.cpp:1782
+#: Src/wptKeyEditDlgs.cpp:1809
msgid "Could not set subkey window procedure."
msgstr "Konnte \"subkey window procedure\" nicht setzen."
-#: Src/wptKeyEditDlgs.cpp:1792
+#: Src/wptKeyEditDlgs.cpp:1819
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:1800
+#: Src/wptKeyEditDlgs.cpp:1827
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:1832
+#: Src/wptKeyEditDlgs.cpp:1859
msgid "Please select a command."
msgstr "Bitte einen Befehl auswählen."
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1864
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"
@@ -2848,7 +2843,7 @@
msgid "Trust"
msgstr "Vertrauen"
-#: Src/wptKeylist.cpp:723 Src/wptPassphraseCB.cpp:110
+#: Src/wptKeylist.cpp:723 Src/wptPassphraseCB.cpp:112
#: Src/wptVerifyList.cpp:191
msgid "Invalid User ID"
msgstr "Ungültige Benutzerkennung"
@@ -2954,15 +2949,15 @@
msgid "Could not read key-data from file."
msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
-#: Src/wptKeyManager.cpp:622
+#: Src/wptKeyManager.cpp:624
msgid "Do you really want to confirm each key?"
msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
-#: Src/wptKeyManager.cpp:623
+#: Src/wptKeyManager.cpp:625
msgid "Delete Confirmation"
msgstr "Löschen Bestätigen"
-#: Src/wptKeyManager.cpp:647
+#: Src/wptKeyManager.cpp:649
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2974,7 +2969,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:657
+#: Src/wptKeyManager.cpp:659
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2991,7 +2986,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:664
+#: Src/wptKeyManager.cpp:666
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3001,34 +2996,34 @@
"Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
"Schlüssel werden gelöscht.\n"
-#: Src/wptKeyManager.cpp:726
+#: Src/wptKeyManager.cpp:728
#, c-format
msgid "Do you really want to send '%s' to keyserver %s?"
msgstr "Wollen Sie '%s' wirklich zum Schlüsselserver %s senden?"
-#: Src/wptKeyManager.cpp:749
+#: Src/wptKeyManager.cpp:751
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:824
+#: Src/wptKeyManager.cpp:826
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:831
+#: Src/wptKeyManager.cpp:833
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
-#: Src/wptKeyManager.cpp:906
+#: Src/wptKeyManager.cpp:908
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:906
+#: Src/wptKeyManager.cpp:908
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:917
+#: Src/wptKeyManager.cpp:919
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
@@ -4125,21 +4120,21 @@
msgid "Encrypted with the following public key(s)"
msgstr "Verschlüsselt mit folgenden öffentlichen Schlüsseln"
-#: Src/wptPassphraseCB.cpp:125
+#: Src/wptPassphraseCB.cpp:132
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "Unbekannte key ID (%s, 0x%s)"
# c:\oss\winpt-gpgme\src\wptPassphraseCB.cpp:124
-#: Src/wptPassphraseCB.cpp:136
+#: Src/wptPassphraseCB.cpp:143
msgid "Bad passphrase; Enter passphrase again"
msgstr "Ungültiges Passwort; Bitte Passwort erneut eingeben"
-#: Src/wptPassphraseCB.cpp:137
+#: Src/wptPassphraseCB.cpp:144
msgid "Please enter your passphrase"
msgstr "Bitte Passwort eingeben"
-#: Src/wptPassphraseCB.cpp:141
+#: Src/wptPassphraseCB.cpp:148
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -4148,7 +4143,7 @@
"Symmetrisch verschlüsselt.\n"
"%s verschlüsselte Daten."
-#: Src/wptPassphraseCB.cpp:285
+#: Src/wptPassphraseCB.cpp:292
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4159,7 +4154,7 @@
"Benutzer: \"%s\"\n"
"%s Schlüssel, ID %s (Hauptschlüssel ID %s)\n"
-#: Src/wptPassphraseCB.cpp:291
+#: Src/wptPassphraseCB.cpp:298
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -4170,7 +4165,7 @@
"user: \"%s\"\n"
"%s key, ID %s\n"
-#: Src/wptPassphraseCB.cpp:379
+#: Src/wptPassphraseCB.cpp:386
#, c-format
msgid ""
"Please enter the PIN to unlock your secret card key\n"
@@ -4443,3 +4438,6 @@
#: Src/wptVerifyList.cpp:99 Src/wptVerifyList.cpp:107
msgid "Signed"
msgstr "Signiert"
+
+#~ msgid "keyserver.conf will be copied to \"%s\"\r\n"
+#~ msgstr "keyserver.conf wird nach \"%s\" kopiert\r\n"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Src/ChangeLog 2006-01-19 09:22:09 UTC (rev 160)
@@ -1,5 +1,15 @@
2006-01-18 Timo Schulz <ts at g10code.com>
+ * wptKeyEditCB.cpp (cmd_delsig_handler): Do not assume
+ the self sig is always index 0. Noted by Kurt.
+ * wptPassphraseCB.cpp (passphrase_dlg_proc): Do not assume
+ the key user-ID contains an email address.
+ * wptKeyEditDlgs.cpp (do_find_userid): Likewise.
+ (do_editkey_deluid): Likewise.
+ (do_editkey_revuid): Likewise.
+
+2006-01-18 Timo Schulz <ts at g10code.com>
+
* wptListview.cpp (listview_del_sel_items): Fixed index
calculation. This fixed a lot of problems with the KM listview
update.
Modified: trunk/Src/wptKeyEditCB.cpp
===================================================================
--- trunk/Src/wptKeyEditCB.cpp 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Src/wptKeyEditCB.cpp 2006-01-19 09:22:09 UTC (rev 160)
@@ -222,8 +222,7 @@
else
return "N";
}
- if (ctx->sig_index == 0 &&
- !strcmp (key, "keyedit.delsig.selfsig"))
+ if (!strcmp (key, "keyedit.delsig.selfsig"))
return "Y";
if (step == 2 && !strcmp (key, "keyedit.prompt")) {
*r_step = step = 0;
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-01-19 09:22:09 UTC (rev 160)
@@ -213,10 +213,12 @@
/* Try to find the GPG edit key index which belongs to the user ID
- given by @name. If @r_inf != NULL, the info context will be returned.
+ given by the email address @email, @name is used as a fallback.
+ If @r_inf != NULL, the info context will be returned.
Return value: index of the user ID or -1 on error. */
static int
-do_find_userid (const char *keyid, const char *name, gpg_uid_info_t *r_inf)
+do_find_userid (const char *keyid, const char *email,
+ const char *name, gpg_uid_info_t *r_inf)
{
GpgKeyEdit *ke;
gpgme_error_t err;
@@ -236,7 +238,24 @@
}
for (ui = inf; ui; ui = ui->next) {
- if (!strcmp (ui->email, name)) {
+ if (name && email && ui->email && ui->name) {
+ if (!strcmp (ui->email, email) &&
+ !strncmp (ui->name, name, strlen (name))) {
+ pos = ui->index;
+ break;
+ }
+ continue;
+ }
+ if (ui->email) {
+ if (!strcmp (ui->email, email)) {
+ pos = ui->index;
+ break;
+ }
+ /* The email address is more unique, use the name just
+ as the fallbck when no email address is available. */
+ continue;
+ }
+ if (ui->name && name && !strcmp (ui->name, name)) {
pos = ui->index;
break;
}
@@ -1094,12 +1113,12 @@
if (attr) {
char *uid = utf8_to_wincp (attr, strlen (attr));
if (uid) {
- listview_add_sub_item( lv, j, 1, uid );
- free( uid );
+ listview_add_sub_item (lv, j, 1, uid);
+ free (uid);
}
}
else
- listview_add_sub_item( lv, j, 1, _("Invalid user ID") );
+ listview_add_sub_item (lv, j, 1, _("Invalid user ID"));
attr = u->email;
if (attr)
listview_add_sub_item (lv, j, 2, attr);
@@ -1391,17 +1410,19 @@
{
gpgme_error_t err;
GpgKeyEdit *ke;
- char buf[256], t[512];
- char *pass=NULL;
+ char buf[128], email[128];
+ char inf[512];
+ char *pass = NULL;
int cancel = 0, id = 0, j;
if (!k->key_pair) {
- msg_box( dlg, _("There is no secret key available!"), _("Revoke user ID"), MB_ERR );
+ msg_box (dlg, _("There is no secret key available!"),
+ _("Revoke user ID"), MB_ERR);
return FALSE;
}
- if( listview_count_items( lv, 0 ) == 1 ) {
- msg_box( dlg, _("Key has only one user ID."), _("Key Edit"), MB_ERR );
+ if (listview_count_items (lv, 0) == 1) {
+ msg_box (dlg, _("Key has only one user ID."), _("Key Edit"), MB_ERR);
return FALSE;
}
@@ -1410,24 +1431,26 @@
return FALSE;
}
- listview_get_item_text( lv, j, 0, buf, sizeof buf - 1 );
- if( strstr( buf, _("Revoked") ) ) {
- msg_box( dlg, _("This user ID has been already revoked."), _("Key Edit"), MB_INFO );
+ listview_get_item_text( lv, j, UID_COL_VALID, buf, sizeof buf - 1);
+ if (strstr (buf, _("Revoked"))) {
+ msg_box (dlg, _("This user ID has been already revoked."),
+ _("Key Edit"), MB_INFO);
return FALSE;
}
- listview_get_item_text (lv, j, 1, buf, sizeof buf -1);
- _snprintf( t, sizeof t -1, _("user ID \"%s\".\n\n"
- "Do you really want to revoke this user ID?"), buf );
- if( msg_box( dlg, t, _("Key Edit"), MB_WARN_ASK) == IDNO )
+ listview_get_item_text (lv, j, UID_COL_NAME, buf, sizeof buf -1);
+ _snprintf (inf, sizeof (inf) -1, _("user ID \"%s\".\n\n"
+ "Do you really want to revoke this user ID?"), buf);
+ if (msg_box (dlg, inf, _("Key Edit"), MB_WARN_ASK) == IDNO)
return FALSE;
- if( k->is_protected ) {
+ if (k->is_protected) {
pass = request_passphrase (_("Key Edit"), 1, &cancel);
if (cancel)
return FALSE;
}
- listview_get_item_text (lv, j, 2, buf, sizeof (buf)-1);
- id = do_find_userid (k->keyid, buf, NULL);
+ listview_get_item_text (lv, j, UID_COL_EMAIL, email, sizeof (email)-1);
+ listview_get_item_text (lv, j, UID_COL_NAME, buf, sizeof (buf)-1);
+ id = do_find_userid (k->keyid, email, buf, NULL);
if (id == -1)
BUG (NULL);
@@ -1438,7 +1461,7 @@
ke->setPassphrase (pass);
err = ke->revokeUserid (id);
if (err)
- msg_box (dlg, gpgme_strerror (err), _("Revoke Signature"), MB_ERR);
+ msg_box (dlg, gpgme_strerror (err), _("Revoke User ID"), MB_ERR);
else {
listview_add_sub_item (lv, j, 0, _("Revoked"));
k->update = 1;
@@ -1463,7 +1486,7 @@
return FALSE;
}
listview_get_item_text (lv, j, 2, buf, sizeof buf-1);
- id = do_find_userid (k->keyid, buf, NULL);
+ id = do_find_userid (k->keyid, buf, NULL, NULL);
if (id == -1)
BUG (dlg);
if (k->is_protected) {
@@ -1505,7 +1528,7 @@
return FALSE;
}
listview_get_item_text (lv, j, 2, buf, sizeof buf-1);
- id = do_find_userid (k->keyid, buf, NULL);
+ id = do_find_userid (k->keyid, buf, NULL, NULL);
if (id == -1)
BUG (dlg);
if (k->is_protected) {
@@ -1596,7 +1619,8 @@
pos = listview_get_curr_pos (cb->lv);
listview_get_item_text (cb->lv, pos, 2, buf, DIM (buf)-1);
SetDlgItemText (dlg, IDC_SHOWPREF_INFO, buf);
- pos = do_find_userid (((winpt_key_t)cb->opaque)->keyid, buf, &inf);
+ pos = do_find_userid (((winpt_key_t)cb->opaque)->keyid,
+ buf, NULL, &inf);
if (inf) {
const char *prefs = inf->prefs;
if (prefs && *prefs) {
@@ -1658,31 +1682,34 @@
{
gpgme_error_t err;
GpgKeyEdit *ke;
- char buf[256], t[512];
+ char email[128], name[128];
+ char inf[384];
int j, id = 0;
if (!k->key_pair)
return FALSE; /* XXX: see do_editkey_delsubkey */
- if( listview_count_items( lv, 0 ) == 1 ) {
- msg_box( dlg, _("Primary user ID can not be deleted!"), _("Key Edit"), MB_ERR );
+ if (listview_count_items (lv, 0) == 1) {
+ msg_box (dlg, _("Primary user ID can not be deleted!"),
+ _("Key Edit"), MB_ERR);
return FALSE;
}
- if( (j = listview_get_curr_pos( lv )) == -1 ) {
- msg_box( dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR );
+ if ((j = listview_get_curr_pos (lv)) == -1) {
+ msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
return FALSE;
}
/* XXX: add a hint that also all signatures will be deleted? */
- listview_get_item_text( lv, j, 1, buf, DIM(buf) -1 );
- _snprintf( t, DIM (t)-1, _("user ID \"%s\".\n\n"
- "Do you really want to delete this user ID?"),
- buf);
- if( msg_box( dlg, t, _("Key Edit"), MB_YESNO|MB_ICONWARNING ) == IDNO )
+ listview_get_item_text (lv, j, UID_COL_NAME, name, DIM(name) -1);
+ _snprintf (inf, DIM (inf)-1, _("user ID \"%s\".\n\n"
+ "Do you really want to delete this user ID?"),
+ name);
+ if (msg_box (dlg, inf, _("Key Edit"), MB_YESNO|MB_ICONWARNING) == IDNO)
return FALSE;
- listview_get_item_text (lv, j, 2, buf, DIM (buf)-1);
- id = do_find_userid (k->keyid, buf, NULL);
+ listview_get_item_text (lv, j, UID_COL_EMAIL, email, DIM (email)-1);
+ listview_get_item_text (lv, j, UID_COL_NAME, name, DIM (name)-1);
+ id = do_find_userid (k->keyid, email, name, NULL);
if (id == -1)
BUG (dlg);
@@ -1691,12 +1718,12 @@
BUG (NULL);
err = ke->delUserid (id);
- if( err )
- msg_box( dlg, gpgme_strerror (err), _("Delete user ID"), MB_ERR );
+ if (err)
+ msg_box (dlg, gpgme_strerror (err), _("Delete user ID"), MB_ERR);
else {
- listview_del_item( lv, j );
+ listview_del_item (lv, j);
k->update = 1;
- status_box( dlg, _("User ID successfully deleted"), _("GnuPG Status") );
+ status_box (dlg, _("User ID successfully deleted"), _("GnuPG Status"));
}
delete ke;
return err? FALSE : TRUE;
Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Src/wptKeyManager.cpp 2006-01-19 09:22:09 UTC (rev 160)
@@ -598,6 +598,8 @@
while (n-- > 0)
gpg_keycache_delete_key (pub, rset[i++]->subkeys->keyid);
+
+ /* XXX: we need to check if there is a secret part available. */
}
Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/Src/wptPassphraseCB.cpp 2006-01-19 09:22:09 UTC (rev 160)
@@ -104,19 +104,26 @@
for (r = res->recipients; r; r = r->next) {
get_pubkey (r->keyid, &key);
if (key) {
+ gpgme_user_id_t u = key->uids;
char *uid;
- id = key->uids->name;
+
+ id = u->name;
if (!id)
id = _("Invalid User ID");
uid = utf8_to_wincp (id, strlen (id));
- info = new char [32+strlen (uid)+1 + 4 + strlen (r->keyid)+1
- + strlen (key->uids->email)+1];
+ n = 32+strlen (uid)+1+4+strlen (r->keyid)+1;
+ if (u->email)
+ n += strlen (u->email)+1;
+ info = new char [n+1];
if (!info)
BUG (NULL);
- sprintf (info, "%s <%s> (%s, 0x%s)", uid, key->uids->email,
- get_key_pubalgo (r->pubkey_algo), r->keyid+8);
+ if (!u->email || strlen (u->email) < 1)
+ sprintf (info, "%s (%s, 0x%s)", uid,
+ get_key_pubalgo (r->pubkey_algo), r->keyid+8);
+ else
+ sprintf (info, "%s <%s> (%s, 0x%s)", uid, u->email,
+ get_key_pubalgo (r->pubkey_algo), r->keyid+8);
free (uid);
-
}
else {
info = new char [32 + strlen (r->keyid)+1 + 4];
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/THANKS 2006-01-19 09:22:09 UTC (rev 160)
@@ -1,14 +1,17 @@
I have to thank so many people, but I can't rembember all their names.
If anybody think that he/she is missing here, please mail me ;-). My
-thanks goes to the GnuPG, GnuPA team, all people from my maling lists
+thanks goes to the GnuPG, GnuPA team, all people from my mailing lists
and the gnupg mailings list and all the other people who helped me to
improve WinPT :-). Especially those users who reported all the minor
-(and major problems) via the (bugs.gnupg.org) bug tracking system.
+(and major problems) via the (wald.intevation.org) bug tracking system.
Special thanks to Ralf Kreutzmann who maintaines the installer and
provided a forum for German speaking WinPT users. And of course for
all his bug reports he sent to me.
+Kurt Fitzner for continuing the work on MyGPGME and for all his
+suggestions and bug reports he sent to me.
+
Intevation for providing the nice GForge environment and webspace.
Achim Pietig achim at pietig.com
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-01-18 13:57:31 UTC (rev 159)
+++ trunk/TODO 2006-01-19 09:22:09 UTC (rev 160)
@@ -1,8 +1,12 @@
Feel free if you think there is missing something to mail me.
-0.11.x-
- * there might be a crash when a user-ID without an email
- address will be deleted.
+ * On modern P4 CPUs the thread scheduling mechanism seems to
+ cause trouble and the result is that any GPG operation will
+ be take much longer as expected.
+ * Handle the case that while WinPT tries to change GPG data,
+ but before GPG is executed, an external event changed the
+ keyring. So do not use BUG but issue an error.
* make sure that keys are also deleted from the secret key cache.
* winpt --keymanager aborts when the keyring is empty on the
first start.
More information about the Winpt-commits
mailing list