summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Alarms/res/resource.rc2
-rw-r--r--plugins/CmdLine/MimCmd/src/commands.cpp2
-rw-r--r--plugins/ContactsPlus/res/contacts.rc2
-rw-r--r--plugins/FTPFileYM/src/job_packer.cpp2
-rw-r--r--plugins/PackUpdater/Src/Notifications.cpp2
-rw-r--r--plugins/PluginUpdater/src/Utils.cpp2
-rw-r--r--plugins/Scriver/res/resource.rc2
-rw-r--r--plugins/Scriver/src/msgtimedout.cpp2
-rw-r--r--plugins/SendScreenshotPlus/src/CSend.cpp2
-rw-r--r--plugins/UserInfoEx/src/classPsTree.cpp2
-rw-r--r--plugins/WhenWasIt/src/dlg_handlers.cpp2
-rw-r--r--plugins/YAMN/src/browser/badconnect.cpp2
-rw-r--r--plugins/YAMN/src/proto/pop3/pop3comm.cpp2
13 files changed, 13 insertions, 13 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 );
}