translations fixes

1 files changed, 29 insertions, 29 deletions

diff --git a/main.cpp b/main.cpp
index 3fee85e..f6a5e77 100755
--- a/main.cpp
+++ b/main.cpp
@@ -389,7 +389,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  wfstream f(path.c_str(), std::ios::out);
 				  if(!f.is_open())
 				  {
-					  MessageBox(0, _T("Failed to open file"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
 					  break;
 				  }
 				  f<<"Key-Type: RSA";
@@ -552,7 +552,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			if(_waccess(gpg_lang_path, 0) != -1)
 				lang_exists = true;
 			if(gpg_exists && !lang_exists) //TODO: check gpg version
-				MessageBoxA(0, Translate("gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned."), "Warning", MB_OK);		
+				MessageBox(0, TranslateT("gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned."), TranslateT("Warning"), MB_OK);
 			mir_free(gpg_path);
 			mir_free(gpg_lang_path);
 		}
@@ -570,7 +570,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				{
 					if(errno == ENOENT)
 					{
-						MessageBoxA(0, Translate("wrong gpg binary location found in system.\nplease choose another location"), "Warning", MB_OK);
+						MessageBox(0, TranslateT("wrong gpg binary location found in system.\nplease choose another location"), TranslateT("Warning"), MB_OK);
 					}
 				}
 			}
@@ -614,10 +614,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			else
 			{
 				bad_version = false;
-				MessageBoxA(0, Translate("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), "Warning", MB_OK);
+				MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 			}
 			if(bad_version)
-				MessageBoxA(0, Translate("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), "Warning", MB_OK);
+				MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 		}
 		mir_free(tmp);
 		if(!gpg_exists)
@@ -629,7 +629,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		SetDlgItemText(hwndDlg, IDC_HOME_DIR, !gpg_exists?tmp:_T("gpg"));
 		mir_free(tmp);
 		if(gpg_exists && lang_exists && !bad_version)
-			MessageBoxA(0, Translate("Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue."), "Info", MB_OK);
+			MessageBox(0, TranslateT("Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue."), TranslateT("Info"), MB_OK);
 		extern bool bIsMiranda09;
 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), bIsMiranda09);
       return TRUE;
@@ -690,14 +690,14 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  {
 				  if(errno == ENOENT)
 				  {
-					  MessageBox(0, _T("gpg binary does not exists.\nplease choose another location"), _T("Warning"), MB_OK);
+					  MessageBox(0, TranslateT("gpg binary does not exists.\nplease choose another location"), TranslateT("Warning"), MB_OK);
 					  break;
 				  }
 			  }
 		  }
 		  else
 		  {
-			  MessageBox(0, _T("please choose gpg binary location"), _T("Warning"), MB_OK);
+			  MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
 			  break;
 		  }
 		  {
@@ -734,10 +734,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  else
 			  {
 				  bad_version = false;
-				  MessageBox(0, _T("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);
+				  MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 			  }
 			  if(bad_version)
-				  MessageBox(0, _T("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);
+				  MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 		  }
 		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
 		  GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
@@ -745,7 +745,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  tmp[_tcslen(tmp)-1] = '\0';
 		  if(!tmp[0])
 		  {
-			  MessageBox(0, _T("please set keyring's home directory"), _T("Warning"), MB_OK);
+			  MessageBox(0, TranslateT("please set keyring's home directory"), TranslateT("Warning"), MB_OK);
 			  break;
 		  }
 		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
@@ -779,14 +779,14 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				{
 					if(errno == ENOENT)
 					{
-						MessageBox(0, _T("gpg binary does not exists.\nplease choose another location"), _T("Warning"), MB_OK);
+						MessageBox(0, TranslateT("gpg binary does not exists.\nplease choose another location"), TranslateT("Warning"), MB_OK);
 						break;
 					}
 				}
 			}
 			else
 			{
-				MessageBox(0, _T("please choose gpg binary location"), _T("Warning"), MB_OK);
+				MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
 				break;
 			}
 			{
@@ -823,10 +823,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				else
 				{
 					bad_version = false;
-					MessageBox(0, _T("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);
+					MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 				}
 				if(bad_version)
-					MessageBox(0, _T("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);
+					MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
 			}
 			DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
 			GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
@@ -834,7 +834,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				tmp[_tcslen(tmp)-1] = '\0';
 			if(!tmp[0])
 			{
-				MessageBox(0, _T("please set keyring's home directory"), _T("Warning"), MB_OK);
+				MessageBox(0, TranslateT("please set keyring's home directory"), TranslateT("Warning"), MB_OK);
 				break;
 			}
 			DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
@@ -859,7 +859,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  wfstream f(path.c_str(), std::ios::out);
 				  if(!f.is_open())
 				  {
-					  MessageBox(0, _T("Failed to open file"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
 					  break;
 				  }
 				  f<<"Key-Type: RSA";
@@ -1006,7 +1006,7 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SetDlgItemText(hwndDlg, ID_IMPORT, (_tcslen(tmp) > 0)?TranslateT("Replace"):_T("Accept"));
 		mir_free(tmp);
 		tmp = new TCHAR [256];
-		_tcscpy(tmp, _T("Received key from "));
+		_tcscpy(tmp, TranslateT("Received key from "));
 		_tcscat(tmp, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, (LPARAM)GCDNF_TCHAR));
 		SetDlgItemText(hwndDlg, IDC_KEY_FROM, tmp);
 		delete [] tmp;
@@ -1073,7 +1073,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
     {
 		SetWindowPos(hwndDlg, 0, key_gen_rect.left, key_gen_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
-		SetWindowText(hwndDlg, TranslateW(_T("Key Generation dialog")));
+		SetWindowText(hwndDlg, TranslateT("Key Generation dialog"));
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("RSA"), 0);
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("DSA"), 1);
 		SendDlgItemMessage(hwndDlg, IDC_KEY_TYPE, CB_SETCURSEL, (WPARAM)1, 0);
@@ -1099,7 +1099,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  if(_tcslen(tmp) < 3)
 				  {
 					  mir_free(tmp);
-					  MessageBox(0, TranslateW(_T("You must set encryption algorythm first")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("You must set encryption algorythm first"), TranslateT("Error"), MB_OK);
 					  break;
 				  }
 				  mir_free(tmp);
@@ -1109,14 +1109,14 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  mir_free(tmp);
 				  if(length < 1024 || length > 4096)
 				  {
-					  MessageBox(0, TranslateW(_T("Key length must be of length from 1024 to 4096 bits")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Key length must be of length from 1024 to 4096 bits"), TranslateT("Error"), MB_OK);
 					  break;
 				  }
 				  tmp = new TCHAR [12];
 				  GetDlgItemText(hwndDlg, IDC_KEY_EXPIRE_DATE, tmp, 12);
 				  if(_tcslen(tmp) != 10 && tmp[0] != '0')
 				  {
-					  MessageBox(0, TranslateW(_T("Invalid date")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Invalid date"), TranslateT("Error"), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1125,13 +1125,13 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  GetDlgItemText(hwndDlg, IDC_KEY_REAL_NAME, tmp, 128);
 				  if(_tcslen(tmp) < 5)
 				  {
-					  MessageBox(0, TranslateW(_T("Name must contain at least 5 characters")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Name must contain at least 5 characters"), TranslateT("Error"), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
 				  else if (_tcschr(tmp, _T('(')) || _tcschr(tmp, _T(')')))
 				  {
-					  MessageBox(0, TranslateW(_T("Name cannot contain '(' or ')'")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Name cannot contain '(' or ')'"), TranslateT("Error"), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1140,7 +1140,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  GetDlgItemText(hwndDlg, IDC_KEY_EMAIL, tmp, 128);
 				  if((_tcslen(tmp)) < 5 || (!_tcschr(tmp, _T('@'))) || (!_tcschr(tmp, _T('.'))))
 				  {
-					  MessageBox(0, TranslateW(_T("Invalid Email")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Invalid Email"), TranslateT("Error"), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1156,7 +1156,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  wfstream f(path.c_str(), std::ios::out);
 				  if(!f.is_open())
 				  {
-					  MessageBox(0, TranslateW(_T("Failed to open file")), TranslateW(_T("Error")), MB_OK);
+					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
 					  break;
 				  }
 				  f<<"Key-Type: ";
@@ -1582,10 +1582,10 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 					  mir_free(tmp);
 				  }
 				  else
-					  MessageBoxA(NULL, Translate("Failed to export public key."), Translate("Error"), MB_OK);
+					  MessageBox(NULL, TranslateT("Failed to export public key."), TranslateT("Error"), MB_OK);
 			  }
 			  else
-				  MessageBoxA(NULL, Translate("Failed to export public key."), Translate("Error"), MB_OK);
+				  MessageBox(NULL, TranslateT("Failed to export public key."), TranslateT("Error"), MB_OK);
 //			  SetDlgItemText(hPubKeyEdit, IDC_PUBLIC_KEY_EDIT, tmp);
 		  }
 		  DestroyWindow(hwndDlg);
@@ -1859,7 +1859,7 @@ void ImportKey()
 	new_key_hcnt_mutex.unlock();
 	bool for_all_sub = false;
 	if(metaIsProtoMetaContacts(hContact))
-		if(MessageBox(0, _T("Do you want load key for all subcontacts ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
+		if(MessageBox(0, TranslateT("Do you want load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
 			for_all_sub = true;
 	if(metaIsProtoMetaContacts(hContact))
 	{