[svn] GpgEX - r65 - in trunk: . po src

[svn author marcus]

Author: marcus
Date: 2009-03-10 17:35:35 +0100 (Tue, 10 Mar 2009)
New Revision: 65

Modified:
   trunk/ChangeLog
   trunk/po/ar.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/ru.po
   trunk/src/ChangeLog
   trunk/src/client.cc
   trunk/src/client.h
   trunk/src/gpgex.cc
Log:
src/
2009-03-10  Marcus Brinkmann  <marcus at g10code.de>

	* client.h, client.cc, gpgex.cc: Change encrypt&sign to
	sign&encrypt everywhere (except in the protocol, of course).

po/
2009-03-10  Marcus Brinkmann  <marcus at g10code.de>

	* po/de.po, po/es.po, po/ru.po, po/ar.po: Change encrypt&sign to
	sign&encrypt everywhere.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-11 22:15:29 UTC (rev 64)
+++ trunk/ChangeLog	2009-03-10 16:35:35 UTC (rev 65)
@@ -1,3 +1,8 @@
+2009-03-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* po/de.po, po/es.po, po/ru.po, po/ar.po: Change encrypt&sign to
+	sign&encrypt everywhere.
+
 2009-01-28  Werner Koch  <wk at g10code.com>
 
 	Release 0.9.2.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-02-11 22:15:29 UTC (rev 64)
+++ trunk/src/ChangeLog	2009-03-10 16:35:35 UTC (rev 65)
@@ -1,3 +1,8 @@
+2009-03-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* client.h, client.cc, gpgex.cc: Change encrypt&sign to
+	sign&encrypt everywhere (except in the protocol, of course).
+
 2009-02-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	* bitmaps.cc (load_bitmap): Change minus to underscore.

Modified: trunk/po/ar.po  [not shown]
Modified: trunk/po/de.po  [not shown]
Modified: trunk/po/es.po  [not shown]
Modified: trunk/po/ru.po  [not shown]
Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc	2009-02-11 22:15:29 UTC (rev 64)
+++ trunk/src/client.cc	2009-03-10 16:35:35 UTC (rev 65)
@@ -378,7 +378,7 @@
 
 
 void
-client_t::encrypt_sign (vector<string> &filenames)
+client_t::sign_encrypt (vector<string> &filenames)
 {
   this->call_assuan ("ENCRYPT_SIGN_FILES", filenames);
 }

Modified: trunk/src/client.h
===================================================================
--- trunk/src/client.h	2009-02-11 22:15:29 UTC (rev 64)
+++ trunk/src/client.h	2009-03-10 16:35:35 UTC (rev 65)
@@ -45,7 +45,7 @@
   void decrypt_verify (vector<string> &filenames);
   void decrypt (vector<string> &filenames);
   void verify (vector<string> &filenames);
-  void encrypt_sign (vector<string> &filenames);
+  void sign_encrypt (vector<string> &filenames);
   void encrypt (vector<string> &filenames);
   void sign (vector<string> &filenames);
   void import (vector<string> &filenames);

Modified: trunk/src/gpgex.cc
===================================================================
--- trunk/src/gpgex.cc	2009-02-11 22:15:29 UTC (rev 64)
+++ trunk/src/gpgex.cc	2009-03-10 16:35:35 UTC (rev 65)
@@ -46,7 +46,7 @@
 #define ID_CMD_DECRYPT_VERIFY	1
 #define ID_CMD_DECRYPT		2
 #define ID_CMD_VERIFY		3
-#define ID_CMD_ENCRYPT_SIGN	4
+#define ID_CMD_SIGN_ENCRYPT	4
 #define ID_CMD_ENCRYPT		5
 #define ID_CMD_SIGN		6
 #define ID_CMD_IMPORT		7
@@ -59,7 +59,7 @@
 #define ID_CMD_STR_DECRYPT_VERIFY	_("Decrypt and verify")
 #define ID_CMD_STR_DECRYPT		_("Decrypt")
 #define ID_CMD_STR_VERIFY		_("Verify")
-#define ID_CMD_STR_ENCRYPT_SIGN		_("Encrypt and sign")
+#define ID_CMD_STR_SIGN_ENCRYPT		_("Sign and encrypt")
 #define ID_CMD_STR_ENCRYPT		_("Encrypt")
 #define ID_CMD_STR_SIGN			_("Sign")
 #define ID_CMD_STR_IMPORT		_("Import keys")
@@ -289,8 +289,8 @@
     {
       /* FIXME: Check error.  */
       res = InsertMenu (hMenu, indexMenu++, MF_BYPOSITION | MF_STRING,
-			idCmdFirst + ID_CMD_ENCRYPT_SIGN,
-			ID_CMD_STR_ENCRYPT_SIGN);
+			idCmdFirst + ID_CMD_SIGN_ENCRYPT,
+			ID_CMD_STR_SIGN_ENCRYPT);
       if (! res)
 	return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
     }
@@ -351,8 +351,8 @@
 		      ID_CMD_STR_SIGN);
   if (res)
     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
-		      idCmdFirst + ID_CMD_ENCRYPT_SIGN,
-		      ID_CMD_STR_ENCRYPT_SIGN);
+		      idCmdFirst + ID_CMD_SIGN_ENCRYPT,
+		      ID_CMD_STR_SIGN_ENCRYPT);
   if (res)
     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
 		      idCmdFirst + ID_CMD_IMPORT, ID_CMD_STR_IMPORT);
@@ -419,8 +419,8 @@
       txt = _("Verify the marked files.");
       break;
 
-    case ID_CMD_ENCRYPT_SIGN:
-      txt = _("Encrypt and sign the marked files.");
+    case ID_CMD_SIGN_ENCRYPT:
+      txt = _("Sign and encrypt the marked files.");
       break;
 
     case ID_CMD_ENCRYPT:
@@ -584,8 +584,8 @@
       client.verify (this->filenames);
       break;
 
-    case ID_CMD_ENCRYPT_SIGN:
-      client.encrypt_sign (this->filenames);
+    case ID_CMD_SIGN_ENCRYPT:
+      client.sign_encrypt (this->filenames);
       break;
 
     case ID_CMD_ENCRYPT: