From 79e72b2ecb9b6c2e3dd5b6b87c9c8634ab5463f2 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 9 Oct 2013 18:25:12 +0000 Subject: English US correction (patch by RMN) git-svn-id: http://svn.miranda-ng.org/main/trunk@6420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/Options.cpp | 2 +- plugins/BuddyPounce/src/dialog.cpp | 6 +++--- plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 2 +- plugins/DbEditorPP/src/exportimport.cpp | 2 +- plugins/DbEditorPP/src/main.cpp | 2 +- plugins/DbEditorPP/src/settinglist.cpp | 4 ++-- plugins/New_GPG/res/new_gpg.rc | 6 +++--- plugins/New_GPG/src/main.cpp | 2 +- plugins/New_GPG/src/utilities.cpp | 2 +- plugins/TipperYM/src/preset_items.cpp | 2 +- protocols/JabberG/src/jabber_search.cpp | 2 +- protocols/MRA/res/resource.rc | 4 ++-- protocols/MRA/src/MraConstans.h | 2 +- protocols/MRA/src/MraFilesQueue.cpp | 2 +- protocols/MRA/src/Mra_functions.cpp | 2 +- 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; jhContact, 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(); -- cgit v1.2.3