From 0df358749ed87e4666938121f0cfbb3d8c3d0bca Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 5 Oct 2013 20:02:22 +0000 Subject: spelling correction (thanks RMN) git-svn-id: http://svn.miranda-ng.org/main/trunk@6355 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/res/resource.rc | 2 +- plugins/CmdLine/MimCmd/src/commands.cpp | 2 +- plugins/ContactsPlus/res/contacts.rc | 2 +- plugins/FTPFileYM/src/job_packer.cpp | 2 +- plugins/PackUpdater/Src/Notifications.cpp | 2 +- plugins/PluginUpdater/src/Utils.cpp | 2 +- plugins/Scriver/res/resource.rc | 2 +- plugins/Scriver/src/msgtimedout.cpp | 2 +- plugins/SendScreenshotPlus/src/CSend.cpp | 2 +- plugins/UserInfoEx/src/classPsTree.cpp | 2 +- plugins/WhenWasIt/src/dlg_handlers.cpp | 2 +- plugins/YAMN/src/browser/badconnect.cpp | 2 +- plugins/YAMN/src/proto/pop3/pop3comm.cpp | 2 +- protocols/AimOscar/src/error.cpp | 4 ++-- protocols/FacebookRM/src/contacts.cpp | 4 ++-- protocols/JabberG/src/jabber_rc.cpp | 4 ++-- src/core/stdmsg/res/resource.rc | 2 +- src/core/stdmsg/src/msgtimedout.cpp | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/plugins/Alarms/res/resource.rc b/plugins/Alarms/res/resource.rc index 8122b01858..eca8cd05ad 100644 --- a/plugins/Alarms/res/resource.rc +++ b/plugins/Alarms/res/resource.rc @@ -98,7 +98,7 @@ BEGIN COMBOBOX IDC_DAYNUM,174,36,48,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Date and Time",IDC_STATIC,167,9,134,88 EDITTEXT IDC_RELMIN,238,19,57,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Disable next occurence",IDC_CHK_SUSPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,192,128,10 + CONTROL "Disable next occurrence",IDC_CHK_SUSPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,192,128,10 CONTROL "Don't trigger on startup",IDC_CHK_NOSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,192,110,10 CONTROL "No reminder",IDC_CHK_NOREMINDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,192,110,10 CONTROL "",IDC_DATE,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,185,65,100,15 diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp index 8b2f70259f..f562e8948b 100644 --- a/plugins/CmdLine/MimCmd/src/commands.cpp +++ b/plugins/CmdLine/MimCmd/src/commands.cpp @@ -210,7 +210,7 @@ void ProcessConsoleCommand(PCommand command, char *arguments[], int count, PRepl case WAIT_OBJECT_0 + 1: //close event default: { - strcpy(sdCmdLine->reply.message, Translate("Miranda has been closed or an error has occured while waiting for the result, could not process request.")); + strcpy(sdCmdLine->reply.message, Translate("Miranda has been closed or an error has occurred while waiting for the result, could not process request.")); done = TRUE; break; diff --git a/plugins/ContactsPlus/res/contacts.rc b/plugins/ContactsPlus/res/contacts.rc index 8cea647c0e..3a2a964ef8 100644 --- a/plugins/ContactsPlus/res/contacts.rc +++ b/plugins/ContactsPlus/res/contacts.rc @@ -61,7 +61,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Contacts send error" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "An error has occured. The protocol reported the following error:",IDC_STATIC,5,5,177,28 + LTEXT "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,5,177,28 DEFPUSHBUTTON "Try again",IDOK,22,78,63,14 PUSHBUTTON "Cancel",IDCANCEL,104,78,61,14 EDITTEXT IDC_ERRORTEXT,5,37,177,35,ES_MULTILINE | ES_READONLY | WS_VSCROLL diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp index 51fa387860..cdfa799493 100644 --- a/plugins/FTPFileYM/src/job_packer.cpp +++ b/plugins/FTPFileYM/src/job_packer.cpp @@ -129,7 +129,7 @@ void PackerJob::pack() { if (res == ZIP_ERRNO) { - Utils::msgBox(TranslateT("Error occured when zipping the file(s)."), MB_OK | MB_ICONERROR); + Utils::msgBox(TranslateT("Error occurred when zipping the file(s)."), MB_OK | MB_ICONERROR); delete this->tab; } diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index d1a79467a7..93c345560e 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -194,7 +194,7 @@ void DlgDownloadProc() CallFunctionAsync(CreateDownloadDialog, 0); if (!DownloadFile(pFileUrl->tszDownloadURL, pFileUrl->tszDiskPath)) { Title = TranslateT("Pack Updater"); - Text = TranslateT("An error occured while downloading the update."); + Text = TranslateT("An error occurred while downloading the update."); if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) { Number = 1; show_popup(0, Title, Text, Number, 0); diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index e92ff760f5..bd2011cf96 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -222,7 +222,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT& baseUrl, SERVLIST& arHashes) Netlib_CloseHandle(nlc); if (!ret && !opts.bSilent) { - ShowPopup(0, LPGENT("Plugin Updater"), LPGENT("An error occured while checking new updates."), 1, 0); + ShowPopup(0, LPGENT("Plugin Updater"), LPGENT("An error occurred while checking new updates."), 1, 0); return false; } diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 2172fbe021..3f0fa6a5c1 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -232,7 +232,7 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | CAPTION "Send Error" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "An error has occured. The protocol reported the following error:", + LTEXT "An error has occurred. The protocol reported the following error:", IDC_STATIC,5,4,177,20 EDITTEXT IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY LTEXT "while sending the following message:",IDC_STATIC,6,48, diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index d185ce1900..96612fa2be 100644 --- a/plugins/Scriver/src/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp @@ -40,7 +40,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if (ewd->szDescription) { SetDlgItemText(hwndDlg, IDC_ERRORTEXT, ewd->szDescription); } else { - SetDlgItemText(hwndDlg, IDC_ERRORTEXT, TranslateT("An unknown error has occured.")); + SetDlgItemText(hwndDlg, IDC_ERRORTEXT, TranslateT("An unknown error has occurred.")); } if (ewd->szText) { SETTEXTEX st = {0}; diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index 097b9ff18f..9c20a086f3 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -341,7 +341,7 @@ void CSend::Exit(unsigned int Result) { if (err){ SkinPlaySound("FileFailed"); if(m_ErrorMsg && m_ErrorMsg[0] != 0) MsgBoxService(NULL, (LPARAM)&m_box); - else MsgErr(NULL, LPGENT("An unknown error has occured.")); + else MsgErr(NULL, LPGENT("An unknown error has occurred.")); } AfterSendDelete(); diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index 0c2157bcd2..f0d763ee9e 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -393,7 +393,7 @@ HTREEITEM CPsTree::ShowItem(const int iPageIndex, LPWORD needWidth) // insert item into tree if set visible if ((tvii.itemex.hItem = TreeView_InsertItem(_hWndTree, &tvii)) == NULL) { - MsgErr(GetParent(_hWndTree), LPGENT("An fatal error occured on adding a property sheet page!\nDialog creation aborted!")); + MsgErr(GetParent(_hWndTree), LPGENT("A fatal error occurred on adding a property sheet page!\nDialog creation aborted!")); return NULL; } pti->Hti(tvii.itemex.hItem); diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index e7e4c7285d..ddbe9fa6b8 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -187,7 +187,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara SendMessage(GetDlgItem(hWnd, IDC_RIGHT_CLICK), CB_SETCURSEL, commonData.rPopupClick, 0); SendMessage(GetDlgItem(hWnd, IDC_NOTIFYFOR), CB_SETCURSEL, commonData.notifyFor, 0); - CreateToolTip(GetDlgItem(hWnd, IDC_POPUP_TIMEOUT), TranslateT("Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occuring today]"), 400); + CreateToolTip(GetDlgItem(hWnd, IDC_POPUP_TIMEOUT), TranslateT("Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occurring today]"), 400); TCHAR buffer[1024]; _itot(commonData.daysInAdvance, buffer, 10); diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp index c233475d29..7662e0bfd3 100644 --- a/plugins/YAMN/src/browser/badconnect.cpp +++ b/plugins/YAMN/src/browser/badconnect.cpp @@ -7,7 +7,7 @@ #include "..\yamn.h" #define BADCONNECTTITLE LPGEN("%s - connection error") -#define BADCONNECTMSG LPGEN("An error occured. Error code: %d")//is in use? +#define BADCONNECTMSG LPGEN("An error occurred. Error code: %d")//is in use? //-------------------------------------------------------------------------------------------------- diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index fe1bce4457..bd5cbfa80e 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -331,7 +331,7 @@ DWORD WINAPI WritePOP3Accounts() DWORD ReturnValue = CallService(MS_YAMN_WRITEACCOUNTS,(WPARAM)POP3Plugin,(LPARAM)FileName); if (ReturnValue == EACC_SYSTEM) { TCHAR temp[1024] = {0}; - mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Error while copying data to disk occured. File in use?"), FileName); + mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Error while copying data to disk occurred. Is file in use?"), FileName); MessageBox(NULL, temp, TranslateT("POP3 plugin- write file error"), MB_OK ); } diff --git a/protocols/AimOscar/src/error.cpp b/protocols/AimOscar/src/error.cpp index 9fccb6c4d4..cfd5f3e26d 100644 --- a/protocols/AimOscar/src/error.cpp +++ b/protocols/AimOscar/src/error.cpp @@ -35,7 +35,7 @@ void CAimProto::login_error(unsigned short error) break; default: - ShowPopup(LPGEN("Unknown error occured when attempting to connect."), ERROR_POPUP); + ShowPopup(LPGEN("Unknown error occurred when attempting to connect."), ERROR_POPUP); break; } } @@ -219,7 +219,7 @@ void CAimProto::admin_error(unsigned short error) break; case 0x13: - ShowPopup(LPGEN("An Error has occured."), ERROR_POPUP); + ShowPopup(LPGEN("An Error has occurred."), ERROR_POPUP); break; case 0x14: diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp index cade7bb6de..7fcd1827bb 100644 --- a/protocols/FacebookRM/src/contacts.cpp +++ b/protocols/FacebookRM/src/contacts.cpp @@ -214,7 +214,7 @@ void FacebookProto::DeleteContactFromServer(void *data) NotifyEvent(m_tszUserName, TranslateT("Contact was removed from your server list."), NULL, FACEBOOK_EVENT_OTHER); } else { - facy.client_notify(TranslateT("Error occured when removing contact from server.")); + facy.client_notify(TranslateT("Error occurred when removing contact from server.")); } if (resp.code != HTTP_CODE_OK) @@ -248,7 +248,7 @@ void FacebookProto::AddContactToServer(void *data) NotifyEvent(m_tszUserName, TranslateT("Request for friendship was sent."), NULL, FACEBOOK_EVENT_OTHER); } - else facy.client_notify(TranslateT("Error occured when requesting friendship.")); + else facy.client_notify(TranslateT("Error occurred when requesting friendship.")); if (resp.code != HTTP_CODE_OK) facy.handle_error("AddContactToServer"); diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp index 9265a00316..a32bb457ed 100644 --- a/protocols/JabberG/src/jabber_rc.cpp +++ b/protocols/JabberG/src/jabber_rc.cpp @@ -203,7 +203,7 @@ BOOL CJabberAdhocManager::HandleCommandRequest(HXML iqNode, CJabberIqInfo *pInfo XmlNodeIq(_T("result"), pInfo) << XCHILDNS(_T("command"), JABBER_FEAT_COMMANDS) << XATTR(_T("node"), szNode) << XATTR(_T("sessionid"), pSession->GetSessionId()) << XATTR(_T("status"), _T("canceled")) - << XCHILD(_T("note"), TranslateT("Error occured during processing command")) << XATTR(_T("type"), _T("error"))); + << XCHILD(_T("note"), TranslateT("Error occurred during processing command")) << XATTR(_T("type"), _T("error"))); RemoveSession(pSession); pSession = NULL; @@ -630,7 +630,7 @@ int CJabberProto::AdhocLockWSHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSes if (bOk) mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("Workstation successfully locked")); else - mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("Error %d occured during workstation lock"), GetLastError()); + mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("Error %d occurred during workstation lock"), GetLastError()); m_ThreadInfo->send( XmlNodeIq(_T("result"), pInfo) diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index 7c98a710f4..8a48731cbf 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -71,7 +71,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Send Error" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "An error has occured. The protocol reported the following error:",IDC_STATIC,5,4,177,20 + LTEXT "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,4,177,20 EDITTEXT IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY LTEXT "while sending the following message:",IDC_STATIC,6,48,175,8 CONTROL "",IDC_MSGTEXT,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,5,60,177,26,WS_EX_STATICEDGE diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index 3004671f7f..450e04d2e8 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -47,7 +47,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)item); if (!param->szMsg || !param->szMsg[0]) - SetDlgItemText(hwndDlg, IDC_ERRORTEXT, TranslateT("An unknown error has occured.")); + SetDlgItemText(hwndDlg, IDC_ERRORTEXT, TranslateT("An unknown error has occurred.")); else { TCHAR* ptszError = (TCHAR*)CallService(MS_LANGPACK_PCHARTOTCHAR, 0, (LPARAM)param->szMsg); -- cgit v1.2.3