git-svn-id: http://svn.miranda-ng.org/main/trunk@6708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 14 insertions, 14 deletions

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 0283fae151..0cf212d80f 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -79,7 +79,7 @@ BEGIN
     PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,143,220,141,14

     LTEXT           "",IDC_GENERATING_KEY,82,207,174,8

     LTEXT           "Account:",IDC_STATIC,15,12,42,8

-    LTEXT           "Key id:",IDC_KEY_ID,178,12,99,8

+    LTEXT           "Key ID:",IDC_KEY_ID,178,12,99,8

     COMBOBOX        IDC_ACCOUNT,66,9,104,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "Copy public key",IDC_COPY_PUBKEY,7,169,101,14

     PUSHBUTTON      "Export private key",IDC_EXPORT_PRIVATE,182,169,102,14

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 2240d85bfb..5f1b61f782 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -267,7 +267,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_ADDSTRING, 0, (LPARAM)acc.c_str());
 			}
 			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_SELECTSTRING, 0, (LPARAM)Translate("Default"));
-			string keyinfo = Translate("key id");
+			string keyinfo = Translate("key ID");
 			keyinfo += ": ";
 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
@@ -342,7 +342,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  }
 				  if(!strcmp(buf, Translate("Default")))
 				  {
-					  wstring keyinfo = TranslateT("Default private key id");
+					  wstring keyinfo = TranslateT("Default private key ID");
 					  keyinfo += _T(": ");
 					  keyinfo += (fp[0])?fp:_T("not set");
 					  extern HWND hwndCurKey_p;
@@ -654,7 +654,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
 				if(!strcmp(buf, Translate("Default")))
 				{
-					string keyinfo = Translate("key id");
+					string keyinfo = Translate("key ID");
 					keyinfo += ": ";
 					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
@@ -663,7 +663,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				}
 				else
 				{
-					string keyinfo = Translate("key id");
+					string keyinfo = Translate("key ID");
 					keyinfo += ": ";
 					std::string acc_str= buf;
 					acc_str += "_KeyID";
@@ -2091,9 +2091,9 @@ void InitCheck()
 		if(!home_dir_access || !temp_access || !gpg_valid)
 		{
 			char buf[4096];
-			strcpy(buf, gpg_valid?Translate("GPG binary is set and valid (This is good).\n"):Translate("GPG binary unset or invalid (Plugin will not work).\n"));
-			strcat(buf, home_dir_access?Translate("Home dir write access granted (This is good).\n"):Translate("Home dir has no write access (Plugin most probably will not work).\n"));
-			strcat(buf, temp_access?Translate("Temp dir write access granted (This is good).\n"):Translate("Temp dir has no write access (Plugin should work, but may have some problems, file transfers will not work)."));
+			strcpy(buf, gpg_valid?Translate("GPG binary is set and valid (this is good).\n"):Translate("GPG binary unset or invalid (plugin will not work).\n"));
+			strcat(buf, home_dir_access?Translate("Home dir write access granted (this is good).\n"):Translate("Home dir has no write access (plugin most probably will not work).\n"));
+			strcat(buf, temp_access?Translate("Temp dir write access granted (this is good).\n"):Translate("Temp dir has no write access (plugin should work, but may have some problems, file transfers will not work)."));
 			if(!gpg_valid)
 				strcat(buf, Translate("\nGPG will be disabled until you solve these problems"));
 			MessageBoxA(0, buf, Translate("GPG plugin problems"), MB_OK);
@@ -2142,7 +2142,7 @@ void InitCheck()
 			keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, acc.c_str(), "");
 			if(keyid[0])
 			{
-				question = Translate("Your secret key with id: ");
+				question = Translate("Your secret key with ID: ");
 				mir_free(keyid);
 				keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 				key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
@@ -2207,7 +2207,7 @@ void InitCheck()
 				keyid = nullptr;
 			}
 		}
-		question = Translate("Your secret key with id: ");
+		question = Translate("Your secret key with ID: ");
 		keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 		key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
 		void ShowFirstRunDialog();
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index ea98e6acce..cff898dae5 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -109,7 +109,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						dbsetting += "_Password";
 						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 						if(pass[0] && bDebugLog)
-							debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
+							debuglog<<std::string(time_str()+": info: found password in database for key ID: "+inkeyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
 					}
 					else
 					{
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index d666e7ba23..8418e49bf9 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -173,7 +173,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));

 		{

-			string keyinfo = Translate("Default private key id");

+			string keyinfo = Translate("Default private key ID");

 			keyinfo += ": ";

 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

 			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 1558a12453..1e758bf53d 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -361,7 +361,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 								dbsetting += "_Password";
 								pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 								if(_tcslen(pass) > 0 && bDebugLog)
-									debuglog<<std::string(time_str()+": info: found password in database for key id: "+keyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");
+									debuglog<<std::string(time_str()+": info: found password in database for key ID: "+keyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");
 							}
 							else
 							{
@@ -807,7 +807,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 							dbsetting += "_Password";
 							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 							if(pass[0] && bDebugLog)
-								debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to encrypt message from self with password");
+								debuglog<<std::string(time_str()+": info: found password in database for key ID: "+inkeyid+", trying to encrypt message from self with password");
 						}
 						else
 						{