[Winpt-commits] r231 - in trunk: . Doc Po Src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Jun 20 11:18:49 CEST 2006 

Author: twoaday
Date: 2006-06-20 11:18:44 +0200 (Tue, 20 Jun 2006)
New Revision: 231

Modified:
   trunk/Doc/winpt.texi
   trunk/NEWS
   trunk/Po/ChangeLog
   trunk/Po/de.po
   trunk/Po/jp.po
   trunk/Po/pt_BR.po
   trunk/Src/ChangeLog
   trunk/Src/WinPT.cpp
   trunk/Src/wptClipDecryptDlg.cpp
   trunk/Src/wptClipEditDlg.cpp
   trunk/Src/wptGPGME.cpp
   trunk/Src/wptHotkey.cpp
   trunk/Src/wptKeyEditDlgs.cpp
   trunk/Src/wptKeyserver.cpp
   trunk/Src/wptKeyserverDlg.cpp
   trunk/Src/wptOwnertrustDlg.cpp
Log:
Some more patches and fixed typos.



Modified: trunk/Doc/winpt.texi
===================================================================
--- trunk/Doc/winpt.texi	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Doc/winpt.texi	2006-06-20 09:18:44 UTC (rev 231)
@@ -69,7 +69,8 @@
 The fingerprint of the key is hexadecial (160-bit) sequence divided
 into 10 groups of 4 hex digits. You can get the fingerprint of a key
 by opening the key property dialog. There you can mark the fingerprint
-and copy it to the clipboard.
+and copy it to the clipboard. The fingerprint of a key can be compared
+to human fingerprints, it is unique for each key.
 
 Example: 1D75 8108 5BC9 D9FB E78B  2078 ED46 81C9 BF3D F9B4
 
@@ -439,4 +440,8 @@
 Just a last work on Key Pairs, they are automatically marked as
 "Ultimate" because the key belongs to you and you trust it implicit.
 
+ at subsection Glossary
+keyid	    	    The lowest 64-bit of the fingerprint
+fingerprint	    Digital fingerprint whic is unique for a key
+
 @bye

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/NEWS	2006-06-20 09:18:44 UTC (rev 231)
@@ -874,4 +874,7 @@
   that the user needs to remind the signature state, while viewing
   the text.
   
-[updated translations: German, Portuguese(BR)]
+* Fix a special case in the keyserver code which would lead to
+  a crash after receiving.
+  
+[updated translations: Japanese, German, Portuguese(BR)]

Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Po/ChangeLog	2006-06-20 09:18:44 UTC (rev 231)
@@ -1,3 +1,7 @@
+2006-06-20  Timo Schulz  <ts at g10code.de>
+
+	* de.po: Fixed some typos noted by Eduardo.
+	
 2006-06-18  Timo Schulz  <ts at g10code.de>
 
 	* de.po: Updated.

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Po/de.po	2006-06-20 09:18:44 UTC (rev 231)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 1.0.0\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-18 18:43+0200\n"
+"POT-Creation-Date: 2006-06-20 11:24+0200\n"
 "PO-Revision-Date: 2005-12-28 16:10+0100\n"
 "Last-Translator: Timo Schulz <ts at g10code.de>\n"
 "Language-Team: DE <twoaday at freakmail.de>\n"
@@ -65,12 +65,12 @@
 #: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
 #: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
 #: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:468
-#: Src/wptKeyserverDlg.cpp:528 Src/wptKeyserverDlg.cpp:533
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:678
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:699
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
+#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
+#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
 msgid "Keyserver"
 msgstr "Schlüsselserver"
 
@@ -105,7 +105,7 @@
 
 # c:\oss\winpt-gpgme\src\WinPT.cpp:313
 #: Src/WinPT.cpp:561
-msgid "GPG home directory could not be determited."
+msgid "GPG home directory could not be determined."
 msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
 
 #: Src/WinPT.cpp:569
@@ -448,35 +448,61 @@
 "Bitte die OpenPGP-SmartCard einlegen\n"
 "OK zum Fortfahren oder Abbrechen"
 
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
+#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
 #: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
 #: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
 msgid "user ID not found"
 msgstr "Benutzerkennung nicht gefunden"
 
-#: Src/wptClipDecryptDlg.cpp:104
+#: Src/wptClipDecryptDlg.cpp:106
 msgid "Signature status: created with a fully trusted key"
 msgstr "Signatur Status: erstellt mit einem vertraunswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
 msgid "Signature status: created with a marginal trusted key"
 msgstr ""
 "Signatur Status: erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:109
+#: Src/wptClipDecryptDlg.cpp:111
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "Signatur Status: erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:112
+#: Src/wptClipDecryptDlg.cpp:114
 msgid "Signature status: created with an undefined trusted key"
 msgstr ""
 "Signatur Status: erstellt mit einem Schlüssel ohne definiertes Vertrauen"
 
-#: Src/wptClipDecryptDlg.cpp:172
+#: Src/wptClipDecryptDlg.cpp:124
+#, c-format
+msgid ""
+"*** PGP SIGNATURE VERIFICATION ***\r\n"
+"*** Signature made:    %s\r\n"
+"*** Signature verfied: %s\r\n"
+"*** %s\r\n"
+"*** Signature result:  %s\r\n"
+"*** Signer: %s (0x%s)\r\n"
+"*** BEGIN PGP DECRYPTED TEXT ***\r\n"
+msgstr ""
+"*** PGP SIGNATUR VERIFIZIERUNG ***\r\n"
+"*** Signatur erstellt:  %s\r\n"
+"*** Signatur überprüft: %s\r\n"
+"*** %s\r\n"
+"*** Signatur:           %s\r\\n*** Unterzeichner: %s (0x%s)\r\n"
+"*** BEGINN PGP ENTSCHLÜSSELTER TEXT***\r\n"
+
+#: Src/wptClipDecryptDlg.cpp:131
+msgid ""
+"\r\n"
+"*** END PGP DECRYPTED TEXT ***"
+msgstr ""
+"\r\n"
+"*** ENDE PGP ENTSCHLÜSSELTER TEXT ***"
+
+#: Src/wptClipDecryptDlg.cpp:178
 msgid "Decrypt Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
-#: Src/wptClipDecryptDlg.cpp:173
+#: Src/wptClipDecryptDlg.cpp:179
 #, c-format
 msgid ""
 "%s\n"
@@ -491,7 +517,7 @@
 "Von \"%s\" mit Schlüssel ID 0x%s%s %s\n"
 "%s"
 
-#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:214 Src/wptClipVerifyDlg.cpp:157
 #: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
 #: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
 #: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
@@ -502,14 +528,14 @@
 msgid "Verify"
 msgstr "Überprüfen"
 
-#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
-#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
-#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:221 Src/wptClipDecryptDlg.cpp:234
+#: Src/wptClipDecryptDlg.cpp:242 Src/wptClipDecryptDlg.cpp:249
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptFileManager.cpp:1276
 #: Src/wptFileManager.cpp:1327
 msgid "Decryption"
 msgstr "Entschlüsselung"
 
-#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:235 Src/wptFileManager.cpp:1328
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -518,18 +544,18 @@
 "Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
 "Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
 
-#: Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:242
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Unbekannter Algorithmus: %s"
 
 # c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:242
+#: Src/wptClipDecryptDlg.cpp:248
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Ungültige OpenPGP Nachricht  (vielleicht: \"quoted printable\" im Armorteil)."
 
-#: Src/wptClipDecryptDlg.cpp:250
+#: Src/wptClipDecryptDlg.cpp:256
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -542,31 +568,31 @@
 "Es ist möglich, dass die Daten beschädigt worden aber es ist ebenfalls "
 "möglich das dies ein Teil eines Attacke ist."
 
-#: Src/wptClipDecryptDlg.cpp:255
+#: Src/wptClipDecryptDlg.cpp:261
 msgid "*** IMPORTANT ***"
 msgstr "*** WICHTIG ***"
 
-#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:264 Src/wptClipEncryptDlg.cpp:210
 #: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
 #: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
 #: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
-#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
-#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
-#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
-#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:138 Src/wptClipEditDlg.cpp:177
+#: Src/wptClipEditDlg.cpp:186 Src/wptClipEditDlg.cpp:267
+#: Src/wptClipEditDlg.cpp:272 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
-#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:120 Src/wptFileManager.cpp:572
 msgid "File Open"
 msgstr "Datei öffnen"
 
-#: Src/wptClipEditDlg.cpp:128
+#: Src/wptClipEditDlg.cpp:129
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -574,11 +600,11 @@
 "Die Datei, die Sie hinzufügen wollen, ist sehr groß!\n"
 "Wirklich fortfahren?"
 
-#: Src/wptClipEditDlg.cpp:167
+#: Src/wptClipEditDlg.cpp:168
 msgid "File Save"
 msgstr "Datei speichern"
 
-#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:178 Src/wptFileManager.cpp:108
 #, c-format
 msgid ""
 "\"%s\" already exists.\n"
@@ -587,34 +613,34 @@
 "\"%s\" existiert bereits.\n"
 "Vorhandene Datei überschreiben?"
 
-#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
+#: Src/wptClipEditDlg.cpp:219 Src/wptMainProc.cpp:568
 msgid "Clipboard Editor"
 msgstr "Zwischenablagen-Editor"
 
-#: Src/wptClipEditDlg.cpp:218
+#: Src/wptClipEditDlg.cpp:220
 msgid "&Copy"
 msgstr "&Kopieren"
 
-#: Src/wptClipEditDlg.cpp:219
+#: Src/wptClipEditDlg.cpp:221
 msgid "Clea&r"
 msgstr "&Löschen"
 
-#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:222 Src/wptGPGOptDlg.cpp:56
 #: Src/wptTextInputDlg.cpp:87
 msgid "&Load"
 msgstr "&Laden"
 
-#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:223 Src/wptClipVerifyDlg.cpp:197
 #: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
 msgid "&Save"
 msgstr "&Speichern"
 
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:224
 msgid "Add quotes"
 msgstr "'>' hinzufügen"
 
-#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
-#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:225 Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:130
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Schliessen"
@@ -648,7 +674,7 @@
 #: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
 #: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
 #: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
@@ -1646,24 +1672,24 @@
 msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
 
 #: Src/wptGPGME.cpp:278
-msgid "Error during verification process."
-msgstr "Fehler während Verifikation."
+msgid "Error during verification process"
+msgstr "Fehler während Verifikation"
 
 #: Src/wptGPGME.cpp:279
-msgid "The signature is good."
-msgstr "Die Signatur is gut."
+msgid "The signature is good"
+msgstr "Die Signatur is gut"
 
 #: Src/wptGPGME.cpp:280
 msgid "The signature is BAD!"
 msgstr "Die Signatur ist nicht gültig!"
 
 #: Src/wptGPGME.cpp:281
-msgid "The signature could not be checked due to a missing key."
-msgstr "Die Signature könnte durch einen fehlenden Key nicht geprüft werden."
+msgid "The signature could not be checked due to a missing key"
+msgstr "Die Signature konnte durch fehlenden Key nicht geprüft werden"
 
 #: Src/wptGPGME.cpp:282
-msgid "No valid OpenPGP signature."
-msgstr "Keine gültige OpenPGP Signatur."
+msgid "No valid OpenPGP signature"
+msgstr "Keine gültige OpenPGP Signatur"
 
 #: Src/wptGPGME.cpp:283
 msgid "Signature Error"
@@ -1893,7 +1919,7 @@
 msgstr "Aktuelles Fenster signieren"
 
 #: Src/wptHotkey.cpp:68
-msgid "Current Window Sign Encrypt (ALT+SHIFT+B"
+msgid "Current Window Sign Encrypt (ALT+SHIFT+B)"
 msgstr "Aktuelles Fenster Signieren/Verschlüsseln"
 
 #: Src/wptHotkey.cpp:69
@@ -2481,7 +2507,7 @@
 #: Src/wptKeyEditDlgs.cpp:2054
 #, c-format
 msgid ""
-"Your keys is listed as a designated revoker for the key\n"
+"Your key is listed as a designated revoker for the key\n"
 "\n"
 "%s\n"
 "\n"
@@ -3373,7 +3399,7 @@
 msgid "Smart Card support is not available."
 msgstr "SmartCard-Unterstützung ist nicht verfügbar."
 
-#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:577
 msgid "Keyserver Access"
 msgstr "Schlüsselserver-Zugriff"
 
@@ -3598,7 +3624,7 @@
 
 #: Src/wptKeyserver.cpp:678
 msgid ""
-"Invalid proxy configuration.You need to set a user and a passwordto use "
+"Invalid proxy configuration.You need to set a user and a password to use "
 "proxy authentication!"
 msgstr ""
 "Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
@@ -3673,101 +3699,101 @@
 msgid "This is not a valid OpenPGP key."
 msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
 
-#: Src/wptKeyserverDlg.cpp:360
+#: Src/wptKeyserverDlg.cpp:361
 msgid "Please select one of the servers."
 msgstr "Bitte einen der Server auswählen."
 
-#: Src/wptKeyserverDlg.cpp:365
+#: Src/wptKeyserverDlg.cpp:366
 msgid "Only HTTP keyserver can be used."
 msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
 
-#: Src/wptKeyserverDlg.cpp:382
+#: Src/wptKeyserverDlg.cpp:383
 msgid "DNS Name"
 msgstr "DNS Name"
 
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:384
 msgid "Port"
 msgstr "Port"
 
-#: Src/wptKeyserverDlg.cpp:467
+#: Src/wptKeyserverDlg.cpp:468
 msgid "No space for new keyserver entry"
 msgstr "Kein Platz für neuen Keserver-Eintrag"
 
-#: Src/wptKeyserverDlg.cpp:488
+#: Src/wptKeyserverDlg.cpp:489
 msgid "HKP Keyserver"
 msgstr "HKP-Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:490
 msgid "LDAP Keyserver"
 msgstr "LDAP-Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:491
 msgid "Finger Keyserver"
 msgstr "Finger-Keyserver"
 
-#: Src/wptKeyserverDlg.cpp:515 Src/wptKeyserverDlg.cpp:732
-#: Src/wptKeyserverDlg.cpp:752
+#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
+#: Src/wptKeyserverDlg.cpp:753
 msgid "Edit Keyserver"
 msgstr "Editiere Keyserver"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:608
+#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
 msgid "&Add"
 msgstr "&Hinzufügen"
 
-#: Src/wptKeyserverDlg.cpp:518
+#: Src/wptKeyserverDlg.cpp:519
 msgid "Type:"
 msgstr "Typ:"
 
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:520
 msgid "Port:"
 msgstr "Port:"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:521
 msgid "Host name:"
 msgstr "Rechnername:"
 
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:529
 msgid "Please enter a host name"
 msgstr "Bitte einen Rechnernamen eingeben."
 
-#: Src/wptKeyserverDlg.cpp:533
+#: Src/wptKeyserverDlg.cpp:534
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "Ungültiger Port, gültige Nummern sind < 65535"
 
-#: Src/wptKeyserverDlg.cpp:577 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "&Empfangen"
 
-#: Src/wptKeyserverDlg.cpp:579
+#: Src/wptKeyserverDlg.cpp:580
 msgid "Send key (default is receiving)"
 msgstr "Schlüssel senden (sonst empfangen)"
 
-#: Src/wptKeyserverDlg.cpp:581
+#: Src/wptKeyserverDlg.cpp:582
 msgid "Please enter the key ID or email address you search for"
 msgstr "Bitte die key ID oder E-Mail-Adresse angeben die gesucht wird"
 
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:583
 msgid "&Search"
 msgstr "&Suchen"
 
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:584
 msgid "C&hange proxy"
 msgstr "Proxy Ä&ndern"
 
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:585
 msgid "Set &default"
 msgstr "Als &Standard"
 
-#: Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:610
 msgid "&Remove"
 msgstr "&Entfernen"
 
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:611
 msgid "&Edit"
 msgstr "&Edtieren"
 
-#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
 #: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
 #: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
 #: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -3775,23 +3801,23 @@
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:693
+#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
 msgid "Please enter the search pattern."
 msgstr "Bitte Suchmuster eingeben."
 
-#: Src/wptKeyserverDlg.cpp:677
+#: Src/wptKeyserverDlg.cpp:678
 msgid "Please select one of the keyservers."
 msgstr "Bitte einen Keyserver auswählen."
 
-#: Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:699
 msgid "Only keyids are allowed."
 msgstr "Nur Schlüssel-IDs zulässig"
 
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:705
 msgid "Only enter the name of the user."
 msgstr "Nur den Namen des Benutzers eingeben."
 
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:711
 msgid "Only email addresses or keyids are allowed."
 msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
 
@@ -4163,7 +4189,7 @@
 msgstr "Wählen Sie einen Namen für die Eingabedatei"
 
 #: Src/wptOwnertrustDlg.cpp:131
-msgid "Ownertrust succefully imported."
+msgid "Ownertrust successfully imported."
 msgstr "Besitzervertrauen erfolgreich importiert."
 
 #: Src/wptPassphraseCB.cpp:98

Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Po/jp.po	2006-06-20 09:18:44 UTC (rev 231)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 0.10.2\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-18 18:43+0200\n"
+"POT-Creation-Date: 2006-06-20 11:24+0200\n"
 "PO-Revision-Date: 2005-12-22 07:28+0100\n"
 "Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
 "Language-Team: jp <jp at li.org>\n"
@@ -89,12 +89,12 @@
 #: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
 #: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
 #: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:468
-#: Src/wptKeyserverDlg.cpp:528 Src/wptKeyserverDlg.cpp:533
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:678
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:699
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
+#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
+#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
 msgid "Keyserver"
 msgstr "ƒL[ƒT[ƒo["
 
@@ -132,7 +132,8 @@
 
 # c:\oss\winpt\src\WinPT.cpp:268
 #: Src/WinPT.cpp:561
-msgid "GPG home directory could not be determited."
+#, fuzzy
+msgid "GPG home directory could not be determined."
 msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\WinPT.cpp:276
@@ -550,43 +551,61 @@
 "Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
+#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
 #: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
 #: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
 msgid "user ID not found"
 msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:104
+#: Src/wptClipDecryptDlg.cpp:106
 #, fuzzy
 msgid "Signature status: created with a fully trusted key"
 msgstr "–¼‚̏ó‘ԁFŠ®‘S‚ɐM—p‚Å‚«‚éƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:172
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
 #, fuzzy
 msgid "Signature status: created with a marginal trusted key"
 msgstr "–¼‚̏ó‘ԁF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:109
+#: Src/wptClipDecryptDlg.cpp:111
 #, fuzzy
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "–¼‚̏ó‘ԁFM—p‚Å‚«‚È‚¢ƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:112
+#: Src/wptClipDecryptDlg.cpp:114
 #, fuzzy
 msgid "Signature status: created with an undefined trusted key"
 msgstr "–¼‚̏ó‘ԁF’è‹`‚³‚ê‚Ä‚¢‚È‚¢Š®‘S‚ɐM—p‚Å‚«‚éƒL[‚ōì‚ç‚ꂽ‚à‚Ì"
 
+#: Src/wptClipDecryptDlg.cpp:124
+#, c-format
+msgid ""
+"*** PGP SIGNATURE VERIFICATION ***\r\n"
+"*** Signature made:    %s\r\n"
+"*** Signature verfied: %s\r\n"
+"*** %s\r\n"
+"*** Signature result:  %s\r\n"
+"*** Signer: %s (0x%s)\r\n"
+"*** BEGIN PGP DECRYPTED TEXT ***\r\n"
+msgstr ""
+
+#: Src/wptClipDecryptDlg.cpp:131
+msgid ""
+"\r\n"
+"*** END PGP DECRYPTED TEXT ***"
+msgstr ""
+
 # c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptClipDecryptDlg.cpp:172
+#: Src/wptClipDecryptDlg.cpp:178
 msgid "Decrypt Verify"
 msgstr "•œ†/Šm”F"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:173
+#: Src/wptClipDecryptDlg.cpp:179
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -615,7 +634,7 @@
 # c:\oss\winpt\src\wptMainProc.cpp:191 c:\oss\winpt\src\wptMainProc.cpp:259
 # c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
 # c:\oss\winpt\src\wptMainProc.cpp:406
-#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:214 Src/wptClipVerifyDlg.cpp:157
 #: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
 #: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
 #: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
@@ -632,16 +651,16 @@
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:138
 # c:\oss\winpt\src\wptFileManager.cpp:952
 # c:\oss\winpt\src\wptFileManager.cpp:996
-#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
-#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
-#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:221 Src/wptClipDecryptDlg.cpp:234
+#: Src/wptClipDecryptDlg.cpp:242 Src/wptClipDecryptDlg.cpp:249
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptFileManager.cpp:1276
 #: Src/wptFileManager.cpp:1327
 msgid "Decryption"
 msgstr "•œ†"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
 # c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:235 Src/wptFileManager.cpp:1328
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -650,17 +669,17 @@
 " %s‚ň͆‰»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
 "•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
 
-#: Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:242
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
 
-#: Src/wptClipDecryptDlg.cpp:242
+#: Src/wptClipDecryptDlg.cpp:248
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr "•s–¾‚ÈOpenPGPƒƒbƒZ[ƒW"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
-#: Src/wptClipDecryptDlg.cpp:250
+#: Src/wptClipDecryptDlg.cpp:256
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -675,7 +694,7 @@
 "‚Ü‚½‚Í‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
 
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:255
+#: Src/wptClipDecryptDlg.cpp:261
 msgid "*** IMPORTANT ***"
 msgstr "*** d—v ***"
 
@@ -687,7 +706,7 @@
 # c:\oss\winpt\src\wptKeyManager.cpp:274
 # c:\oss\winpt\src\wptKeyManager.cpp:610
 # c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:264 Src/wptClipEncryptDlg.cpp:210
 #: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
 #: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
 #: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
@@ -704,10 +723,10 @@
 # c:\oss\winpt\src\wptMainProc.cpp:171 c:\oss\winpt\src\wptMainProc.cpp:241
 # c:\oss\winpt\src\wptMainProc.cpp:284 c:\oss\winpt\src\wptMainProc.cpp:489
 # c:\oss\winpt\src\wptMainProc.cpp:493
-#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
-#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
-#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
-#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:138 Src/wptClipEditDlg.cpp:177
+#: Src/wptClipEditDlg.cpp:186 Src/wptClipEditDlg.cpp:267
+#: Src/wptClipEditDlg.cpp:272 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
 msgid "Clipboard"
@@ -715,12 +734,12 @@
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:114
 # c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:120 Src/wptFileManager.cpp:572
 msgid "File Open"
 msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚­"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:122
-#: Src/wptClipEditDlg.cpp:128
+#: Src/wptClipEditDlg.cpp:129
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -729,12 +748,12 @@
 "‚»‚ê‚Å‚à‘±‚¯‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:149
-#: Src/wptClipEditDlg.cpp:167
+#: Src/wptClipEditDlg.cpp:168
 msgid "File Save"
 msgstr "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚é"
 
 # c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
-#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:178 Src/wptFileManager.cpp:108
 #, c-format
 msgid ""
 "\"%s\" already exists.\n"
@@ -745,29 +764,29 @@
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:45 c:\oss\winpt\src\wptMainProc.cpp:181
 # c:\oss\winpt\src\wptMainProc.cpp:249 c:\oss\winpt\src\wptMainProc.cpp:554
-#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
+#: Src/wptClipEditDlg.cpp:219 Src/wptMainProc.cpp:568
 msgid "Clipboard Editor"
 msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:46
-#: Src/wptClipEditDlg.cpp:218
+#: Src/wptClipEditDlg.cpp:220
 msgid "&Copy"
 msgstr "ƒRƒs[(&C)"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:47
-#: Src/wptClipEditDlg.cpp:219
+#: Src/wptClipEditDlg.cpp:221
 msgid "Clea&r"
 msgstr "‰Šú‰»(&R)"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:48 c:\oss\winpt\src\wptGPGOptDlg.cpp:49
 # c:\oss\winpt\src\wptTextInputDlg.cpp:83
-#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:222 Src/wptGPGOptDlg.cpp:56
 #: Src/wptTextInputDlg.cpp:87
 msgid "&Load"
 msgstr "ƒ[ƒh(&L)"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:223 Src/wptClipVerifyDlg.cpp:197
 #: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
 msgid "&Save"
 msgstr "•Û‘¶(&S)"
@@ -777,12 +796,12 @@
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:275
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:695
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:224
 msgid "Add quotes"
 msgstr "ˆø—p•„‚ð’ljÁ‚·‚é"
 
-#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
-#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:225 Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:130
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "•Â‚¶‚é(&C)"
@@ -826,7 +845,7 @@
 #: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
 #: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
 #: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
@@ -2176,12 +2195,14 @@
 msgstr "GPGƒGƒ‰[‚̏ڍׂ͂ ‚è‚Ü‚¹‚ñB"
 
 #: Src/wptGPGME.cpp:278
-msgid "Error during verification process."
+#, fuzzy
+msgid "Error during verification process"
 msgstr "Šm”F’iŠK‚ŃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
 #: Src/wptGPGME.cpp:279
-msgid "The signature is good."
+#, fuzzy
+msgid "The signature is good"
 msgstr "—LŒø‚ȏ–¼"
 
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
@@ -2190,13 +2211,15 @@
 msgstr "–³Œø‚ȏ–¼"
 
 #: Src/wptGPGME.cpp:281
-msgid "The signature could not be checked due to a missing key."
+#, fuzzy
+msgid "The signature could not be checked due to a missing key"
 msgstr "‚È‚­‚È‚Á‚½ƒL[‚Ì‚½‚ߏ–¼‚ªƒ`ƒFƒbƒN‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:190
 # c:\oss\winpt\src\wptKeyManager.cpp:408
 #: Src/wptGPGME.cpp:282
-msgid "No valid OpenPGP signature."
+#, fuzzy
+msgid "No valid OpenPGP signature"
 msgstr "—LŒø‚ÈOpenPGP–¼‚ª‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeysignDlg.cpp:232
@@ -2538,7 +2561,8 @@
 
 # c:\oss\winpt\src\wptHotkey.cpp:43
 #: Src/wptHotkey.cpp:68
-msgid "Current Window Sign Encrypt (ALT+SHIFT+B"
+#, fuzzy
+msgid "Current Window Sign Encrypt (ALT+SHIFT+B)"
 msgstr "ƒJƒŒƒ“ƒgƒEƒBƒ“ƒh‚ð–¼‹y‚ш͆‰»‚·‚é (ALT+SHIFT+B"
 
 # c:\oss\winpt\src\wptHotkey.cpp:44
@@ -3309,7 +3333,7 @@
 #: Src/wptKeyEditDlgs.cpp:2054
 #, c-format
 msgid ""
-"Your keys is listed as a designated revoker for the key\n"
+"Your key is listed as a designated revoker for the key\n"
 "\n"
 "%s\n"
 "\n"
@@ -4410,7 +4434,7 @@
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:577
 msgid "Keyserver Access"
 msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
 
@@ -4666,8 +4690,9 @@
 
 # c:\oss\winpt\src\wptKeyserver.cpp:436
 #: Src/wptKeyserver.cpp:678
+#, fuzzy
 msgid ""
-"Invalid proxy configuration.You need to set a user and a passwordto use "
+"Invalid proxy configuration.You need to set a user and a password to use "
 "proxy authentication!"
 msgstr ""
 "–³Œø‚ȃvƒƒNƒV[‚±‚¤‚¹‚¢Bƒ†[ƒU[–¼‹y‚уpƒXƒ[ƒh‚ðÝ’è‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
@@ -4778,25 +4803,25 @@
 msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:360
+#: Src/wptKeyserverDlg.cpp:361
 msgid "Please select one of the servers."
 msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:365
+#: Src/wptKeyserverDlg.cpp:366
 msgid "Only HTTP keyserver can be used."
 msgstr "HTTPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:382
+#: Src/wptKeyserverDlg.cpp:383
 msgid "DNS Name"
 msgstr "DNS–¼"
 
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:384
 msgid "Port"
 msgstr "ƒ|[ƒg"
 
-#: Src/wptKeyserverDlg.cpp:467
+#: Src/wptKeyserverDlg.cpp:468
 msgid "No space for new keyserver entry"
 msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
 
@@ -4815,12 +4840,12 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:488
+#: Src/wptKeyserverDlg.cpp:489
 msgid "HKP Keyserver"
 msgstr "HKPƒL[ƒT[ƒo["
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:490
 msgid "LDAP Keyserver"
 msgstr "LDAPƒL[ƒT[ƒo["
 
@@ -4839,7 +4864,7 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:491
 msgid "Finger Keyserver"
 msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
 
@@ -4858,74 +4883,74 @@
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:515 Src/wptKeyserverDlg.cpp:732
-#: Src/wptKeyserverDlg.cpp:752
+#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
+#: Src/wptKeyserverDlg.cpp:753
 msgid "Edit Keyserver"
 msgstr "ƒL[ƒT[ƒo[•ÒW"
 
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:608
+#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
 msgid "&Add"
 msgstr "’ljÁ(&A)"
 
 # c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:518
+#: Src/wptKeyserverDlg.cpp:519
 msgid "Type:"
 msgstr "Ží—Þ"
 
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:520
 msgid "Port:"
 msgstr "ƒ|[ƒg"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:521
 msgid "Host name:"
 msgstr "ƒzƒXƒg"
 
 # c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:529
 msgid "Please enter a host name"
 msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
-#: Src/wptKeyserverDlg.cpp:533
+#: Src/wptKeyserverDlg.cpp:534
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:577 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "ŽóM(&R)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:579
+#: Src/wptKeyserverDlg.cpp:580
 msgid "Send key (default is receiving)"
 msgstr "ƒL[‚𑗐M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:581
+#: Src/wptKeyserverDlg.cpp:582
 msgid "Please enter the key ID or email address you search for"
 msgstr "ŒŸõ‚·‚é‚à‚̂̃L[ID‚Ü‚½‚Í“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:583
 msgid "&Search"
 msgstr "ŒŸõ(&S)"
 
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:584
 msgid "C&hange proxy"
 msgstr "ƒvƒƒNƒV[•ÏX(&C)"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:585
 msgid "Set &default"
 msgstr "‹K’èÝ’è(&D)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:610
 msgid "&Remove"
 msgstr "Žæ‚菜‚­(&R)"
 
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:611
 msgid "&Edit"
 msgstr "•ÒW(&E)"
 
@@ -4933,7 +4958,7 @@
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:57
 # c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
 #: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
 #: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
 #: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -4943,28 +4968,28 @@
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:381
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:407
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:693
+#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
 msgid "Please enter the search pattern."
 msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:370
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:677
+#: Src/wptKeyserverDlg.cpp:678
 msgid "Please select one of the keyservers."
 msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:699
 msgid "Only keyids are allowed."
 msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:705
 msgid "Only enter the name of the user."
 msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
 
 # c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:711
 msgid "Only email addresses or keyids are allowed."
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
 
@@ -5399,7 +5424,8 @@
 
 # c:\oss\winpt\src\wptOwnertrustDlg.cpp:89
 #: Src/wptOwnertrustDlg.cpp:131
-msgid "Ownertrust succefully imported."
+#, fuzzy
+msgid "Ownertrust successfully imported."
 msgstr "Š—LŽÒ‚̐M—Š(ownertrust)‚̃Cƒ“ƒ|[ƒg‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
 # c:\oss\winpt\src\wptPassphraseCB.cpp:61

Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Po/pt_BR.po	2006-06-20 09:18:44 UTC (rev 231)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: WinPT 1.0.0\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-06-18 18:43+0200\n"
+"POT-Creation-Date: 2006-06-20 11:24+0200\n"
 "PO-Revision-Date: 2006-06-14 22:00-0300\n"
 "Last-Translator: Eduardo S. Dobay <edudobay at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar.conectiva.com.br>\n"
@@ -57,12 +57,12 @@
 #: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
 #: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
 #: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:360
-#: Src/wptKeyserverDlg.cpp:366 Src/wptKeyserverDlg.cpp:468
-#: Src/wptKeyserverDlg.cpp:528 Src/wptKeyserverDlg.cpp:533
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:678
-#: Src/wptKeyserverDlg.cpp:694 Src/wptKeyserverDlg.cpp:699
-#: Src/wptKeyserverDlg.cpp:705 Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
+#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
+#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
+#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
 msgid "Keyserver"
 msgstr "Servidor de chaves"
 
@@ -94,7 +94,8 @@
 msgstr "Selecionar chaveiro público do GPG"
 
 #: Src/WinPT.cpp:561
-msgid "GPG home directory could not be determited."
+#, fuzzy
+msgid "GPG home directory could not be determined."
 msgstr "O diretório pessoal do GPG não pôde ser determinado."
 
 #: Src/WinPT.cpp:569
@@ -428,37 +429,55 @@
 "Por favor insira o smart card do OpenPGP\n"
 "Pressione OK para continuar ou Cancelar"
 
-#: Src/wptClipDecryptDlg.cpp:57 Src/wptClipDecryptDlg.cpp:168
+#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
 #: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
 #: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
 msgid "user ID not found"
 msgstr "ID de usuário não encontrada"
 
-#: Src/wptClipDecryptDlg.cpp:104
+#: Src/wptClipDecryptDlg.cpp:106
 #, fuzzy
 msgid "Signature status: created with a fully trusted key"
 msgstr "Estado da assinatura: criada com uma chave totalmente confiável"
 
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
 #, fuzzy
 msgid "Signature status: created with a marginal trusted key"
 msgstr "Estado da assinatura: criada com uma chave pouco confiável"
 
-#: Src/wptClipDecryptDlg.cpp:109
+#: Src/wptClipDecryptDlg.cpp:111
 #, fuzzy
 msgid "Signature status: created with an UNTRUSTED key"
 msgstr "Estado da assinatura: criada com uma chave NÃO CONFIÁVEL"
 
-#: Src/wptClipDecryptDlg.cpp:112
+#: Src/wptClipDecryptDlg.cpp:114
 #, fuzzy
 msgid "Signature status: created with an undefined trusted key"
 msgstr "Estado da assinatura: criada com uma chave de confiança indefinida"
 
-#: Src/wptClipDecryptDlg.cpp:172
+#: Src/wptClipDecryptDlg.cpp:124
+#, c-format
+msgid ""
+"*** PGP SIGNATURE VERIFICATION ***\r\n"
+"*** Signature made:    %s\r\n"
+"*** Signature verfied: %s\r\n"
+"*** %s\r\n"
+"*** Signature result:  %s\r\n"
+"*** Signer: %s (0x%s)\r\n"
+"*** BEGIN PGP DECRYPTED TEXT ***\r\n"
+msgstr ""
+
+#: Src/wptClipDecryptDlg.cpp:131
+msgid ""
+"\r\n"
+"*** END PGP DECRYPTED TEXT ***"
+msgstr ""
+
+#: Src/wptClipDecryptDlg.cpp:178
 msgid "Decrypt Verify"
 msgstr "Verificação de decifragem"
 
-#: Src/wptClipDecryptDlg.cpp:173
+#: Src/wptClipDecryptDlg.cpp:179
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -472,7 +491,7 @@
 "Assinatura faita: %s\n"
 "De \"%s\" usando chave de ID 0x%s%s %s"
 
-#: Src/wptClipDecryptDlg.cpp:208 Src/wptClipVerifyDlg.cpp:157
+#: Src/wptClipDecryptDlg.cpp:214 Src/wptClipVerifyDlg.cpp:157
 #: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
 #: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
 #: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1569
@@ -483,14 +502,14 @@
 msgid "Verify"
 msgstr "Verificar"
 
-#: Src/wptClipDecryptDlg.cpp:215 Src/wptClipDecryptDlg.cpp:228
-#: Src/wptClipDecryptDlg.cpp:236 Src/wptClipDecryptDlg.cpp:243
-#: Src/wptClipDecryptDlg.cpp:245 Src/wptFileManager.cpp:1276
+#: Src/wptClipDecryptDlg.cpp:221 Src/wptClipDecryptDlg.cpp:234
+#: Src/wptClipDecryptDlg.cpp:242 Src/wptClipDecryptDlg.cpp:249
+#: Src/wptClipDecryptDlg.cpp:251 Src/wptFileManager.cpp:1276
 #: Src/wptFileManager.cpp:1327
 msgid "Decryption"
 msgstr "Decifragem"
 
-#: Src/wptClipDecryptDlg.cpp:229 Src/wptFileManager.cpp:1328
+#: Src/wptClipDecryptDlg.cpp:235 Src/wptFileManager.cpp:1328
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -499,18 +518,18 @@
 "Cifrado com chave %s, ID %s.%s\n"
 "Decifragem falhou: chave privada indisponível."
 
-#: Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:242
 #, c-format
 msgid "Unsupported algorithm: %s"
 msgstr "Algoritmo não suportado: %s"
 
-#: Src/wptClipDecryptDlg.cpp:242
+#: Src/wptClipDecryptDlg.cpp:248
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Mensagem OpenPGP quebrada (possivelmente: caracteres quoted-printable em "
 "guarda)."
 
-#: Src/wptClipDecryptDlg.cpp:250
+#: Src/wptClipDecryptDlg.cpp:256
 msgid ""
 "WARNING: encrypted message has been manipulated!\n"
 "\n"
@@ -524,31 +543,31 @@
 "É possível que os dados tenham sidos corrompidos durante o transporte\n"
 "mas também é possível que isso seja parte de um ataque."
 
-#: Src/wptClipDecryptDlg.cpp:255
+#: Src/wptClipDecryptDlg.cpp:261
 msgid "*** IMPORTANT ***"
 msgstr "*** IMPORTANTE ***"
 
-#: Src/wptClipDecryptDlg.cpp:258 Src/wptClipEncryptDlg.cpp:210
+#: Src/wptClipDecryptDlg.cpp:264 Src/wptClipEncryptDlg.cpp:210
 #: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
 #: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:286
 #: Src/wptKeyManager.cpp:763 Src/wptKeyManager.cpp:955 Src/wptSymEnc.cpp:94
 msgid "GnuPG Status: Finished"
 msgstr "Estado do GnuPG: Concluído"
 
-#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:129
-#: Src/wptClipEditDlg.cpp:137 Src/wptClipEditDlg.cpp:176
-#: Src/wptClipEditDlg.cpp:185 Src/wptClipEditDlg.cpp:265
-#: Src/wptClipEditDlg.cpp:270 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:64 Src/wptClipEditDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:138 Src/wptClipEditDlg.cpp:177
+#: Src/wptClipEditDlg.cpp:186 Src/wptClipEditDlg.cpp:267
+#: Src/wptClipEditDlg.cpp:272 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:506 Src/wptMainProc.cpp:511
 msgid "Clipboard"
 msgstr "Área de transferência"
 
-#: Src/wptClipEditDlg.cpp:119 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:120 Src/wptFileManager.cpp:572
 msgid "File Open"
 msgstr "Abrir arquivo"
 
-#: Src/wptClipEditDlg.cpp:128
+#: Src/wptClipEditDlg.cpp:129
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -556,11 +575,11 @@
 "O arquivo que você deseja adicionar é muito grande.\n"
 "Prosseguir?"
 
-#: Src/wptClipEditDlg.cpp:167
+#: Src/wptClipEditDlg.cpp:168
 msgid "File Save"
 msgstr "Salvar arquivo"
 
-#: Src/wptClipEditDlg.cpp:177 Src/wptFileManager.cpp:108
+#: Src/wptClipEditDlg.cpp:178 Src/wptFileManager.cpp:108
 #, c-format
 msgid ""
 "\"%s\" already exists.\n"
@@ -569,34 +588,34 @@
 "\"%s\" já existe.\n"
 "Substituir arquivo existente?"
 
-#: Src/wptClipEditDlg.cpp:217 Src/wptMainProc.cpp:568
+#: Src/wptClipEditDlg.cpp:219 Src/wptMainProc.cpp:568
 msgid "Clipboard Editor"
 msgstr "Editor da área de transferência"
 
-#: Src/wptClipEditDlg.cpp:218
+#: Src/wptClipEditDlg.cpp:220
 msgid "&Copy"
 msgstr "&Copiar"
 
-#: Src/wptClipEditDlg.cpp:219
+#: Src/wptClipEditDlg.cpp:221
 msgid "Clea&r"
 msgstr "&Limpar"
 
-#: Src/wptClipEditDlg.cpp:220 Src/wptGPGOptDlg.cpp:56
+#: Src/wptClipEditDlg.cpp:222 Src/wptGPGOptDlg.cpp:56
 #: Src/wptTextInputDlg.cpp:87
 msgid "&Load"
 msgstr "Ca&rregar"
 
-#: Src/wptClipEditDlg.cpp:221 Src/wptClipVerifyDlg.cpp:197
+#: Src/wptClipEditDlg.cpp:223 Src/wptClipVerifyDlg.cpp:197
 #: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
 msgid "&Save"
 msgstr "&Salvar"
 
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:224
 msgid "Add quotes"
 msgstr "Adicionar aspas"
 
-#: Src/wptClipEditDlg.cpp:223 Src/wptKeyEditDlgs.cpp:2121
-#: Src/wptKeyserverDlg.cpp:585 Src/wptMDSumDlg.cpp:130
+#: Src/wptClipEditDlg.cpp:225 Src/wptKeyEditDlgs.cpp:2121
+#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:130
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Fechar"
@@ -630,7 +649,7 @@
 #: Src/wptKeyEditDlgs.cpp:505 Src/wptKeyEditDlgs.cpp:640
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
 #: Src/wptKeygenDlg.cpp:545 Src/wptKeyRevokeDlg.cpp:81
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
 #: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
 #: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
 #: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
@@ -1613,11 +1632,13 @@
 msgstr "Descrição indisponível para o erro do GPG."
 
 #: Src/wptGPGME.cpp:278
-msgid "Error during verification process."
+#, fuzzy
+msgid "Error during verification process"
 msgstr "Erro durante o processo de verificação."
 
 #: Src/wptGPGME.cpp:279
-msgid "The signature is good."
+#, fuzzy
+msgid "The signature is good"
 msgstr "A assinatura está boa."
 
 #: Src/wptGPGME.cpp:280
@@ -1625,11 +1646,13 @@
 msgstr "A assinatura está RUIM!"
 
 #: Src/wptGPGME.cpp:281
-msgid "The signature could not be checked due to a missing key."
+#, fuzzy
+msgid "The signature could not be checked due to a missing key"
 msgstr "A assinatura não pôde ser verificada devido à falta de uma chave."
 
 #: Src/wptGPGME.cpp:282
-msgid "No valid OpenPGP signature."
+#, fuzzy
+msgid "No valid OpenPGP signature"
 msgstr "Assinatura OpenPGP inválida."
 
 #: Src/wptGPGME.cpp:283
@@ -1860,7 +1883,8 @@
 msgstr "Assinar janela atual (ALT+SHIFT+S)"
 
 #: Src/wptHotkey.cpp:68
-msgid "Current Window Sign Encrypt (ALT+SHIFT+B"
+#, fuzzy
+msgid "Current Window Sign Encrypt (ALT+SHIFT+B)"
 msgstr "Assinar/cifrar janela atual (ALT+SHIFT+B)"
 
 #: Src/wptHotkey.cpp:69
@@ -2442,9 +2466,9 @@
 msgstr "Chave assinada com sucesso."
 
 #: Src/wptKeyEditDlgs.cpp:2054
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Your keys is listed as a designated revoker for the key\n"
+"Your key is listed as a designated revoker for the key\n"
 "\n"
 "%s\n"
 "\n"
@@ -3307,7 +3331,7 @@
 msgid "Smart Card support is not available."
 msgstr "Suporte a Smart Card indisponível."
 
-#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1804 Src/wptKeyserverDlg.cpp:577
 msgid "Keyserver Access"
 msgstr "Acesso ao servidor de chaves"
 
@@ -3533,8 +3557,9 @@
 msgstr "Não foi possível salvar o arquivo keyserver.conf"
 
 #: Src/wptKeyserver.cpp:678
+#, fuzzy
 msgid ""
-"Invalid proxy configuration.You need to set a user and a passwordto use "
+"Invalid proxy configuration.You need to set a user and a password to use "
 "proxy authentication!"
 msgstr ""
 "Configuração de proxy inválida. Você precisa definir um usuário e uma senha "
@@ -3608,100 +3633,100 @@
 msgid "This is not a valid OpenPGP key."
 msgstr "Essa não é uma chave OpenPGP válida."
 
-#: Src/wptKeyserverDlg.cpp:360
+#: Src/wptKeyserverDlg.cpp:361
 msgid "Please select one of the servers."
 msgstr "Por favor selecione um dos servidores."
 
-#: Src/wptKeyserverDlg.cpp:365
+#: Src/wptKeyserverDlg.cpp:366
 msgid "Only HTTP keyserver can be used."
 msgstr "Apenas servidores de chaves HTTP podem ser usados."
 
-#: Src/wptKeyserverDlg.cpp:382
+#: Src/wptKeyserverDlg.cpp:383
 msgid "DNS Name"
 msgstr "Nome DNS"
 
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:384
 msgid "Port"
 msgstr "Porta"
 
-#: Src/wptKeyserverDlg.cpp:467
+#: Src/wptKeyserverDlg.cpp:468
 msgid "No space for new keyserver entry"
 msgstr "Sem espaço para nova entrada de servidor de chaves"
 
-#: Src/wptKeyserverDlg.cpp:488
+#: Src/wptKeyserverDlg.cpp:489
 msgid "HKP Keyserver"
 msgstr "Servidor de chaves HKP"
 
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:490
 msgid "LDAP Keyserver"
 msgstr "Servidor de chaves LDAP"
 
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:491
 msgid "Finger Keyserver"
 msgstr "Servidor de chaves Finger"
 
-#: Src/wptKeyserverDlg.cpp:515 Src/wptKeyserverDlg.cpp:732
-#: Src/wptKeyserverDlg.cpp:752
+#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
+#: Src/wptKeyserverDlg.cpp:753
 msgid "Edit Keyserver"
 msgstr "Editar servidor de chaves"
 
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:608
+#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
 msgid "&Add"
 msgstr "&Adicionar"
 
-#: Src/wptKeyserverDlg.cpp:518
+#: Src/wptKeyserverDlg.cpp:519
 msgid "Type:"
 msgstr "Tipo:"
 
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:520
 msgid "Port:"
 msgstr "Porta:"
 
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:521
 msgid "Host name:"
 msgstr "Servidor:"
 
-#: Src/wptKeyserverDlg.cpp:528
+#: Src/wptKeyserverDlg.cpp:529
 msgid "Please enter a host name"
 msgstr "Por favor insira um nome de servidor"
 
-#: Src/wptKeyserverDlg.cpp:533
+#: Src/wptKeyserverDlg.cpp:534
 msgid "Invalid port, valid numbers are < 65535"
 msgstr "Porta inválida; números válidos são < 65535"
 
-#: Src/wptKeyserverDlg.cpp:577 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
 msgid "&Receive"
 msgstr "&Receber"
 
-#: Src/wptKeyserverDlg.cpp:579
+#: Src/wptKeyserverDlg.cpp:580
 msgid "Send key (default is receiving)"
 msgstr "Enviar chave (padrão é receber)"
 
-#: Src/wptKeyserverDlg.cpp:581
+#: Src/wptKeyserverDlg.cpp:582
 msgid "Please enter the key ID or email address you search for"
 msgstr "Por favor insira o ID ou o e-mail da chave que você procura"
 
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:583
 msgid "&Search"
 msgstr "&Localizar"
 
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:584
 msgid "C&hange proxy"
 msgstr "&Mudar proxy"
 
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:585
 msgid "Set &default"
 msgstr "Definir como &padrão"
 
-#: Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:610
 msgid "&Remove"
 msgstr "&Remover"
 
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:611
 msgid "&Edit"
 msgstr "&Editar"
 
-#: Src/wptKeyserverDlg.cpp:644 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
 #: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
 #: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
 #: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -3709,23 +3734,23 @@
 msgid "Proxy Settings"
 msgstr "Configurações de proxy"
 
-#: Src/wptKeyserverDlg.cpp:652 Src/wptKeyserverDlg.cpp:693
+#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
 msgid "Please enter the search pattern."
 msgstr "Por favor insira o padrão de busca."
 
-#: Src/wptKeyserverDlg.cpp:677
+#: Src/wptKeyserverDlg.cpp:678
 msgid "Please select one of the keyservers."
 msgstr "Por favor selecione um dos servidores."
 
-#: Src/wptKeyserverDlg.cpp:698
+#: Src/wptKeyserverDlg.cpp:699
 msgid "Only keyids are allowed."
 msgstr "Apenas IDs de chave são permitidos."
 
-#: Src/wptKeyserverDlg.cpp:704
+#: Src/wptKeyserverDlg.cpp:705
 msgid "Only enter the name of the user."
 msgstr "Insira apenas o nome do usuário."
 
-#: Src/wptKeyserverDlg.cpp:710
+#: Src/wptKeyserverDlg.cpp:711
 msgid "Only email addresses or keyids are allowed."
 msgstr "Apenas e-mails ou IDs de chave são permitidos."
 
@@ -4085,7 +4110,8 @@
 msgstr "Selecione o nome do arquivo para entrada"
 
 #: Src/wptOwnertrustDlg.cpp:131
-msgid "Ownertrust succefully imported."
+#, fuzzy
+msgid "Ownertrust successfully imported."
 msgstr "Confiança importada com sucesso."
 
 #: Src/wptPassphraseCB.cpp:98

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/ChangeLog	2006-06-20 09:18:44 UTC (rev 231)
@@ -1,3 +1,11 @@
+2006-06-19  Timo Schulz  <ts at g10code.de>
+
+	* wptClipDecryptDlg.cpp (verify_get_clip_info): Improved
+	format of the sig info text.
+	* wptKeyserver.cpp (check_hkp_response): Invert error logic.
+	* wptKeyserverDlg.cpp (keyserver_recv_key): Corrected error
+	handling.
+	
 2006-06-18  Timo Schulz  <ts at g10code.de>
 
 	* wptKeygenDlg.cpp (keygen_dlg_proc): Fix typo.

Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/WinPT.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -558,7 +558,7 @@
 	    }
 	}
 	else {
-	    msg_box (NULL, _("GPG home directory could not be determited."),
+	    msg_box (NULL, _("GPG home directory could not be determined."),
 		     _("WinPT Error"), MB_ERR);
 	    goto start;
 	}

Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptClipDecryptDlg.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -24,6 +24,8 @@
 #endif
 
 #include <windows.h>
+#include <assert.h>
+#include <time.h>
 
 #include "wptTypes.h"
 #include "wptW32API.h"
@@ -119,25 +121,31 @@
 verify_get_clip_info (gpgme_signature_t sig, char **r_header, char **r_footer)
 {
     struct winpt_key_s pk;
-    const char *head = "***** BEGIN PGP SIGNED TEXT *****\r\n"
-		       "***** Signature made %s using key ID 0x%s\r\n"
-		       "***** %s\r\n"
-		       "***** \"%s\" from %s\r\n";
-    const char *foot = "***** END PGP SIGNED TEXT *****";    
-    const char *s, *made, *ot;
+    const char *head = _("*** PGP SIGNATURE VERIFICATION ***\r\n"
+		         "*** Signature made:    %s\r\n"
+		         "*** Signature verfied: %s\r\n"
+		         "*** %s\r\n"
+		         "*** Signature result:  %s\r\n"
+		         "*** Signer: %s (0x%s)\r\n"
+		         "*** BEGIN PGP DECRYPTED TEXT ***\r\n");
+    const char *foot = _("\r\n*** END PGP DECRYPTED TEXT ***");
+    const char *s, *made, *ver, *ot;
     char *p;
 
     if (winpt_get_pubkey (sig->fpr, &pk))
 	BUG (0);
+
     ot = verify_get_key_ownertrust (pk.ctx->owner_trust, NULL);
     made = strtimestamp (sig->timestamp);
+    ver = strtimestamp (time (NULL));
     s = get_gpg_sigstat (sig->summary);
     p = new char[strlen (head) + strlen (s) + strlen (made) + 
-		 strlen (sig->fpr) + strlen (ot) + 
+		 strlen (sig->fpr) + strlen (ot) + strlen (ver) +
 		 strlen (pk.ext->uids->uid) + 1];
     if (!p)
 	BUG (0);
-    sprintf (p, head, made, get_keyid_from_fpr (sig->fpr), ot, s, pk.ext->uids->uid);
+    sprintf (p, head, made, ver, ot, s, 
+		pk.ext->uids->uid, get_keyid_from_fpr (sig->fpr));
     *r_header = p;
     *r_footer = m_strdup (foot);
 }
@@ -153,16 +161,14 @@
     char *pka_info = NULL;
     int novalid = 0;
 
-    if (!sig->fpr)
-	BUG (NULL);
+    assert (sig->fpr != NULL);
 	
     keyid = get_keyid_from_fpr (sig->fpr);
     memset (&key, 0, sizeof (key));
-
     if (!winpt_get_pubkey (keyid, &key)) {
 	s = verify_get_key_ownertrust (key.ctx->owner_trust, &novalid);
 	uid = key.ext->uids->uid;	
-    }	
+    }
     else {
 	s = "";
 	uid = _("user ID not found");

Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptClipEditDlg.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -86,8 +86,9 @@
 
     if (header && footer) {
 	const char *fmt = "%s\r\n%s\r\n%s";
-	int len = strlen (header) + strlen (footer) + strlen (fmt) + strlen (p);
+	int len;
 
+	len = strlen (header) + strlen (footer) + strlen (fmt) + strlen (p);
 	pp = new char[len + 1];
 	if (!pp)
 	    BUG (0);
@@ -214,6 +215,7 @@
 
     switch (msg)  {
     case WM_INITDIALOG:
+	/* XXX: it would be really nice to have tempest prevention fonts. */
 	SetWindowText (dlg, _("Clipboard Editor"));
 	SetDlgItemText (dlg, IDC_CLIPEDIT_SEND, _("&Copy"));
 	SetDlgItemText (dlg, IDC_CLIPEDIT_CLEAR, _("Clea&r"));

Modified: trunk/Src/wptGPGME.cpp
===================================================================
--- trunk/Src/wptGPGME.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptGPGME.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -275,11 +275,11 @@
 get_gpg_sigstat (gpgme_sigsum_t sum)
 {
     const char *gpg_sigstat[] = {
-	_("Error during verification process."),
-	_("The signature is good."),
+	_("Error during verification process"),
+	_("The signature is good"),
 	_("The signature is BAD!"),
-	_("The signature could not be checked due to a missing key."),
-	_("No valid OpenPGP signature."),
+	_("The signature could not be checked due to a missing key"),
+	_("No valid OpenPGP signature"),
 	_("Signature Error"),
 	_("Good Signature (Expired Key)"),
 	_("Good Signature (Revoked Key)"),

Modified: trunk/Src/wptHotkey.cpp
===================================================================
--- trunk/Src/wptHotkey.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptHotkey.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -65,7 +65,7 @@
     case  5: return _("Current Window Encrypt (ALT+SHIFT+E)");
     case  6: return _("Current Window Decrypt/Verify (ALT+SHIFT+D)");
     case  7: return _("Current Window Sign (ALT+SHIFT+S)");
-    case  8: return _("Current Window Sign Encrypt (ALT+SHIFT+B");
+    case  8: return _("Current Window Sign Encrypt (ALT+SHIFT+B)");
     default: return _("Unknown Hotkey");
     }
     return NULL;

Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptKeyEditDlgs.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -2051,7 +2051,7 @@
     int id;
 
     inf = km_key_get_info (key, 0);
-    warn = _("Your keys is listed as a designated revoker for the key\n\n"
+    warn = _("Your key is listed as a designated revoker for the key\n\n"
 	     "%s\n\n"
 	     "Are you sure you want to create a revocation certificate\n"
 	     "which allow to revoke the key listed above?");

Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptKeyserver.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -169,7 +169,7 @@
 
     /* If we find no 'Error' substring, we assume a success. */
     if (!stristr (resp, "Error"))
-	return 0;
+	return -1;
 
     memset (txt, 0, txtlen);
     p = strstr (resp, "\r\n\r\n");
@@ -213,7 +213,7 @@
 	!strstr (resp, "HTTP/1.1 500 OK"))
 	return ec; /* http error */
 
-    if (parse_keyserver_error (resp, hkp_errmsg, sizeof (hkp_errmsg)-2)) {
+    if (!parse_keyserver_error (resp, hkp_errmsg, sizeof (hkp_errmsg)-2)) {
 	if (!strlen (hkp_errmsg))
 	    _snprintf (hkp_errmsg, sizeof (hkp_errmsg)-1, 
 			"Unknown keyserver error");
@@ -676,7 +676,7 @@
 	update_proxy_user (user, pass);	
     else if (user && !pass || !user && pass) {
 	msg_box (NULL, _("Invalid proxy configuration."
-			 "You need to set a user and a password"
+			 "You need to set a user and a password "
 	                 "to use proxy authentication!"), 
 			 _("Proxy Error"), MB_ERR);
     }

Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptKeyserverDlg.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -237,9 +237,10 @@
 
 leave:
     free_if_alloc (rawkey);
-    gpgme_release (ctx);
-    gpgme_data_release (keydata);
-
+    if (ctx != NULL)
+	gpgme_release (ctx);
+    if (keydata != NULL)
+	gpgme_data_release (keydata);
     return rc;
 }
 

Modified: trunk/Src/wptOwnertrustDlg.cpp
===================================================================
--- trunk/Src/wptOwnertrustDlg.cpp	2006-06-19 14:05:28 UTC (rev 230)
+++ trunk/Src/wptOwnertrustDlg.cpp	2006-06-20 09:18:44 UTC (rev 231)
@@ -128,7 +128,7 @@
 		msg_box (dlg, gpgme_strerror (err), _("Ownertrust"), MB_ERR);
 		return TRUE;
 	    }
-	    status_box (dlg, _("Ownertrust succefully imported."), _("GnuPG Status"));
+	    status_box (dlg, _("Ownertrust successfully imported."), _("GnuPG Status"));
 	    return TRUE;
             
         case IDCANCEL:

More information about the Winpt-commits mailing list