summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-10-05 20:02:22 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-10-05 20:02:22 +0000
commit0df358749ed87e4666938121f0cfbb3d8c3d0bca (patch)
tree2299734c4bc3e215c7b90812990e9a9b3cdf770f /src/core
parentddd504fd65b47f0248cbe85e4b7b343af44b120d (diff)
spelling correction (thanks RMN)
git-svn-id: http://svn.miranda-ng.org/main/trunk@6355 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdmsg/res/resource.rc2
-rw-r--r--src/core/stdmsg/src/msgtimedout.cpp2
2 files changed, 2 insertions, 2 deletions
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);