English US correction (patch by RMN)

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

15 files changed, 21 insertions, 21 deletions

diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index d3c088b537..59042a3385 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -41,7 +41,7 @@ EventNames[] =
 	EVENTTYPE_STATUSCHANGE, LPGENT("Status change"),

 	EVENTTYPE_AUTHREQUEST, LPGENT("Authorization request"),

 	EVENTTYPE_ADDED, LPGENT("You were added"),

-	EVENTTYPE_CONTACTS, LPGENT("Contacts recieved"),

+	EVENTTYPE_CONTACTS, LPGENT("Contacts received"),

 	EVENTTYPE_SMTPSIMPLE, LPGENT("SMTP Simple Email"),

 	ICQEVENTTYPE_SMS, LPGENT("SMS message")

 };

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 2d5f1ef7b2..6ba1f66318 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -229,7 +229,7 @@ INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LP
 				if (length>1) {

 					TCHAR *text = (TCHAR*)mir_alloc(length*sizeof(TCHAR));

 					if (!text) {

-						msg(TranslateT("Couldnt Allocate enough memory"), _T(""));

+						msg(TranslateT("Couldn't allocate enough memory"), _T(""));

 						break;

 					}

 					GetDlgItemText(hwnd, IDC_MESSAGE, text, length);

@@ -295,7 +295,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 				if (length>1) {

 					TCHAR *text = (TCHAR*)mir_alloc(length*sizeof(TCHAR));

 					if (!text) {

-						msg(TranslateT("Couldnt Allocate enough memory"), _T(""));

+						msg(TranslateT("Couldn't allocate enough memory"), _T(""));

 						break;

 					}

 					GetDlgItemText(hwnd, IDC_MESSAGE, text, length);

@@ -421,7 +421,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 				if (length > 1) {

 					TCHAR *text = (TCHAR*)mir_alloc(length*sizeof(TCHAR));

 					if (!text) {

-						msg(TranslateT("Couldnt Allocate enough memory"), _T(""));

+						msg(TranslateT("Couldn't allocate enough memory"), _T(""));

 						break;

 					}

 					GetDlgItemText(hwnd, IDC_MESSAGE, text, length);

diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
index 72ba0e7e24..cf8587611e 100644
--- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
+++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
@@ -334,7 +334,7 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 

 						if (!setting || !value)

 						{

-							msg(Translate("Couldnt allocate enough memory!"), modFullname);

+							msg(Translate("Couldn't allocate enough memory!"), modFullname);

 							DestroyWindow(hwnd);

 							break;

 						}

diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index 23cea2f5dd..af821219b5 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -572,7 +572,7 @@ INT_PTR CALLBACK ImportDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
 					if (length)

 					{

 						string = (char*)_alloca(length+1);

-						if (!string) {msg(Translate("Couldnt allocate enough memory!"), modFullname); DestroyWindow(hwnd); }

+						if (!string) {msg(Translate("Couldn't allocate enough memory!"), modFullname); DestroyWindow(hwnd); }

 						GetDlgItemText(hwnd, IDC_TEXT, string, length+1);

 						importSettings(hContact, string);

 						refreshTree(1);

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 74692369e4..b45cc87f3d 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -341,7 +341,7 @@ int WriteBlobFromString(HANDLE hContact,const char *szModule,const char *szSetti
 

 	if (!(data = (BYTE *)_alloca(2+len/2)))

 	{

-		msg(Translate("Couldnt allocate enough memory!"), modFullname);

+		msg(Translate("Couldn't allocate enough memory!"), modFullname);

 		return 0;

 	}

 

diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index 69774bd4b7..1d87461333 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -125,7 +125,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 			{

 				int j;

 				if (!(data = (char*)mir_realloc(data, 3*(dbv.cpbVal+1)+10)))

-					{msg(Translate("Couldnt allocate enough memory!"), modFullname); return;}

+					{msg(Translate("Couldn't allocate enough memory!"), modFullname); return;}

 				data[0] = '\0';

 				for (j=0; j<dbv.cpbVal; j++)

 				{

@@ -673,7 +673,7 @@ void EditLabel(HWND hwnd2List, int item, int subitem)
 			char tmp[16];

 			char *data = (char*)_alloca(3*(dbv.cpbVal+1)+10);

 

-			if (!data) {msg(Translate("Couldnt allocate enough memory!"), modFullname); return;}

+			if (!data) {msg(Translate("Couldn't allocate enough memory!"), modFullname); return;}

 			data[0] = '\0';

 

 			for(j=0; j<dbv.cpbVal; j++)

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 05097df479..0283fae151 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -104,7 +104,7 @@ END
 

 IDD_NEW_KEY DIALOGEX 0, 0, 427, 68

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "The new public key was recieved"

+CAPTION "The new public key was received"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "Import key",ID_IMPORT,9,47,46,14

@@ -177,12 +177,12 @@ END
 

 IDD_ENCRYPTED_FILE_MSG_BOX DIALOGEX 0, 0, 229, 63

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Recieved encrypted file"

+CAPTION "Received encrypted file"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     PUSHBUTTON      "Ignore",IDC_IGNORE,7,42,50,14

     PUSHBUTTON      "Decrypt",IDC_DECRYPT,97,42,50,14

-    LTEXT           "Recieved encrypted file form contact with disabled encryption.",IDC_STATIC,7,7,215,14

+    LTEXT           "Received encrypted file form contact with disabled encryption.",IDC_STATIC,7,7,215,14

     CONTROL         "Remember choice",IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,157,10

 END

 

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 5fef3135af..9aa42f44d2 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -880,7 +880,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			if(boost::filesystem::exists(gpg_lang_path))
 				lang_exists = true;
 			if(gpg_exists && !lang_exists)
-				MessageBox(0, TranslateT("GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have beed warned."), TranslateT("Warning"), MB_OK);
+				MessageBox(0, TranslateT("GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned."), TranslateT("Warning"), MB_OK);
 			mir_free(gpg_path);
 			mir_free(gpg_lang_path);
 		}
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index f36538e19e..1558a12453 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -332,7 +332,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 							return 0;
 						if(file_msg_state < 1)
 							return 0;
-						HistoryLog(ack->hContact, db_event("Recieved encrypted file, trying to decrypt", 0,0, 0));
+						HistoryLog(ack->hContact, db_event("Received encrypted file, trying to decrypt", 0,0, 0));
 						if(!boost::filesystem::exists(f->tszCurrentFile))
 							return 0;
 						string out;
diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index 4319ff6589..373911704f 100644
--- a/plugins/TipperYM/src/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
@@ -35,7 +35,7 @@ PRESETITEM presetItems[] =
 	"listening", LPGENT("Listening to"), LPGENT("Listening to:"), _T("%raw:/ListeningTo%"), 0, 0, 0,

 	"name", LPGENT("Name"), LPGENT("Name:"), _T("%raw:/FirstName|% %raw:/LastName%"), 0, 0, 0,

 	"received", LPGENT("Number of received messages"), LPGENT("Number of msg [IN]:"), _T("%sys:msg_count_in%"), 0, 0, 0,

-	"sended", LPGENT("Number of sended messages"), LPGENT("Number of msg [OUT]:"), _T("%sys:msg_count_out%"), 0, 0, 0,

+	"sended", LPGENT("Number of sent messages"), LPGENT("Number of msg [OUT]:"), _T("%sys:msg_count_out%"), 0, 0, 0,

 	"status", LPGENT("Status"), LPGENT("Status:"), _T("%Status%"), "status", 0, 0,

 	"statusmsg", LPGENT("Status message"), LPGENT("Status message:"), _T("%sys:status_msg%"), 0, 0, 0,

 	"time", LPGENT("Contact time"), LPGENT("Time:"), _T("%sys:time%"), 0, 0, 0,

diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index 3fa5d218e1..c73371fc4f 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -194,7 +194,7 @@ void CJabberProto::OnIqResultGetSearchFields(HXML iqNode, CJabberIqInfo *pInfo)
 		mir_sntprintf(buff, SIZEOF(buff), TranslateT("Error %s %s\r\nPlease select other server"), code ? code : _T(""), description ? description : _T(""));

 		SetDlgItemText(searchHandleDlg,IDC_INSTRUCTIONS,buff);

 	}

-	else SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, TranslateT("Error Unknown reply recieved\r\nPlease select other server"));

+	else SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, TranslateT("Error Unknown reply received\r\nPlease select other server"));

 }

 

 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc
index d1df59f0c3..20f5919442 100644
--- a/protocols/MRA/res/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -173,7 +173,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,28,244,8

     CONTROL         "No out connection on receive",IDC_FILE_SEND_NOOUTCONNECTIONONRECEIVE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,39,244,8

-    CONTROL         "Out connections: ignory additional ports (443, 2041)",IDC_FILE_SEND_IGNORYADDITIONALPORTS,

+    CONTROL         "Out connections: ignore additional ports (443, 2041)",IDC_FILE_SEND_IGNORYADDITIONALPORTS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,50,244,8

     CONTROL         "Hide my IP addresses",IDC_FILE_SEND_HIDE_MY_ADDRESSES,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,61,244,8

@@ -248,7 +248,7 @@ BEGIN
     EDITTEXT        IDC_USER_BLOG_STATUS_MSG,7,19,242,38,ES_MULTILINE | ES_READONLY

     EDITTEXT        IDC_MSG_TO_SEND,7,61,242,38,ES_MULTILINE

     CONTROL         "Notify",IDC_CHK_NOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,125,9

-    LTEXT           "Writed:",IDC_STATIC_WRITED_TIME,7,7,242,11

+    LTEXT           "Written:",IDC_STATIC_WRITED_TIME,7,7,242,11

     LTEXT           "0/500",IDC_STATIC_CHARS_COUNTER,211,103,38,11,0,WS_EX_RIGHT

 END

 

diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index d05b9c2973..c4169375bb 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -68,7 +68,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_UPD_ALL_USERS_INFO               "/UpdateAllUsersInfo"

 #define MRA_UPD_ALL_USERS_INFO_STR           LPGENT("Update all users info")

 #define MRA_CHK_USERS_AVATARS                "/CheckUpdatesUsersAvatars"

-#define MRA_CHK_USERS_AVATARS_STR            LPGENT("Check updates users avatars")

+#define MRA_CHK_USERS_AVATARS_STR            LPGENT("Check users avatars updates")

 #define MRA_REQ_AUTH_FOR_ALL                 "/ReqAuthForAll"

 #define MRA_REQ_AUTH_FOR_ALL_STR             LPGENT("Request authorization for all")

 

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index 01ecb2a730..a0f7abbc1e 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -907,7 +907,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 					}

 				}else {// err on send request for file

 					dwRetErrorCode = GetLastError();

-					mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: request for file %s not sended, error"), dat->pmfqfFiles[i].lpwszName);

+					mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: request for file %s not sent, error"), dat->pmfqfFiles[i].lpwszName);

 					ShowFormattedErrorMessage(szErrorText, NO_ERROR);

 					bFailed = TRUE;

 					break;

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 35c4e610c1..ccc499466d 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -1130,7 +1130,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w
 

 			DWORD dwTime = dat->ppro->getDword(dat->hContact, DBSETTING_BLOGSTATUSTIME, 0);

 			if (dwTime && MakeLocalSystemTimeFromTime32(dwTime, &stBlogStatusTime))

-				szBuff.Format(_T("%s: %04ld.%02ld.%02ld %02ld:%02ld"), TranslateT("Writed"),

+				szBuff.Format(_T("%s: %04ld.%02ld.%02ld %02ld:%02ld"), TranslateT("Written"),

 					stBlogStatusTime.wYear, stBlogStatusTime.wMonth, stBlogStatusTime.wDay, stBlogStatusTime.wHour, stBlogStatusTime.wMinute);

 			else

 				szBuff.Empty();