[Winpt-commits] r246 - in trunk: . Doc Doc/website Po Src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Jul 11 10:56:01 CEST 2006


Author: twoaday
Date: 2006-07-11 10:55:57 +0200 (Tue, 11 Jul 2006)
New Revision: 246

Modified:
   trunk/Doc/website/contact.html
   trunk/Doc/website/download.html
   trunk/Doc/website/index.html
   trunk/Doc/website/related.html
   trunk/Doc/winpt.texi
   trunk/NEWS
   trunk/Po/ChangeLog
   trunk/Po/de.po
   trunk/Po/jp.po
   trunk/Po/pt_BR.po
   trunk/README
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/resource.h
   trunk/Src/wptClipEditDlg.cpp
   trunk/Src/wptMainProc.cpp
   trunk/THANKS
   trunk/configure.ac
Log:


Modified: trunk/Doc/website/contact.html
===================================================================
--- trunk/Doc/website/contact.html	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Doc/website/contact.html	2006-07-11 08:55:57 UTC (rev 246)
@@ -51,12 +51,19 @@
           </p>          </td>
         <td width="710" align="left" valign="top"> <p class="style2">
 	Your first point of contact for WinPT should be through the
-mailing lists or the forum. 
+	mailing lists or the forum. 
 	You can view and subscribe to the WinPT mailing lists through the <a href="http://wald.intevation.org/projects/winpt/" target="_blank">development website</a>.</p>
           <p class="style2">If you need to email us about WinPT, please contact the 
 	  project leader at <a href="mailto:twoaday at NOSPAMfreakmail.de?subject=WinPT">twoaday at freakmail.de</a>.
 	  &nbsp;<br>(you need to remove NOSPAM after the at-sign)
           </p>
+	  
+	  <p class="style2">
+	  If you prefer encrypted mail, you use this OpenPGP key
+	  for encryption: &nbsp;<br>
+	  pub 1536R/<a href="twoaday.asc">27F36D14</a> 2003-12-08 Timo Schulz
+	  </p>
+	  
           <p class="style2">
 	  Please remember that this is a free project. 
 	  There are limited resources available to answer questions. 
@@ -64,8 +71,12 @@
 	  to visit the <a href="http://www.gnupg.org" target="_blank">GnuPG website</a> or check 
 	  available forums about GPG and/or Cryptography to see if
 	  your question might be already answered there.
-	  They have a large amount of clear documentation online, and active support lists. </p>
-          <p>&nbsp;</p>          </td>
+	  They have a large amount of clear documentation online, and active support lists.
+	  &nbsp;<br>
+	  You can help the project by contributing code, documentation, icons or translation.
+	  </p>
+          <p>&nbsp;</p>          
+	  </td>
       </tr>
     </table></td>
   </tr>

Modified: trunk/Doc/website/download.html
===================================================================
--- trunk/Doc/website/download.html	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Doc/website/download.html	2006-07-11 08:55:57 UTC (rev 246)
@@ -54,25 +54,38 @@
         <td width="710" align="left" valign="top"> 
 	<p class="style2">Remember that you need GnuPG installed on your computer to use WinPT. You can get GnuPG for free from the <a href="http://www.gnupg.org" target="_blank">GnuPG website</a>. </p>
           <p class="style4">The latest version of WinPT is 1.0.0pre1.</p>
-          <p class="style2"> 
-	  Latest version: <a href="http://wald.intevation.org/frs/download.php/139/winpt-1.0.0pre1-exe.zip">download</a>&nbsp;
+	  
+          <p class="style2">
+	  Latest <b>binary</b> version: <a href="http://wald.intevation.org/frs/download.php/139/winpt-1.0.0pre1-exe.zip">download</a>&nbsp;
 	  <a href="http://wald.intevation.org/frs/download.php/140/winpt-1.0.0pre1-exe.zip.sig">signature</a>
 	  &nbsp;<br>sha1sum: <tt>6543d03805201708298a8d4d6f448452ef61f8fb</tt>
-         </p>
-          <p class="style2">Source code: <a href="http://wald.intevation.org/frs/download.php/137/winpt-1.0.0pre1.tar.bz2">download</a>&nbsp;
+	  </p>
+	 
+          <p class="style2"><b>Source</b> code: <a href="http://wald.intevation.org/frs/download.php/137/winpt-1.0.0pre1.tar.bz2">download</a>&nbsp;
 	  <a href="http://wald.intevation.org/frs/download.php/138/winpt-1.0.0pre1.tar.bz2.sig">signature</a>
 	  &nbsp;<br>sha1sum: <tt>1bec44790e1c87869972c6986f41a2e73af83212</tt>
 	  </p>
-          <p class="style2">As well as the basic WinPT downloads, you can also download:  </p>
+	  
+	  <!-- uncomment this only if we need a special gpg version
+	  <p class="style2">
+	  <u>Required</u> GnuPG <a href="gpg.exe.zip">binary</a> (<a href="gpg.exe.zip.sig">signature</a>) for the current WinPT version
+	  </p>
+	  -->
+	  
+          <p class="style2">As well as the basic WinPT downloads, you can also download:</p>
+	  
           <p class="style2">
-	  A graphical  installer with WinPT and GnuPG bundled together (<a href="http://www.gpg4win.org">Gpg4Win<a/>)
+	  A graphical <b>installer</b> with WinPT and GnuPG bundled together (<a href="http://www.gpg4win.org">Gpg4Win<a/>)
 	  &nbsp;<br>
 	  Lastest version: <a href="http://ftp.gpg4win.org/gpg4win-1.0.3.exe">download</a> &nbsp; 
-	  <a href="http://ftp.gpg4win.org/gpg4win-1.0.3.exe.sig">signature</a><br />
+	  <a href="http://ftp.gpg4win.org/gpg4win-1.0.3.exe.sig">signature</a><br/>
+	  </p>
+	  
 	  <p class="style2">Download OpenPGP <a href="twoaday.asc">keys</a> used for signing the released files </p>
           <p class="style2">&nbsp;</p>
           <p class="style3">
-	  WinPT and related software is licensed under the GNU GPL, and can be freely used, redistributed or modified.     It is is distributed in the hope that it will be useful, 
+	  WinPT and related software is licensed under the GNU GPL, and can be freely used, redistributed or 
+	  modified. It is is distributed in the hope that it will be useful,
 	  but WITHOUT ANY WARRANTY; without even the implied warranty of 
 	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
 	  GNU General Public License for more details.</p>
@@ -82,8 +95,10 @@
     </table></td>
   </tr>
 </table>
-<p align="center" class="style3"><!--Creative Commons License--><a rel="license" href="http://creativecommons.org/licenses/by/2.5/"><img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights20.png"/></a><br/>
-		The text of this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.<br />
+<p align="center" class="style3">
+<!--Creative Commons License-->
+<a rel="license" href="http://creativecommons.org/licenses/by/2.5/"><img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights20.png"/></a><br/>
+The text of this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.<br />
 </p>
 </body>
 </html>

Modified: trunk/Doc/website/index.html
===================================================================
--- trunk/Doc/website/index.html	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Doc/website/index.html	2006-07-11 08:55:57 UTC (rev 246)
@@ -2,8 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="keywords" content="WinPT Privacy GPG GnuPG Crypto Tray OpenPGP Frontend Shell">
+<meta name="keywords" content="WinPT Privacy PGP GPG GnuPG Crypto Tray Taskbar OpenPGP Frontend Shell">
 
+<!-- original author: Shane M. Coughlan -->
+
 <title>WinPT</title>
 <style type="text/css">
 <!--
@@ -57,7 +59,7 @@
         <td width="710" align="left" valign="top"> 
 	<p class="style2">
 	WinPT is a taskbar front-end for GnuPG which includes key 
-	management, encryption via the clipboard and/or direct file 
+	management, encryption via the clipboard, direct file 
 	encryption and support for OpenPGP smartcards.
 	</p>
 	<p class="style2">
@@ -76,6 +78,12 @@
     </table></td>
   </tr>
 </table>
+
+<p align="center" class="style3">
+    <b>Note:</b>
+    The Windows Privacy Tools project at SourceForge is no longer active.
+</p>
+
 <p align="center" class="style3"><a rel="license" href="http://creativecommons.org/licenses/by/2.5/"><img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights20.png"/></a><br/>
 The text of this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.<br />
 </p>

Modified: trunk/Doc/website/related.html
===================================================================
--- trunk/Doc/website/related.html	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Doc/website/related.html	2006-07-11 08:55:57 UTC (rev 246)
@@ -59,6 +59,8 @@
 	  GnuPG for Outlook Express <a href="http://wald.intevation.org/projects/gpgoe" target="_blank">gpgoe</a>
 	  <li>
 	  GnuPG Explorer Extension <a href="http://gpgee.excelcia.org/" target="_blank">gpgee</a>
+	  <li>
+	  GnuPG for Windows <a href="http://www.gpg4win.org">gpg4win</a>
 	  </ul>
 	  </p>
           <p>&nbsp;</p>          </td>

Modified: trunk/Doc/winpt.texi
===================================================================
--- trunk/Doc/winpt.texi	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Doc/winpt.texi	2006-07-11 08:55:57 UTC (rev 246)
@@ -22,14 +22,16 @@
 
 You need at least Windows 98/2K/XP, but Windows XP or better is
 recommend. The program also works on NT/95/ME but there is no support
-for these OS versions any longer.
+for these OS versions any longer. Mainly because the OS vendor also
+dropped support and no bug fixes will be provided any longer.
 
 @section A short Introduction
 
 WinPT is a graphical GnuPG front-end which resides in the task bar.
 It is divided into several, so-called, managers. There is a manager
 for the keyring, for files and for smart cards. The aim of the program
-is to secure email communication and to perform file encryption.
+is to secure email communication and to perform file encryption and
+to allow an easy and user friendly way for key management.
 
 @subsection What is GnuPG
 GnuPG is a tool for secure communication and data storage.
@@ -83,7 +85,7 @@
 can download it from http://wald.intevation.org/projects/winpt.
 Download the zip file with the binaries inside and unpack them in
 a folder. All files need to be in the same folder, so if you change
-the folder don't forget to move all files.
+the folder do not forget to move all files.
 You should also download and verify the signature of the packet to 
 make sure that the release is really authentic.
 
@@ -143,7 +145,7 @@
 @section The First Start
 
 This section is only important for people who never installed
-and/or used WinPT before.
+and/or used WinPT before and thus no keyrings are available.
 
 When the program is started the first time, it offers two choices.
 The one is to generate a key pair and the other is to copy
@@ -153,7 +155,9 @@
 
 Now a new dialog is shown which requests some information from
 the user to allow a meaningful association between the key and
-the user. If the user prefer RSA keys, the check box should be marked. 
+the user. If the user prefer RSA keys, the check box should be marked.
+But this is a decision of personal taste and does not influence the security 
+or anything else.
 If the entered data is OK, WinPT then generates a new key pair. As long
 as this step takes, a progress dialog is shown to indicate the 
 enduring process. When the generation of the keypair is done, WinPT 
@@ -163,6 +167,25 @@
 why it is also important to store the backup, at least of the
 secret keyring, at a @strong{safe} place.
 
+ at section The Passphrase for the Secret Key
+First a short explaination what passphrase is. A passphrase is like
+a password but usually longer, maybe a sentence, which can consists of
+any 7-bit ASCII characters. It is used to protect your secret key
+and thus it is very import to chose a secure passphrase. If your
+computer, and thus the secret key, were stolen and an attacker can
+guess your passphrase he is able to decrypt all your data and to
+create signatures in your name! A good passphrase is difficult
+to guess but easy to remember and should be at least 10 characters long.
+An easy way to generate a strong passphrase is to use a sentence only
+you know but you can easily remind and then take the first letter of
+each word, plus some special characters and maybe even some intentionally
+made spelling mistakes. 
+
+Example: Row - row - row your boat, gently down the stream
+Passphrase: R-r-ryb,gdt
+
+Never write down or passphrase or share it among other people!
+
 @section Keyserver Access
 
 An easy way to retrieve keys is the keyserver. You can think of

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/NEWS	2006-07-11 08:55:57 UTC (rev 246)
@@ -880,7 +880,10 @@
 * Correct sorting problem in the Encryption dialog and that
   sometimes the wrong icon is displayed in the header control.
 
-* Simplify Clipboard Editor quoting.
+* Simplify Clipboard Editor dialog.
+  It now has a menu to avoid the overloaded look with many
+  buttons. As a new feature, it also provides shortcuts for
+  some GPG commands.
 
 * Fix problem in the control logic of the GPG preference dialog.
   Now a changed home dir should no longer be displayed again

Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Po/ChangeLog	2006-07-11 08:55:57 UTC (rev 246)
@@ -1,3 +1,7 @@
+2006-07-05  Timo Schulz  <ts at g10code.de>
+
+	* de.po: Updated.
+	
 2006-06-28  Timo Schulz  <ts at g10code.de>
 
 	* jp.po: Updated by its author.

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Po/de.po	2006-07-11 08:55:57 UTC (rev 246)
@@ -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-07-01 22:09+0200\n"
+"POT-Creation-Date: 2006-07-06 22:49+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"
@@ -579,20 +579,20 @@
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
-#: Src/wptClipEditDlg.cpp:68 Src/wptClipEditDlg.cpp:134
-#: Src/wptClipEditDlg.cpp:142 Src/wptClipEditDlg.cpp:181
-#: Src/wptClipEditDlg.cpp:190 Src/wptClipEditDlg.cpp:269
-#: Src/wptClipEditDlg.cpp:274 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
+#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
+#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
-#: Src/wptClipEditDlg.cpp:124 Src/wptFileManager.cpp:639
+#: Src/wptClipEditDlg.cpp:113 Src/wptFileManager.cpp:639
 msgid "File Open"
 msgstr "Datei öffnen"
 
-#: Src/wptClipEditDlg.cpp:133
+#: Src/wptClipEditDlg.cpp:122
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -600,51 +600,51 @@
 "Die Datei, die Sie hinzufügen wollen, ist sehr groß!\n"
 "Wirklich fortfahren?"
 
-#: Src/wptClipEditDlg.cpp:172
+#: Src/wptClipEditDlg.cpp:160
 msgid "File Save"
 msgstr "Datei speichern"
 
-#: Src/wptClipEditDlg.cpp:182 Src/wptFileManager.cpp:131
-#, c-format
-msgid ""
-"\"%s\" already exists.\n"
-"Replace existing file?"
-msgstr ""
-"\"%s\" existiert bereits.\n"
-"Vorhandene Datei überschreiben?"
+#: Src/wptClipEditDlg.cpp:186
+msgid "Data successfully written to file."
+msgstr "Daten erfolgreich in Datei gespeichert."
 
-#: Src/wptClipEditDlg.cpp:220 Src/wptMainProc.cpp:571
-msgid "Clipboard Editor"
-msgstr "Zwischenablagen-Editor"
-
-#: Src/wptClipEditDlg.cpp:221
+#: Src/wptClipEditDlg.cpp:212 Src/wptClipEditDlg.cpp:222
 msgid "&Copy"
 msgstr "&Kopieren"
 
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:213
 msgid "Clea&r"
 msgstr "&Löschen"
 
-#: Src/wptClipEditDlg.cpp:223 Src/wptGPGOptDlg.cpp:56
-#: Src/wptTextInputDlg.cpp:87
-msgid "&Load"
-msgstr "&Laden"
-
-#: Src/wptClipEditDlg.cpp:224 Src/wptClipVerifyDlg.cpp:197
-#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
-msgid "&Save"
-msgstr "&Speichern"
-
-#: Src/wptClipEditDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:214
 msgid "&Quote"
 msgstr "&Quote"
 
-#: Src/wptClipEditDlg.cpp:226 Src/wptKeyEditDlgs.cpp:2151
-#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:208
-#: Src/wptOwnertrustDlg.cpp:103
-msgid "&Close"
-msgstr "&Schliessen"
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+msgid "&Open..."
+msgstr "Ö&ffnen.."
 
+#: Src/wptClipEditDlg.cpp:216 Src/wptMDSumDlg.cpp:207
+msgid "&Save..."
+msgstr "&Speichern..."
+
+# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+msgid "&Paste"
+msgstr "&Einfügen"
+
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+msgid "&Encrypt"
+msgstr "&Verschlüsseln"
+
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+msgid "&Decrypt"
+msgstr "&Entschlüsseln"
+
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:571
+msgid "Clipboard Editor"
+msgstr "Zwischenablagen-Editor"
+
 #: Src/wptClipEncryptDlg.cpp:99
 msgid "key not found"
 msgstr "Schlüssel nicht gefunden"
@@ -760,6 +760,11 @@
 "\n"
 "Möchten Sie versuchen, den Schlüssel vom Schlüsselserver zu importieren?"
 
+#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:55
+msgid "&Save"
+msgstr "&Speichern"
+
 #: Src/wptClipVerifyDlg.cpp:225
 msgid "Invalid signature state."
 msgstr "Ungültige Signatur."
@@ -1037,6 +1042,15 @@
 msgid "File Manager"
 msgstr "Dateimanager"
 
+#: Src/wptFileManager.cpp:131
+#, c-format
+msgid ""
+"\"%s\" already exists.\n"
+"Replace existing file?"
+msgstr ""
+"\"%s\" existiert bereits.\n"
+"Vorhandene Datei überschreiben?"
+
 #: Src/wptFileManager.cpp:153
 #, c-format
 msgid ""
@@ -1375,6 +1389,7 @@
 
 #: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:966
 #: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
+#: Src/wptMainProc.cpp:405
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1382,22 +1397,10 @@
 msgid "View"
 msgstr "Ansicht"
 
-#: Src/wptFileManagerDlg.cpp:507
-msgid "&Open..."
-msgstr "Ö&ffnen.."
-
-#: Src/wptFileManagerDlg.cpp:508
-msgid "&Encrypt"
-msgstr "&Verschlüsseln"
-
 #: Src/wptFileManagerDlg.cpp:509 Src/wptFileManagerDlg.cpp:586
 msgid "Encrypt into ZIP"
 msgstr "Verschlüsseln in ZIP"
 
-#: Src/wptFileManagerDlg.cpp:510
-msgid "&Decrypt"
-msgstr "&Entschlüsseln"
-
 #: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
 #: Src/wptKeyManagerDlg.cpp:1031
 msgid "&Sign"
@@ -1437,11 +1440,6 @@
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
-#: Src/wptFileManagerDlg.cpp:520
-msgid "&Paste"
-msgstr "&Einfügen"
-
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:423
 #: Src/wptFileManagerDlg.cpp:521
 msgid "&Select All"
@@ -1719,6 +1717,10 @@
 msgid "GnuPG Configuration File"
 msgstr "GnuPG Konfigurationsdatei"
 
+#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+msgid "&Load"
+msgstr "&Laden"
+
 #: Src/wptGPGOptDlg.cpp:69
 msgid "The 'gpg.conf' file is not loaded."
 msgstr "Die 'gpg.conf' wurde nicht geladen"
@@ -2530,12 +2532,19 @@
 #: Src/wptKeyEditDlgs.cpp:2095
 msgid "Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate"
 msgstr ""
+"Fähigkeiten: C = Zertifizieren, S = Signieren, E = Verschlüsseln, A = "
+"Authentifizierung"
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:1739
 #: Src/wptKeyEditDlgs.cpp:2150
 msgid "Command>"
 msgstr "Kommando>"
 
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
+msgid "&Close"
+msgstr "&Schliessen"
+
 #: Src/wptKeyEditDlgs.cpp:2153
 msgid "&Revoke..."
 msgstr "&Widerrufen..."
@@ -4079,10 +4088,6 @@
 msgid "Could not set current window mode hooks."
 msgstr "Konnte \"Current Window\" Hooks nicht setzen."
 
-#: Src/wptMainProc.cpp:405
-msgid "Edit Clipboard"
-msgstr "Zwischenablage bearbeiten"
-
 #: Src/wptMainProc.cpp:406
 msgid "About..."
 msgstr "Über..."
@@ -4137,10 +4142,6 @@
 msgid "Digest"
 msgstr "Prüfsumme"
 
-#: Src/wptMDSumDlg.cpp:207
-msgid "&Save..."
-msgstr "&Speichern..."
-
 #: Src/wptMDSumDlg.cpp:209
 msgid "Save to clipboard"
 msgstr "In Ablage speichern"
@@ -4562,6 +4563,9 @@
 msgid "Signed"
 msgstr "Signiert"
 
+#~ msgid "Edit Clipboard"
+#~ msgstr "Zwischenablage bearbeiten"
+
 #~ msgid "Could not set keylist window procedure."
 #~ msgstr "Konnte \"keylist window procedure\" nicht setzen."
 

Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Po/jp.po	2006-07-11 08:55:57 UTC (rev 246)
@@ -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-07-01 22:09+0200\n"
+"POT-Creation-Date: 2006-07-06 22:49+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"
@@ -729,10 +729,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:68 Src/wptClipEditDlg.cpp:134
-#: Src/wptClipEditDlg.cpp:142 Src/wptClipEditDlg.cpp:181
-#: Src/wptClipEditDlg.cpp:190 Src/wptClipEditDlg.cpp:269
-#: Src/wptClipEditDlg.cpp:274 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
+#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
+#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
 msgid "Clipboard"
@@ -740,12 +740,12 @@
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:114
 # c:\oss\winpt\src\wptFileManager.cpp:309
-#: Src/wptClipEditDlg.cpp:124 Src/wptFileManager.cpp:639
+#: Src/wptClipEditDlg.cpp:113 Src/wptFileManager.cpp:639
 msgid "File Open"
 msgstr "ƒtƒ@ƒCƒ‹‚ðŠJ‚­"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:122
-#: Src/wptClipEditDlg.cpp:133
+#: Src/wptClipEditDlg.cpp:122
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -754,61 +754,62 @@
 "‚»‚ê‚Å‚à‘±‚¯‚Ü‚·‚©H"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:149
-#: Src/wptClipEditDlg.cpp:172
+#: Src/wptClipEditDlg.cpp:160
 msgid "File Save"
 msgstr "ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚é"
 
-# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
-#: Src/wptClipEditDlg.cpp:182 Src/wptFileManager.cpp:131
-#, c-format
-msgid ""
-"\"%s\" already exists.\n"
-"Replace existing file?"
-msgstr ""
-"\"%s\" ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ä‚¢‚Ü‚·B\n"
-"ã‘‚«‚µ‚Ü‚·‚©H"
+# c:\oss\winpt\src\wptCardDlg.cpp:610
+#: Src/wptClipEditDlg.cpp:186
+#, fuzzy
+msgid "Data successfully written to file."
+msgstr "ƒL[‚̍쐬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
 
-# 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:220 Src/wptMainProc.cpp:571
-msgid "Clipboard Editor"
-msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
-
 # c:\oss\winpt\src\wptClipEditDlg.cpp:46
-#: Src/wptClipEditDlg.cpp:221
+#: Src/wptClipEditDlg.cpp:212 Src/wptClipEditDlg.cpp:222
 msgid "&Copy"
 msgstr "ƒRƒs[(&C)"
 
 # c:\oss\winpt\src\wptClipEditDlg.cpp:47
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:213
 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:223 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:224 Src/wptClipVerifyDlg.cpp:197
-#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
-msgid "&Save"
-msgstr "•Û‘¶(&S)"
-
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptClipEditDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:214
 #, fuzzy
 msgid "&Quote"
 msgstr "I—¹(&Q)"
 
-#: Src/wptClipEditDlg.cpp:226 Src/wptKeyEditDlgs.cpp:2151
-#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:208
-#: Src/wptOwnertrustDlg.cpp:103
-msgid "&Close"
-msgstr "•Â‚¶‚é(&C)"
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+msgid "&Open..."
+msgstr "ŠJ‚­(&O)..."
 
+# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
+#: Src/wptClipEditDlg.cpp:216 Src/wptMDSumDlg.cpp:207
+msgid "&Save..."
+msgstr "•Û‘¶...(&S)"
+
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+msgid "&Paste"
+msgstr "‚Í‚è•t‚¯(&P)"
+
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:355
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+msgid "&Encrypt"
+msgstr "ˆÃ†‰»(&E)"
+
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:356
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+msgid "&Decrypt"
+msgstr "•œ†(&D)"
+
+# 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:221 Src/wptMainProc.cpp:571
+msgid "Clipboard Editor"
+msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
+
 # c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
 #: Src/wptClipEncryptDlg.cpp:99
 msgid "key not found"
@@ -965,6 +966,12 @@
 "\n"
 "ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
 
+# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
+#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:55
+msgid "&Save"
+msgstr "•Û‘¶(&S)"
+
 # c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
 #: Src/wptClipVerifyDlg.cpp:225
 msgid "Invalid signature state."
@@ -1353,6 +1360,16 @@
 msgid "File Manager"
 msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
 
+# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:152
+#: Src/wptFileManager.cpp:131
+#, c-format
+msgid ""
+"\"%s\" already exists.\n"
+"Replace existing file?"
+msgstr ""
+"\"%s\" ƒtƒ@ƒCƒ‹‚ªŠù‘¶‚µ‚Ä‚¢‚Ü‚·B\n"
+"ã‘‚«‚µ‚Ü‚·‚©H"
+
 # c:\oss\winpt\src\wptFileManager.cpp:102
 #: Src/wptFileManager.cpp:153
 #, c-format
@@ -1809,6 +1826,7 @@
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
 #: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:966
 #: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
+#: Src/wptMainProc.cpp:405
 msgid "Edit"
 msgstr "•ÒW"
 
@@ -1816,16 +1834,6 @@
 msgid "View"
 msgstr "ƒrƒ…["
 
-# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptFileManagerDlg.cpp:507
-msgid "&Open..."
-msgstr "ŠJ‚­(&O)..."
-
-# c:\oss\winpt\src\wptFileManagerDlg.cpp:355
-#: Src/wptFileManagerDlg.cpp:508
-msgid "&Encrypt"
-msgstr "ˆÃ†‰»(&E)"
-
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:52
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:109
 # c:\oss\winpt\src\wptClipEncryptDlg.cpp:122
@@ -1836,11 +1844,6 @@
 msgid "Encrypt into ZIP"
 msgstr "ZIP‚Ɉ͆‰»‚·‚é"
 
-# c:\oss\winpt\src\wptFileManagerDlg.cpp:356
-#: Src/wptFileManagerDlg.cpp:510
-msgid "&Decrypt"
-msgstr "•œ†(&D)"
-
 # c:\oss\winpt\src\wptFileManagerDlg.cpp:357
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
 #: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
@@ -1892,10 +1895,6 @@
 msgid "Always on Top"
 msgstr "‚¢‚‚àÅ‘O–Ê"
 
-#: Src/wptFileManagerDlg.cpp:520
-msgid "&Paste"
-msgstr "‚Í‚è•t‚¯(&P)"
-
 #: Src/wptFileManagerDlg.cpp:521
 msgid "&Select All"
 msgstr "‘S‚Ä‚ð‘I‘ð‚·‚é(&S)"
@@ -2250,6 +2249,12 @@
 msgid "GnuPG Configuration File"
 msgstr "GnuPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹"
 
+# c:\oss\winpt\src\wptClipEditDlg.cpp:48 c:\oss\winpt\src\wptGPGOptDlg.cpp:49
+# c:\oss\winpt\src\wptTextInputDlg.cpp:83
+#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+msgid "&Load"
+msgstr "ƒ[ƒh(&L)"
+
 # c:\oss\winpt\src\wptGPGOptDlg.cpp:68
 #: Src/wptGPGOptDlg.cpp:69
 msgid "The 'gpg.conf' file is not loaded."
@@ -3361,6 +3366,11 @@
 msgid "Command>"
 msgstr "ƒRƒ}ƒ“ƒh"
 
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
+msgid "&Close"
+msgstr "•Â‚¶‚é(&C)"
+
 # c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
 #: Src/wptKeyEditDlgs.cpp:2153
 msgid "&Revoke..."
@@ -5288,11 +5298,6 @@
 msgstr ""
 "Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-# c:\oss\winpt\src\wptMainProc.cpp:398
-#: Src/wptMainProc.cpp:405
-msgid "Edit Clipboard"
-msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚̕ҏW"
-
 # c:\oss\winpt\src\wptMainProc.cpp:399
 #: Src/wptMainProc.cpp:406
 msgid "About..."
@@ -5357,11 +5362,6 @@
 msgid "Digest"
 msgstr "ƒ_ƒCƒWƒFƒXƒg"
 
-# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptMDSumDlg.cpp:207
-msgid "&Save..."
-msgstr "•Û‘¶...(&S)"
-
 # c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
 #: Src/wptMDSumDlg.cpp:209
 msgid "Save to clipboard"
@@ -5862,6 +5862,10 @@
 msgid "Signed"
 msgstr "–¼‚µ‚Ü‚µ‚½"
 
+# c:\oss\winpt\src\wptMainProc.cpp:398
+#~ msgid "Edit Clipboard"
+#~ msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚̕ҏW"
+
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:248
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:254
 # c:\oss\winpt\src\wptKeyEditDlgs.cpp:260

Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Po/pt_BR.po	2006-07-11 08:55:57 UTC (rev 246)
@@ -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-07-01 22:09+0200\n"
+"POT-Creation-Date: 2006-07-06 22:49+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"
@@ -554,20 +554,20 @@
 msgid "GnuPG Status: Finished"
 msgstr "Estado do GnuPG: Concluído"
 
-#: Src/wptClipEditDlg.cpp:68 Src/wptClipEditDlg.cpp:134
-#: Src/wptClipEditDlg.cpp:142 Src/wptClipEditDlg.cpp:181
-#: Src/wptClipEditDlg.cpp:190 Src/wptClipEditDlg.cpp:269
-#: Src/wptClipEditDlg.cpp:274 Src/wptFileManagerDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
+#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
+#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
 #: Src/wptMainProc.cpp:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
 #: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
 msgid "Clipboard"
 msgstr "Área de transferência"
 
-#: Src/wptClipEditDlg.cpp:124 Src/wptFileManager.cpp:639
+#: Src/wptClipEditDlg.cpp:113 Src/wptFileManager.cpp:639
 msgid "File Open"
 msgstr "Abrir arquivo"
 
-#: Src/wptClipEditDlg.cpp:133
+#: Src/wptClipEditDlg.cpp:122
 msgid ""
 "The file you want to add is very large.\n"
 "Still proceed?"
@@ -575,52 +575,52 @@
 "O arquivo que você deseja adicionar é muito grande.\n"
 "Prosseguir?"
 
-#: Src/wptClipEditDlg.cpp:172
+#: Src/wptClipEditDlg.cpp:160
 msgid "File Save"
 msgstr "Salvar arquivo"
 
-#: Src/wptClipEditDlg.cpp:182 Src/wptFileManager.cpp:131
-#, c-format
-msgid ""
-"\"%s\" already exists.\n"
-"Replace existing file?"
-msgstr ""
-"\"%s\" já existe.\n"
-"Substituir arquivo existente?"
+#: Src/wptClipEditDlg.cpp:186
+#, fuzzy
+msgid "Data successfully written to file."
+msgstr "Chaves criadas com sucesso."
 
-#: Src/wptClipEditDlg.cpp:220 Src/wptMainProc.cpp:571
-msgid "Clipboard Editor"
-msgstr "Editor da área de transferência"
-
-#: Src/wptClipEditDlg.cpp:221
+#: Src/wptClipEditDlg.cpp:212 Src/wptClipEditDlg.cpp:222
 msgid "&Copy"
 msgstr "&Copiar"
 
-#: Src/wptClipEditDlg.cpp:222
+#: Src/wptClipEditDlg.cpp:213
 msgid "Clea&r"
 msgstr "&Limpar"
 
-#: Src/wptClipEditDlg.cpp:223 Src/wptGPGOptDlg.cpp:56
-#: Src/wptTextInputDlg.cpp:87
-msgid "&Load"
-msgstr "Ca&rregar"
-
-#: Src/wptClipEditDlg.cpp:224 Src/wptClipVerifyDlg.cpp:197
-#: Src/wptFileVerifyDlg.cpp:51 Src/wptGPGOptDlg.cpp:55
-msgid "&Save"
-msgstr "&Salvar"
-
-#: Src/wptClipEditDlg.cpp:225
+#: Src/wptClipEditDlg.cpp:214
 #, fuzzy
 msgid "&Quote"
 msgstr "Sai&r"
 
-#: Src/wptClipEditDlg.cpp:226 Src/wptKeyEditDlgs.cpp:2151
-#: Src/wptKeyserverDlg.cpp:586 Src/wptMDSumDlg.cpp:208
-#: Src/wptOwnertrustDlg.cpp:103
-msgid "&Close"
-msgstr "&Fechar"
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+msgid "&Open..."
+msgstr "&Abrir..."
 
+#: Src/wptClipEditDlg.cpp:216 Src/wptMDSumDlg.cpp:207
+msgid "&Save..."
+msgstr "&Salvar..."
+
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+msgid "&Paste"
+msgstr "Co&lar"
+
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+msgid "&Encrypt"
+msgstr "&Cifrar"
+
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+msgid "&Decrypt"
+msgstr "&Decifrar"
+
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:571
+msgid "Clipboard Editor"
+msgstr "Editor da área de transferência"
+
 #: Src/wptClipEncryptDlg.cpp:99
 #, fuzzy
 msgid "key not found"
@@ -734,6 +734,11 @@
 "\n"
 "Você deseja tentar recuperar a chave do servidor?"
 
+#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:55
+msgid "&Save"
+msgstr "&Salvar"
+
 #: Src/wptClipVerifyDlg.cpp:225
 msgid "Invalid signature state."
 msgstr "Estado de assinatura inválido."
@@ -1009,6 +1014,15 @@
 msgid "File Manager"
 msgstr "Gerenciador de arquivos"
 
+#: Src/wptFileManager.cpp:131
+#, c-format
+msgid ""
+"\"%s\" already exists.\n"
+"Replace existing file?"
+msgstr ""
+"\"%s\" já existe.\n"
+"Substituir arquivo existente?"
+
 #: Src/wptFileManager.cpp:153
 #, c-format
 msgid ""
@@ -1347,6 +1361,7 @@
 
 #: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:966
 #: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
+#: Src/wptMainProc.cpp:405
 msgid "Edit"
 msgstr "Editar"
 
@@ -1354,22 +1369,10 @@
 msgid "View"
 msgstr "Exibir"
 
-#: Src/wptFileManagerDlg.cpp:507
-msgid "&Open..."
-msgstr "&Abrir..."
-
-#: Src/wptFileManagerDlg.cpp:508
-msgid "&Encrypt"
-msgstr "&Cifrar"
-
 #: Src/wptFileManagerDlg.cpp:509 Src/wptFileManagerDlg.cpp:586
 msgid "Encrypt into ZIP"
 msgstr "Cifrar para &ZIP"
 
-#: Src/wptFileManagerDlg.cpp:510
-msgid "&Decrypt"
-msgstr "&Decifrar"
-
 #: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
 #: Src/wptKeyManagerDlg.cpp:1031
 msgid "&Sign"
@@ -1408,10 +1411,6 @@
 msgid "Always on Top"
 msgstr "Sempre visível"
 
-#: Src/wptFileManagerDlg.cpp:520
-msgid "&Paste"
-msgstr "Co&lar"
-
 #: Src/wptFileManagerDlg.cpp:521
 msgid "&Select All"
 msgstr "&Selecionar tudo"
@@ -1683,6 +1682,10 @@
 msgid "GnuPG Configuration File"
 msgstr "Arquivo de configuração do GnuPG"
 
+#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+msgid "&Load"
+msgstr "Ca&rregar"
+
 #: Src/wptGPGOptDlg.cpp:69
 msgid "The 'gpg.conf' file is not loaded."
 msgstr "O arquivo 'gpg.conf' não foi carregado."
@@ -2499,6 +2502,11 @@
 msgid "Command>"
 msgstr "Comando>"
 
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
+msgid "&Close"
+msgstr "&Fechar"
+
 #: Src/wptKeyEditDlgs.cpp:2153
 msgid "&Revoke..."
 msgstr "&Revogar..."
@@ -4008,10 +4016,6 @@
 msgid "Could not set current window mode hooks."
 msgstr ""
 
-#: Src/wptMainProc.cpp:405
-msgid "Edit Clipboard"
-msgstr "Editar área de transferência"
-
 #: Src/wptMainProc.cpp:406
 msgid "About..."
 msgstr "Sobre..."
@@ -4062,10 +4066,6 @@
 msgid "Digest"
 msgstr "Hash"
 
-#: Src/wptMDSumDlg.cpp:207
-msgid "&Save..."
-msgstr "&Salvar..."
-
 #: Src/wptMDSumDlg.cpp:209
 msgid "Save to clipboard"
 msgstr "Salvar na área de transferência"
@@ -4485,6 +4485,9 @@
 msgid "Signed"
 msgstr "Assinada"
 
+#~ msgid "Edit Clipboard"
+#~ msgstr "Editar área de transferência"
+
 #~ msgid "Could not set keylist window procedure."
 #~ msgstr "Não foi possível definir a função de janela da lista de chaves."
 

Modified: trunk/README
===================================================================
--- trunk/README	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/README	2006-07-11 08:55:57 UTC (rev 246)
@@ -1,47 +1,15 @@
                         WinPT - The Windows Privacy Tray
 
 
-Index
-     1. Note
-     2. Bugs and improvements
-     2.1 Legacy Windows versions
-     3. What is WinPT?
-     4. Install
-      4.1 Keyserver config file
-     5. Verify the packet signature
-     6. Native language support
-     7. Other documentation
-     8. Mailing lists
-     9. Hotkeys for common commands
-    10. Current window support
-    11. Word wrapping
-    12. Default key for signing
-    13. Commands
-     13.1 File manager
-     13.2 Key manager
-      13.2.1 Edit
-      13.2.2 UserID
-      13.2.3 Delete
-      13.2.4 Sign
-      13.2.5 Revoke cert
-      13.2.6 Check sigs
-    13.3 Keyserver
-     13.3.1 Keyserver searching
-     13.3.2 Proxy support
-    14. Debug mode
-    16. Features of the dialogs
-    16. Features of the dialogs
+Note
+-----
 
-
-1. Note
----------
-
 This is only a quick guide for WinPT. For the moment the program is its own
 documentation. This is subject to change.
 
 
-2. Bugs and improvements
-------------------------
+Bugs and Improvements
+---------------------
 
 I have tried to thoroughly test this program, but if you've found a bug,
 please send me a message with a full error description or go directly
@@ -55,7 +23,7 @@
 http://www.winpt.org
 
 
-2.1 Legacy Windows versions
+Legacy Windows versions
 
 I know a lot of people still user old versions of WinPT but it is very
 hard to test the code on all these platforms and thus I decided to
@@ -65,8 +33,8 @@
 this is the major problem!
 
 
-3. What is WinPT?
------------------
+What is WinPT?
+--------------
 
 WinPT is a front-end for the GNU Privacy Guard. It just provides
 a convinient interface to GPG while GPG does the actual (cryptographic) work.
@@ -86,8 +54,8 @@
 it's like a real graphical GPG user interface.
 
 
-4. Install
-----------
+Install
+-------
 
 First you should install the GPG binary, version 1.4.x or later.
 (If you want to use a directory other than the default you must modify
@@ -98,8 +66,8 @@
 extract all WinPT files from the archive.
 
 
-4.1 Keyserver config file
--------------------------
+Keyserver Config File
+---------------------
 
 Now the keyserver config is read dynamically. That means there is a file
 which WinPT reads the keyserver from. The name of this file MUST be
@@ -112,8 +80,8 @@
 dialog in WinPT to keep this file consistent.
 
 
-5. Verify the packet signature
-------------------------------
+Verify the Packet Signature
+---------------------------
 
 To verify that the source (or the binary) wasn't changed, you should
 verify the package signature with GnuPG. For the process you will need
@@ -130,8 +98,8 @@
        	     0x27F36D14: 'Timo Schulz (Laptop Key) <twoaday at freakmail.de>
 
 
-6. Native language support
---------------------------
+Native Language Support (NLS)
+-----------------------------
 
 As a new feature WinPT now can handle multiple languages. To activate this
 do the following:
@@ -158,8 +126,8 @@
 let me know :-). It's not much work and you do NOT need to be a developer!
 
 
-7. Other documentation
-----------------------
+Other Documentation
+-------------------
 
 For those who are inexperienced with GnuPG it makes sense to download the
 GnuPG guide or a HOWTO. There are many sites for this, but you can start
@@ -179,8 +147,8 @@
 future releases I will include HTML documentation.
 
 
-8. Mailing lists
-----------------
+Mailing Lists
+-------------
 
 If you want to get the latest information, reports, or discussions about
 WinPT you can subscribe to one of the WinPT mailing lists. There is a list
@@ -192,8 +160,8 @@
 is already answered there!
 
 
-9. Hotkey for common commands
------------------------------
+Hotkey for Common Commands
+--------------------------
 
 WinPT supports shortcuts, or 'Hotkeys', for the main gpg commands.  These
 keys are registered system wide, so you can use them from any window. If you
@@ -212,8 +180,8 @@
 so it's easier to figure out which hotkey caused the problem.
 
 
-10. Current window support
---------------------------
+Current Window Support
+----------------------
 
 WinPT allows you to use the main operations (sign and encrypt)
 within the current window. This only works if the current window contains
@@ -234,16 +202,16 @@
 entry. I recommend to use it with the hotkeys until I fix this problem.
 
 
-11. Word wrapping
------------------
+Word Wrapping
+-------------
 
 As a new feature, WinPT can wrap lines at a specific column. You can set
 the value for this feature in the preferences dialog. If you don't want
 to use this feature, you only need to set the value to "0".
 
 
-12. Default keyid for signing
-----------------------------
+Default keyid for Signing
+-------------------------
 
 There are two ways to set the default keyid. The best solution is to
 set the "default-key" entry in the GPG options file.
@@ -252,13 +220,9 @@
 the secret key cache.
 
 
-13. Commands
+File Manager
 ------------
 
-
-13.1 Filemanager
-----------------
-
 The filemanager is used to perform GPG operations on files. In further releases
 I'll add more commands. Currently, encrypt, decrypt, sign and verify
 is available. To add a file to the list element, you can use drag & drop
@@ -269,64 +233,9 @@
 feel free to mail me about any bugs!
 
 
-13.2 Keymanager
----------------
-
-13.2.1 Edit
------------
-
-Here you access some of the "edit-key" command from the GPG command
-line.
-
-
-13.2.3 Delete
--------------
-
-With it you can delete public keys and/or key pairs.
-
-
-13.2.4 Sign
------------
-
-This is an interface to sign a public key.
-
-
-13.2.5 Revoke cert
-------------------
-
-Generate a revocation certificate for the chosen key.
-
-
-13.2.7 Check sigs
------------------
-
-With this command you can check the signatures from a special public key.
-
-
-13.2.7 Key properties
----------------------
-
-This dialog is an easy way to get an overview about the given key.
-To activate this dialog, you've to double click on a key item in the
-key management dialog. Then a dialog with all related information about
-the selected key will open.
-
-
-13.3 Keyserver
+Proxy Support
 --------------
 
-13.3.1 Keyserver searching
---------------------------
-
-This new feature works exactly like the normal keyserver support.
-You have to enter the pattern, then chose a keyserver. The command
-is started with the "Search" button. The next dialog contains all
-found keys from the keyserver. If you want, you can import a key
-from this list by select the key and press the "Receive" button.
-
-13.3.2 Proxy support
---------------------
-
 If you are not able to connect directly to the internet, you can
 use the proxy settings. To enable proxy support, you need to start
 the keyserver dialog and use the "change" button to set a proxy.
@@ -339,8 +248,8 @@
 me if you've problems with your proxy server.
 
 
-14. Debug mode
---------------
+Debug Mode
+----------
 
 To make the detection of bugs and programming mistakes easier, WinPT
 contains a built-in debug mode.
@@ -356,31 +265,3 @@
 After an error has occured, it would be very useful to send this file to me.
 Which file you'll send depends on the occured error. Don't use the debug
 mode for your usual work; it slows down both GPG and WinPT.
-
-
-16. Features of the dialogs
-----------------------------
-
-This sections contains hints about the special features of some dialogs.
-Currently this is only valid for dialog with listview controls.
-
-o Selection of an entry for the GPG main commands
-
-If you only want to select one recipient, you can also double click
-the line which the recipient you want to choose. Then the command
-is automatically invoked and you don't need to click the "OK" button.
-
-o Context menu for the key manager
-
-Now the keymanager supports a context menu. To activate it, you should
-click with the right mouse button on a selected item.
-
-o Generic keys known from the Explorer
-
-For example the key manager supports generic keys like:
-DELETE = secure the selected key.
-
-o Context menu for the file manager
-
-This popup menu is similar to the key manager menu.
-

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Src/ChangeLog	2006-07-11 08:55:57 UTC (rev 246)
@@ -1,4 +1,9 @@
+2006-07-05  Timo Schulz  <ts at g10code.de>
 
+	* wptMainProc.cpp (winpt_main_proc): Change menu texts.
+	* wptClipEditDlg.cpp (clip_edit_dlg_proc): More lightweight
+	with a menu instead of dozen of buttons.
+	
 2006-07-01  Timo Schulz  <ts at g10code.de>
 
 	* wptFileManager.cpp (fm_sort): Rewritten.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Src/WinPT-en.rc	2006-07-11 08:55:57 UTC (rev 246)
@@ -298,20 +298,15 @@
                     IDC_ABOUT_AUTHORS,6,64,250,8
 END
 
-IDD_WINPT_CLIPEDIT DIALOG DISCARDABLE  0, 0, 331, 236
+IDD_WINPT_CLIPEDIT DIALOG DISCARDABLE  0, 0, 331, 246
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Clipboard Editor"
 FONT 10, "Courier"
 BEGIN
     CONTROL         "",IDC_CLIPEDIT_CLIPTEXT2,"RICHEDIT",ES_MULTILINE | 
-                    ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_TABSTOP,6,6,
+                    ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_TABSTOP,3,3,
                     319,208
-    PUSHBUTTON      "&Quote",IDC_CLIPEDIT_QUOTE,7,218,31,15
-    PUSHBUTTON      "&Copy",IDC_CLIPEDIT_SEND,100,217,42,15
-    PUSHBUTTON      "Clea&r",IDC_CLIPEDIT_CLEAR,144,217,42,15
-    PUSHBUTTON      "&Save",IDC_CLIPEDIT_SAVE,187,217,42,15
-    PUSHBUTTON      "&Load",IDC_CLIPEDIT_LOAD,230,217,42,15
-    DEFPUSHBUTTON   "&Close",IDOK,282,217,43,15
+    PUSHBUTTON      "&Copy",IDC_CLIPEDIT_SEND,3,213,42,15
 END
 
 IDD_WINPT_ENCRYPT DIALOG DISCARDABLE  0, 0, 354, 210
@@ -1442,7 +1437,7 @@
         LEFTMARGIN, 2
         RIGHTMARGIN, 326
         TOPMARGIN, 2
-        BOTTOMMARGIN, 232
+        BOTTOMMARGIN, 242
     END
 
     IDD_WINPT_ENCRYPT, DIALOG
@@ -1976,10 +1971,10 @@
         MENUITEM "Card Manager",                ID_WINPT_CARD
         MENUITEM "File Manager",                ID_WINPT_FILE
         MENUITEM SEPARATOR
-        MENUITEM "Edit Clipboard",              ID_WINPT_EDIT
-        MENUITEM SEPARATOR
         POPUP "Clipboard"
         BEGIN
+            MENUITEM "&Edit",                       ID_WINPT_EDIT
+            MENUITEM SEPARATOR
             MENUITEM "Symmetric",                   ID_WINPT_SYMENC
             MENUITEM "Encrypt",                     ID_WINPT_ENCRYPT
             MENUITEM "Sign && Encrypt",             ID_WINPT_SIGNENCRYPT
@@ -2229,13 +2224,26 @@
 
 IDR_WINPT_CLIPEDIT MENU DISCARDABLE 
 BEGIN
-    POPUP "Contextmenu"
+    POPUP "&File"
     BEGIN
+        MENUITEM "Open...",                     ID_CLIPEDIT_OPEN
+        MENUITEM "&Save...",                    ID_CLIPEDIT_SAVE
+        MENUITEM SEPARATOR
+        MENUITEM "&Exit",                       ID_CLIPEDIT_QUIT
+    END
+    POPUP "&Edit"
+    BEGIN
         MENUITEM "&Copy",                       ID_CLIPEDIT_COPY
         MENUITEM "&Paste",                      ID_CLIPEDIT_PASTE
+        MENUITEM "&Clear",                      ID_CLIPEDIT_CLEAR
         MENUITEM SEPARATOR
-        MENUITEM "&Send",                       ID_CLIPEDIT_SEND
+        MENUITEM "&Quote",                      ID_CLIPEDIT_QUOTE
     END
+    POPUP "&GPG"
+    BEGIN
+        MENUITEM "&Encrypt",                    ID_CLIPEDIT_ENC
+        MENUITEM "&Decrypt",                    ID_CLIPEDIT_DEC
+    END
 END
 
 IDR_WINPT_KEYSERVER_CTX MENU DISCARDABLE 

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Src/resource.h	2006-07-11 08:55:57 UTC (rev 246)
@@ -838,13 +838,20 @@
 #define ID_KEYEDIT_UID_PRIM             40187
 #define ID_KEYEDIT_UID_DEL              40188
 #define ID_KEYEDIT_UID_REV              40189
+#define ID_CLIPEDIT_CLEAR               40190
+#define ID_CLIPEDIT_QUIT                40191
+#define ID_CLIPEDIT_SAVE                40192
+#define ID_CLIPEDIT_OPEN                40193
+#define ID_CLIPEDIT_QUOTE               40194
+#define ID_CLIPEDIT_ENC                 40195
+#define ID_CLIPEDIT_DEC                 40196
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        250
-#define _APS_NEXT_COMMAND_VALUE         40190
+#define _APS_NEXT_RESOURCE_VALUE        251
+#define _APS_NEXT_COMMAND_VALUE         40197
 #define _APS_NEXT_CONTROL_VALUE         1537
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Src/wptClipEditDlg.cpp	2006-07-11 08:55:57 UTC (rev 246)
@@ -35,19 +35,9 @@
 #include "wptContext.h"
 #include "wptKeylist.h"
 
-#ifdef _MSC_VER
-#include "winpt_header.h"
 
-static DWORD help_arr[] = {
-    IDC_CLIPEDIT_SEND,	WPT_CLIPEDIT_COPY,
-    IDC_CLIPEDIT_CLEAR,	WPT_CLIPEDIT_CLEAR,
-    IDC_CLIPEDIT_LOAD,	WPT_CLIPEDIT_LOAD,
-    IDC_CLIPEDIT_SAVE,	WPT_CLIPEDIT_SAVE,
-    IDC_CLIPEDIT_QUOTE,	WPT_CLIPEDIT_QUOTE,
-    0, 0};
-#endif
+/* XXX: it would be really nice to have tempest prevention fonts. */
 
-
 void verify_get_clip_info (gpgme_signature_t sig, 
 			   char **r_header, char **r_footer);
 
@@ -56,8 +46,7 @@
    Optinally @header and @footer can be used to set a header and footer.
    Return value: 0 on success. */
 static int
-load_clipboard (HWND dlg, 
-		const char *header, const char *footer)
+load_clipboard (HWND dlg, const char *header, const char *footer)
 {
     HANDLE clipmem;
     char *cliptext;
@@ -114,7 +103,7 @@
     OPENFILENAME open;
     FILE *fp;
     char *p;
-    char file[300] = "";
+    char file[MAX_PATH+64] = "";
     DWORD size;
     int id;
 
@@ -164,7 +153,6 @@
     char *p=NULL;
     char file[300] = "";
     DWORD nbytes;
-    int id;
 
     memset (&save, 0, sizeof (save));	    
     save.lStructSize = sizeof (OPENFILENAME);	    
@@ -177,13 +165,6 @@
     save.Flags = OFN_OVERWRITEPROMPT;
 
     if (GetSaveFileName (&save)) {
-	if (file_exist_check (file) == 0) {
-	    id = log_box (_("Clipboard"), MB_YESNO,
-			  _("\"%s\" already exists.\n"
-			    "Replace existing file?"), file);	    
-	    if (id == IDNO)	
-		return -1;
-	}
 	fp = fopen (file, "wb");
 	if (!fp) {
 	    msg_box (dlg, winpt_strerror (WPTERR_FILE_CREAT), 
@@ -202,6 +183,8 @@
 	}	   
 	fclose (fp);
 	free_if_alloc (p);
+	msg_box (dlg, _("Data successfully written to file."),
+		 _("Clipboard"), MB_OK);
     }
     return 0;
 }
@@ -211,20 +194,12 @@
 BOOL CALLBACK 
 clip_edit_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
+    HMENU menu;
     char *head=NULL, *foot=NULL;
     gpgme_data_t txt;
 
     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"));
-	SetDlgItemText (dlg, IDC_CLIPEDIT_LOAD, _("&Load"));	
-	SetDlgItemText (dlg, IDC_CLIPEDIT_SAVE, _("&Save"));
-	SetDlgItemText (dlg, IDC_CLIPEDIT_QUOTE, _("&Quote")); 
-	SetDlgItemText (dlg, IDOK, _("&Close"));
-
+    case WM_INITDIALOG:		
 	/* If there is a param, we expect a signature and initialize
 	   the header and footer variable accordingly. */
 	if (lparam)
@@ -232,13 +207,22 @@
 	load_clipboard (dlg, head, foot);
 	free_if_alloc (head);
 	free_if_alloc (foot);
+
+	menu = LoadMenu (glob_hinst, (LPCTSTR)IDR_WINPT_CLIPEDIT);
+	set_menu_text (menu, ID_CLIPEDIT_SEND, _("&Copy"));
+	set_menu_text (menu, ID_CLIPEDIT_CLEAR, _("Clea&r"));
+	set_menu_text (menu, ID_CLIPEDIT_QUOTE, _("&Quote")); 
+	set_menu_text (menu, ID_CLIPEDIT_OPEN, _("&Open..."));	
+	set_menu_text (menu, ID_CLIPEDIT_SAVE, _("&Save..."));
+	set_menu_text (menu, ID_CLIPEDIT_PASTE, _("&Paste"));
+	set_menu_text (menu, ID_CLIPEDIT_ENC, _("&Encrypt"));
+	set_menu_text (menu, ID_CLIPEDIT_DEC, _("&Decrypt"));
+	SetMenu (dlg, menu);
+	SetWindowText (dlg, _("Clipboard Editor"));
+	SetDlgItemText (dlg, IDC_CLIPEDIT_SEND, _("&Copy"));
 	center_window (dlg, NULL);
 	SetForegroundWindow (dlg);
 	return TRUE;
-
-    case WM_HELP:
-	html_help_dispatch (lparam, "winpt.chm::winpt_texts.txt", help_arr);
-	break;
         
     case WM_COMMAND:
 	switch (LOWORD (wparam)) {
@@ -246,11 +230,13 @@
 	    EndDialog (dlg, FALSE);
 	    return TRUE;
 
-	case IDOK:		
+	case IDOK:
+	case ID_CLIPEDIT_QUIT:
 	    EndDialog (dlg, TRUE);
 	    return TRUE;
             
-	case IDC_CLIPEDIT_QUOTE:
+	case ID_CLIPEDIT_QUOTE:
+	    SendMessage (dlg, WM_COMMAND, ID_CLIPEDIT_COPY, 0);
 	    if (gpg_data_new_from_clipboard (&txt, 0))
 		return TRUE;
 	    gpg_data_mail_quote (&txt);
@@ -258,12 +244,14 @@
 	    load_clipboard (dlg, head, foot);
 	    return TRUE;
 
+	case ID_CLIPEDIT_COPY:
 	case IDC_CLIPEDIT_SEND:
 	    SendDlgItemMessage (dlg, IDC_CLIPEDIT_CLIPTEXT2, EM_SETSEL, 0, -1);
 	    SendDlgItemMessage (dlg, IDC_CLIPEDIT_CLIPTEXT2, WM_COPY, 0, 0);
+	    SendDlgItemMessage (dlg, IDC_CLIPEDIT_CLIPTEXT2, EM_SETSEL, -1, 0);
 	    return TRUE;
             
-	case IDC_CLIPEDIT_CLEAR:
+	case ID_CLIPEDIT_CLEAR:
 	    if (OpenClipboard (NULL) == FALSE) {
 		msg_box (dlg,  winpt_strerror (WPTERR_CLIP_OPEN), 
 			 _("Clipboard"), MB_ERR);
@@ -276,15 +264,32 @@
 		SetDlgItemText (dlg, IDC_CLIPEDIT_CLIPTEXT2, "");
 	    CloseClipboard ();
 	    return TRUE;
+
+	case ID_CLIPEDIT_PASTE:
+	    load_clipboard (dlg, NULL, NULL);
+	    break;
             
-	case IDC_CLIPEDIT_LOAD:
+	case ID_CLIPEDIT_OPEN:
 	    if (!load_clipboard_from_file (dlg))
 		PostMessage (dlg, WM_COMMAND, MAKEWPARAM (IDC_CLIPEDIT_SEND, 0), 0);
 	    return TRUE;
             
-	case IDC_CLIPEDIT_SAVE:
+	case ID_CLIPEDIT_SAVE:
 	    save_clipboard_to_file (dlg);	    
 	    return TRUE;
+
+	case ID_CLIPEDIT_ENC:
+	    SendMessage (dlg, WM_COMMAND, ID_CLIPEDIT_COPY, 0);
+	    SendMessage (glob_hwnd, WM_COMMAND, ID_WINPT_ENCRYPT, 0);
+	    load_clipboard (dlg, NULL, NULL);
+	    SetForegroundWindow (dlg);
+	    break;
+
+	case ID_CLIPEDIT_DEC:
+	    SendMessage (glob_hwnd, WM_COMMAND, ID_WINPT_DECRYPT_VERIFY, 0);
+	    load_clipboard (dlg, NULL, NULL);
+	    SetForegroundWindow (dlg);
+	    break;
 	}
 	break;
     }

Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/Src/wptMainProc.cpp	2006-07-11 08:55:57 UTC (rev 246)
@@ -402,7 +402,7 @@
 	    set_menu_text (popup, ID_WINPT_CARD, _("Card Manager"));
 	    if (!scard_support)
 		set_menu_state (popup, ID_WINPT_CARD, MF_DISABLED|MF_GRAYED);
-            set_menu_text (popup, ID_WINPT_EDIT, _("Edit Clipboard"));
+            set_menu_text (popup, ID_WINPT_EDIT, _("Edit"));
             set_menu_text (popup, ID_WINPT_ABOUT, _("About..."));
             set_menu_text (popup, ID_WINPT_QUIT, _("Exit"));
             set_menu_text (popup, ID_WINPT_SYMENC, _("Symmetric"));
@@ -422,10 +422,10 @@
 		set_menu_state (popup, ID_WINPT_SIGNENCRYPT, MF_DISABLED|MF_GRAYED);
 		set_menu_state (popup, ID_WINPT_CURRWND_SIGNENCRYPT, MF_DISABLED|MF_GRAYED);
 	    }
-	    /* change popup texts */
-	    set_menu_text_bypos (popup, 6, _("Clipboard"));
-	    set_menu_text_bypos (popup, 7, _("Current Window"));
-	    set_menu_text_bypos (popup, 9, _("Preferences"));
+	    /* change popup texts */	  
+	    set_menu_text_bypos (popup, 4, _("Clipboard"));
+	    set_menu_text_bypos (popup, 5, _("Current Window"));
+	    set_menu_text_bypos (popup, 7, _("Preferences"));
 
             TrackPopupMenu (popup, TPM_RIGHTALIGN, p.x, p.y, 0, hwnd, NULL);
             PostMessage (hwnd, WM_USER, 0, 0);

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/THANKS	2006-07-11 08:55:57 UTC (rev 246)
@@ -65,6 +65,7 @@
 John J. Kane        jkane89 at softhome.net
 Luigi Bai           lpb at kandl.houston.tx.us
 Patrick McGuinness  dr_jazzz at yahoo.com
+Patrick Schoenbach
 Pedro José          pedrojgm at hotmail.com
 Peter Gerwinski     peter.gerwinski at g-n-u.de
 Philip Chase        pbc at hp.ufl.edu

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-07-03 14:23:17 UTC (rev 245)
+++ trunk/configure.ac	2006-07-11 08:55:57 UTC (rev 246)
@@ -15,7 +15,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 1.0.0pre2-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 1.0.0pre2, http://www.winpt.org)
 NEED_GPG_VERSION=1.4.2
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.1



More information about the Winpt-commits mailing list