more unnecessary spaces

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

12 files changed, 25 insertions, 25 deletions

diff --git a/plugins/!NotAdopted/SmartAutoReplier/GUI/OptionsDlg.cpp b/plugins/!NotAdopted/SmartAutoReplier/GUI/OptionsDlg.cpp
index 1f25812101..29916f0f5f 100644
--- a/plugins/!NotAdopted/SmartAutoReplier/GUI/OptionsDlg.cpp
+++ b/plugins/!NotAdopted/SmartAutoReplier/GUI/OptionsDlg.cpp
@@ -408,7 +408,7 @@ BEGIN_PROTECT_AND_LOG_CODE
 		DWORD dwptr = static_cast<DWORD>(m_listRules.GetItemData(nIndex));

 		if (dwptr)/// we have ptr

 		{

-			if (MessageBox(TranslateTS(TEXT("Do you really want delete selected rule ?")), g_strPluginName, MB_YESNO) == IDNO)

+			if (MessageBox(TranslateTS(TEXT("Do you really want delete selected rule?")), g_strPluginName, MB_YESNO) == IDNO)

 				return FALSE;

 

 			CRulesStorage & hash = g_pMessHandler->getSettings().getStorage();

diff --git a/plugins/!NotAdopted/SmartAutoReplier/comfunc.cpp b/plugins/!NotAdopted/SmartAutoReplier/comfunc.cpp
index 0f79871fbb..f7d18b1a6c 100644
--- a/plugins/!NotAdopted/SmartAutoReplier/comfunc.cpp
+++ b/plugins/!NotAdopted/SmartAutoReplier/comfunc.cpp
@@ -35,7 +35,7 @@ bool NotifyAboutWrongSettings(LPTSTR szFile)
 	_tcscat(szTxt, szFile);

 	_tcscat(szTxt, TEXT(" is corrupted !\n"));

 	_tcscat(szTxt, TEXT("As a result plugin can crush.\n"));

-	_tcscat(szTxt, TEXT("Reset settings to default ?"));

+	_tcscat(szTxt, TEXT("Reset settings to default?"));

 

 	DWORD dw = MessageBox(NULL, TranslateTS(szTxt), g_strPluginName, MB_YESNO);

 	return (dw == IDYES);

diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp
index d737c8494f..7f8d0494cb 100644
--- a/plugins/Exchange/src/emails.cpp
+++ b/plugins/Exchange/src/emails.cpp
@@ -375,7 +375,7 @@ int ShowMessage(TCHAR *message, int cUnreadEmails)
 		return ShowPopupMessage(TranslateT("Exchange email"), message, cUnreadEmails);

 	}

 	else{

-		return ShowMessageBoxMessage(TranslateT("Do you want to see the email headers ?"), message, cUnreadEmails);

+		return ShowMessageBoxMessage(TranslateT("Do you want to see the email headers?"), message, cUnreadEmails);

 	}

 	

 	return 0;

diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index cfede62880..efd72f889b 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -112,7 +112,7 @@ static int ChangesNotSaved(HWND hWnd, PFolderItem item)
 static void CheckForChanges(HWND hWnd, int bNeedConfirmation = 1)

 {

 	if (ChangesNotSaved(hWnd, lastItem))

-		if ((!bNeedConfirmation) || MessageBox(hWnd, TranslateT("Some changes weren't saved. Apply the changes now ?"), TranslateT("Changes not saved"), MB_YESNO | MB_ICONINFORMATION) == IDYES)

+		if ((!bNeedConfirmation) || MessageBox(hWnd, TranslateT("Some changes weren't saved. Apply the changes now?"), TranslateT("Changes not saved"), MB_YESNO | MB_ICONINFORMATION) == IDYES)

 			SaveItem(hWnd, lastItem, TRUE);

 }

 

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 0fc823fac2..78bf1458e1 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -809,7 +809,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 				{

 					if (bUnaplyedChanges )

 					{

-						DWORD res = MessageBox(hwndDlg, TranslateT("You have unapplyed changes do you wish to apply these first ?"), MSG_BOX_TITEL, MB_YESNOCANCEL);

+						DWORD res = MessageBox(hwndDlg, TranslateT("You have unapplyed changes do you wish to apply these first?"), MSG_BOX_TITEL, MB_YESNOCANCEL);

 						if (res == IDCANCEL )

 							return TRUE;

 						if (res == IDYES )

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index f754858970..a92141f648 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -1297,7 +1297,7 @@ static INT_PTR CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 		SetWindowPos(hwndDlg, 0, new_key_rect.left, new_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
 		TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-		SetDlgItemText(hwndDlg, IDC_MESSAGE, tmp[0]?TranslateT("There is existing key for contact, would you like to replace with new key ?"):TranslateT("New public key was received, do you want to import it?"));
+		SetDlgItemText(hwndDlg, IDC_MESSAGE, tmp[0]?TranslateT("There is existing key for contact, would you like to replace with new key?"):TranslateT("New public key was received, do you want to import it?"));
 		EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT_AND_USE), db_get_b(hContact, szGPGModuleName, "GPGEncryption", 0)?0:1);
 		SetDlgItemText(hwndDlg, ID_IMPORT, tmp[0]?TranslateT("Replace"):TranslateT("Accept"));
 		mir_free(tmp);
@@ -2152,7 +2152,7 @@ void InitCheck()
 					question += keyid;
 					question += Translate(" for account ");
 					question += toUTF8(accounts[i]->tszAccountName);
-					question += Translate(" deleted from gpg secret keyring\nDo you want to set another key ?");
+					question += Translate(" deleted from gpg secret keyring\nDo you want to set another key?");
 					if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES)
 						ShowFirstRunDialog();
 				}
@@ -2194,7 +2194,7 @@ void InitCheck()
 						question += keyid;
 						question += Translate(" for account ");
 						question += toUTF8(accounts[i]->tszAccountName);
-						question += Translate(" expired and will not work\nDo you want to set another key ?");
+						question += Translate(" expired and will not work\nDo you want to set another key?");
 						if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES)
 							ShowFirstRunDialog();
 					}
@@ -2220,7 +2220,7 @@ void InitCheck()
 		if((p = out.find(keyid)) == string::npos)
 		{
 			question += keyid;
-			question += Translate(" deleted from gpg secret keyring\nDo you want to set another key ?");
+			question += Translate(" deleted from gpg secret keyring\nDo you want to set another key?");
 			if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES)
 				ShowFirstRunDialog();
 		}
@@ -2260,7 +2260,7 @@ void InitCheck()
 			if(expired)
 			{
 				question += keyid;
-				question += Translate(" expired and will not work\nDo you want to set another key ?");
+				question += Translate(" expired and will not work\nDo you want to set another key?");
 				if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES)
 					ShowFirstRunDialog();
 			}
@@ -2322,7 +2322,7 @@ void ImportKey()
 	new_key_hcnt_mutex.unlock();
 	bool for_all_sub = false;
 	if(metaIsProtoMetaContacts(hContact))
-		if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
+		if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
 			for_all_sub = true;
 	if(metaIsProtoMetaContacts(hContact))
 	{
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index 69aa97086d..e9aa1ad45e 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -42,7 +42,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 			{
 				if(bDebugLog)
 					debuglog<<std::string(time_str()+": info: received encrypted message from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with turned off encryption");
-				if(MessageBox(0, TranslateT("We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+				if(MessageBox(0, TranslateT("We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact?"), TranslateT("Warning"), MB_YESNO) == IDYES)
 				{
 					if(!isContactHaveKey(hContact))
 					{
@@ -66,7 +66,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						setClistIcon(hContact);
 					}
 				}
-				else if(MessageBox(0, TranslateT("Do you want to try to decrypt encrypted message ?"), TranslateT("Warning"), MB_YESNO) == IDNO)
+				else if(MessageBox(0, TranslateT("Do you want to try to decrypt encrypted message?"), TranslateT("Warning"), MB_YESNO) == IDNO)
 				{
 					
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
@@ -690,7 +690,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
 	{
 		out.clear();
-		if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+		if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently?"), TranslateT("Warning"), MB_YESNO) == IDYES)
 		{
 			db_set_b(hContact, szGPGModuleName, "bAlwaysTrust", 1);
 			std::vector<std::wstring> tmp;
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index e307670c82..ddf6e92704 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -227,7 +227,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  }

 			  }

 			  if(!keep)

-				  if(MessageBox(0, TranslateT("This key is not used by any contact. Do you want to remove it from public keyring ?"), TranslateT("Key info"), MB_YESNO) == IDYES)

+				  if(MessageBox(0, TranslateT("This key is not used by any contact. Do you want to remove it from public keyring?"), TranslateT("Key info"), MB_YESNO) == IDYES)

 				  {

 					  std::vector<wstring> cmd;

 					  string output;

@@ -261,7 +261,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  mir_free(tmp);

 				  if(ismetacontact)

 				  {

-					  if(MessageBox(0, TranslateT("Do you want to remove key from entire metacontact (all subcontacts) ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)

+					  if(MessageBox(0, TranslateT("Do you want to remove key from entire metacontact (all subcontacts)?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)

 					  {

 						  HANDLE hcnt = NULL;

 						  int count = metaGetContactsNum(meta);

@@ -895,7 +895,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 						if(metaIsProtoMetaContacts(hContact))

 						{

 							HANDLE hcnt = NULL;

-							if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)

+							if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)

 							{

 								allsubcontacts = true;

 								int count = metaGetContactsNum(hContact);

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index ac9ccd3901..928a7ee9f9 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -211,7 +211,7 @@ INT_PTR ToggleEncryption(WPARAM w, LPARAM l)
 	if(metaIsProtoMetaContacts(hContact))
 	{
 		HANDLE hcnt = NULL;
-		if(MessageBox(0, TranslateT("Do you want to toggle encryption for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
+		if(MessageBox(0, TranslateT("Do you want to toggle encryption for all subcontacts?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
 		{
 			int count = metaGetContactsNum(hContact);
 			for(int i = 0; i < count; i++)
@@ -345,7 +345,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 						file.erase(p1, _tcslen(_T(".gpg")));
 						if(boost::filesystem::exists(file))
 						{
-							if(MessageBox(0, TranslateT("Target file exists, do you want to replace it ?"), TranslateT("Warning"), MB_YESNO) == IDNO)
+							if(MessageBox(0, TranslateT("Target file exists, do you want to replace it?"), TranslateT("Warning"), MB_YESNO) == IDNO)
 								return 0;
 						}
 						cmd.push_back(file);
@@ -524,7 +524,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)
 	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
 	{
 		out.clear();
-		if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+		if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently?"), TranslateT("Warning"), MB_YESNO) == IDYES)
 		{
 			db_set_b(hcnt, szGPGModuleName, "bAlwaysTrust", 1);
 			std::vector<std::wstring> tmp;
diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index 3f0fa6a5c1..04a21d63d4 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -300,7 +300,7 @@ CAPTION "Send To All Tabs"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     ICON            IDI_QUESTION, IDC_STATIC, 10, 10, 21, 21

-    LTEXT           "You are about to send a message to all open tabs.\nAre you sure ?",

+    LTEXT           "You are about to send a message to all open tabs.\nAre you sure?",

                     IDC_STATIC,40,10,175,20

     CONTROL         "Remember my choice for this container",

                     IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,39,

diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp
index 74e6868539..984489134c 100644
--- a/plugins/SecureIM/src/language.cpp
+++ b/plugins/SecureIM/src/language.cpp
@@ -19,7 +19,7 @@ LPCSTR sim013 = LPGEN("Bad key received...");
 LPCSTR sim101 = LPGEN("SecureIM: Error while decrypting the message.");

 LPCSTR sim102 = LPGEN("SecureIM: Error while decrypting the message, bad message length.");

 LPCSTR sim103 = LPGEN("SecureIM: Error while decrypting the message, bad message CRC.");

-LPCSTR sim104 = LPGEN("User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now ?");

+LPCSTR sim104 = LPGEN("User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now?");

 LPCSTR sim105 = LPGEN("SecureIM not enabled! You Must Enable SecureIM with this user...");

 LPCSTR sim106 = LPGEN("Can't Send Encrypted Message !\nUser is offline now and his secure key has been expired, Do you want to send your message ?\nIt will be unencrypted !");

 LPCSTR sim107 = LPGEN("SecureIM won't be loaded because cryptopp.dll is missing or wrong version !");

@@ -95,9 +95,9 @@ LPCSTR sim506 = LPGEN("Error while decoding RSA message");
 LPCSTR sim507 = LPGEN("Session closed on timeout");

 LPCSTR sim508 = LPGEN("Session closed by other side when status \"disabled\"");

 LPCSTR sim510 = LPGEN("Session closed on error: %02x");

-LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key ?");

+LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key?");

 LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s");

-LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key ?");

+LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key?");

 LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s");

 

 

diff --git a/plugins/VersionInfo/src/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp
index d7e9024894..375506347d 100644
--- a/plugins/VersionInfo/src/dlgHandlers.cpp
+++ b/plugins/VersionInfo/src/dlgHandlers.cpp
@@ -386,7 +386,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case IDC_SHOWUUIDS:

 			if (IsDlgButtonChecked(hWnd, IDC_SHOWUUIDS) && MessageBox(hWnd, 

 				TranslateT("Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it."), 

-				TranslateT("Show plugin UUIDs ?"), MB_YESNO | MB_ICONWARNING) == IDNO)

+				TranslateT("Show plugin UUIDs?"), MB_YESNO | MB_ICONWARNING) == IDNO)

 			{

 				CheckDlgButton(hWnd, IDC_SHOWUUIDS, FALSE);