diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/AimOscar/src/error.cpp | 4 | ||||
| -rw-r--r-- | protocols/FacebookRM/src/contacts.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_rc.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
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)
|