From 1361cd3f553f09375b145a02dd47ce5e6ea476b0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 17 Sep 2013 10:17:44 +0000 Subject: Spelling correction (patch from RMN) git-svn-id: http://svn.miranda-ng.org/main/trunk@6106 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AssocMgr/src/dde.cpp | 2 +- plugins/AvatarHistory/res/AvatarHistory.rc | 2 +- plugins/CountryFlags/res/resource.rc | 2 +- plugins/LotusNotify/src/LotusNotify.cpp | 2 +- plugins/MirFox/src/MirandaUtils.cpp | 24 ++++++++++++------------ plugins/MirFox/src/MirfoxMiranda.cpp | 2 +- plugins/SendScreenshotPlus/src/UMainForm.cpp | 2 +- plugins/UserInfoEx/res/resource.rc | 2 +- protocols/Gadu-Gadu/src/avatar.cpp | 6 +++--- protocols/Gadu-Gadu/src/filetransfer.cpp | 4 ++-- protocols/Gadu-Gadu/src/image.cpp | 4 ++-- protocols/Gadu-Gadu/src/services.cpp | 4 ++-- protocols/IRCG/src/ircproto.cpp | 2 +- protocols/MRA/src/MraAvatars.cpp | 2 +- protocols/MRA/src/MraFilesQueue.cpp | 6 +++--- protocols/MRA/src/Mra_proto.cpp | 2 +- src/modules/clist/groups.cpp | 2 +- src/resource.rc | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp index f93fe1998e..c2031280f6 100644 --- a/plugins/AssocMgr/src/dde.cpp +++ b/plugins/AssocMgr/src/dde.cpp @@ -56,7 +56,7 @@ static void __stdcall UrlActionAsync(void *param) ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open URL"),Translate("Miranda NG was not able to open \"%S\".\n\nThere is no registered handler for this URL type."),pszUrl); break; default: - ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open URL"),Translate("Miranda NG was not able to open \"%S\".\n\nThe given URL is invalid and can not be parsed."),pszUrl); + ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open URL"),Translate("Miranda NG was not able to open \"%S\".\n\nThe given URL is invalid and cannot be parsed."),pszUrl); } mir_free(pszUrl); /* async param */ } diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc index b21e27293b..1cc924ddfa 100644 --- a/plugins/AvatarHistory/res/AvatarHistory.rc +++ b/plugins/AvatarHistory/res/AvatarHistory.rc @@ -108,7 +108,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | CAPTION "Avatar History: Select how to store history avatars" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Please select how the avatar history should be stored. This setting can NOT be changed in future, because it would cause all previous history to be lost.",IDC_STATIC,15,7,416,23 + LTEXT "Please select how the avatar history should be stored. This setting CANNOT be changed in future, because it would cause all previous history to be lost.",IDC_STATIC,15,7,416,23 CONTROL "Store history in miranda history and all history avatars in same folder",IDC_MIR_SAME, "Button",BS_AUTORADIOBUTTON | WS_GROUP,15,32,416,11 CONTROL "Store history in miranda history and history avatars in per protocol folders",IDC_MIR_PROTO, diff --git a/plugins/CountryFlags/res/resource.rc b/plugins/CountryFlags/res/resource.rc index a951c53c5a..c1025da06b 100644 --- a/plugins/CountryFlags/res/resource.rc +++ b/plugins/CountryFlags/res/resource.rc @@ -95,7 +95,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,27,206,10 CONTROL "Use &IP-to-country database for country detection",IDC_CHECK_USEIPTOCOUNTRY, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,42,206,12 - CONTROL "Use &unknown flag if the country can not be determined",IDC_CHECK_USEUNKNOWNFLAG, + CONTROL "Use &unknown flag if the country cannot be determined",IDC_CHECK_USEUNKNOWNFLAG, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,54,206,10 END diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 02973d6335..d50f0fc95a 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1698,7 +1698,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda { #ifdef _WIN64 MessageBox(NULL - , TranslateT("LotusNotify.dll can not work with 64bit Miranda. (Lotus client is 32bit only)") + , TranslateT("LotusNotify.dll cannot work with 64bit Miranda. (Lotus client is 32bit only)") , TranslateT("LotusNotify") , MB_OK | MB_ICONWARNING ); return NULL; diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index 6952966cba..c2374ab166 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -270,27 +270,27 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_ //error - show error popup wchar_t* buffer = new wchar_t[1024 * sizeof(wchar_t)]; if (myMfAck != NULL){ - logger->log_p(L"SMTC: ERROR - Can not send message - result = [%d] ", myMfAck->result); + logger->log_p(L"SMTC: ERROR - Cannot send message - result = [%d] ", myMfAck->result); if (myMfAck->errorDesc != NULL){ if (contactNameW != NULL && tszAccountName != NULL){ - mir_sntprintf(buffer, 1024, TranslateT("Can not send message to %s (%s) - %S"), contactNameW, tszAccountName, myMfAck->errorDesc); + mir_sntprintf(buffer, 1024, TranslateT("Cannot send message to %s (%s) - %S"), contactNameW, tszAccountName, myMfAck->errorDesc); } else { - mir_sntprintf(buffer, 1024, TranslateT("Can not send message - %S"), myMfAck->errorDesc); + mir_sntprintf(buffer, 1024, TranslateT("Cannot send message - %S"), myMfAck->errorDesc); } } else { if (contactNameW != NULL && tszAccountName != NULL){ - mir_sntprintf(buffer, 1024, TranslateT("Can not send message to %s (%s)"), contactNameW, tszAccountName); + mir_sntprintf(buffer, 1024, TranslateT("Cannot send message to %s (%s)"), contactNameW, tszAccountName); } else { - buffer = mir_wstrdup(TranslateT("Can not send message - %S")); + buffer = mir_wstrdup(TranslateT("Cannot send message - %S")); } } } else { - logger->log(L"SMTC: ERROR - Can not send message 2"); + logger->log(L"SMTC: ERROR - Cannot send message 2"); if (contactNameW != NULL && tszAccountName != NULL){ - mir_sntprintf(buffer, 1024, TranslateT("Can not send message to %s (%s)"), contactNameW, tszAccountName); + mir_sntprintf(buffer, 1024, TranslateT("Cannot send message to %s (%s)"), contactNameW, tszAccountName); } else { - buffer = mir_wstrdup(TranslateT("Can not send message")); + buffer = mir_wstrdup(TranslateT("Cannot send message")); } } @@ -470,11 +470,11 @@ void MirandaUtils::setStatusOnAccount(ActionThreadArgStruct* args) } else { if (tszAccountName != NULL){ - logger->log_p(L"SSOA: ERROR - Can not set status message 2 on [%s] - result = [%d] ", tszAccountName, result); - mir_sntprintf(buffer, 1024, TranslateT("Can not set status message on %s"), tszAccountName); + logger->log_p(L"SSOA: ERROR - Cannot set status message 2 on [%s] - result = [%d] ", tszAccountName, result); + mir_sntprintf(buffer, 1024, TranslateT("Cannot set status message on %s"), tszAccountName); } else { - logger->log_p(L"SSOA: ERROR - Can not set status message 2 - result = [%d] ", result); - buffer = mir_wstrdup(TranslateT("Can not set status message")); + logger->log_p(L"SSOA: ERROR - Cannot set status message 2 - result = [%d] ", result); + buffer = mir_wstrdup(TranslateT("Cannot set status message")); } if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) { diff --git a/plugins/MirFox/src/MirfoxMiranda.cpp b/plugins/MirFox/src/MirfoxMiranda.cpp index 64977b2638..b0984d3b66 100644 --- a/plugins/MirFox/src/MirfoxMiranda.cpp +++ b/plugins/MirFox/src/MirfoxMiranda.cpp @@ -109,7 +109,7 @@ void CMirfoxMiranda::initializeSharedMemoryData(MirfoxData& mirfoxData, SharedMe MessageBox(NULL, TranslateT("This MirFox (Miranda) plugin is too old. Please update it."), TranslateT("MirFox (Miranda) - Error"), MB_OK | MB_ICONWARNING ); } if (result.errorCode == -4){ //existing csm version is too low -> sb is too old - MessageBox(NULL, TranslateT("This MirFox (Miranda) plugin can not start because some other MirFox component is too old. Please, check and update your MirFox components."), TranslateT("MirFox (Miranda) - Error"), MB_OK | MB_ICONWARNING ); + MessageBox(NULL, TranslateT("This MirFox (Miranda) plugin cannot start because some other MirFox component is too old. Please, check and update your MirFox components."), TranslateT("MirFox (Miranda) - Error"), MB_OK | MB_ICONWARNING ); } mirfoxData.setPluginState(MFENUM_PLUGIN_STATE_ERROR); return; diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index 9285b5f9d7..a07e027932 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -637,7 +637,7 @@ LRESULT TfrmMain::UMevent(WPARAM wParam, LPARAM lParam) { switch (lParam) { case EVT_CaptureDone: if (!m_Screenshot) { - TCHAR *err = TranslateT("Cant create a Screenshot"); + TCHAR *err = TranslateT("Can't create a Screenshot"); MessageBox(m_hWnd,err,ERROR_TITLE,MB_OK|MB_ICONWARNING); Show(); return FALSE; diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 67bad3fa25..2d85ebdd24 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -455,7 +455,7 @@ BEGIN CONTROL "Use Zodiac as default avatar",CHECK_OPT_ZODIACAVATAR, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,129,131,10 LTEXT "Country Flags",TXT_OPT_FLAGS,161,148,131,8 - CONTROL "Use &unknown flag if country can not be determined",CHECK_OPT_FLAGSUNKNOWN, + CONTROL "Use &unknown flag if country cannot be determined",CHECK_OPT_FLAGSUNKNOWN, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,161,183,131,16 CONTROL "Show country flag as &status icon on message window",CHECK_OPT_FLAGSMSGSTATUS, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,161,203,131,16 diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index 05d4f8781a..33418c0fcd 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -45,7 +45,7 @@ void GGPROTO::getAvatarFilename(HANDLE hContact, TCHAR *pszDest, int cbLen) else { netlog("getAvatarFilename(): Can not create directory for avatar cache: %S. errno=%d: %s", pszDest, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pszDest); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pszDest); showpopup(m_tszUserName, error, GG_POPUP_ERROR | GG_POPUP_ALLOW_MSGBOX | GG_POPUP_ONCE); } } @@ -259,7 +259,7 @@ void __cdecl GGPROTO::avatarrequestthread(void*) } else { netlog("avatarrequestthread(): _topen file %S error. errno=%d: %s", pai.filename, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai.filename); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai.filename); showpopup(m_tszUserName, error, GG_POPUP_ERROR); } } @@ -358,7 +358,7 @@ void __cdecl GGPROTO::setavatarthread(void *param) if (file_fd == -1) { netlog("setavatarthread(): Failed to open avatar file errno=%d: %s.", errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not open avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szFilename); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot open avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szFilename); showpopup(m_tszUserName, error, GG_POPUP_ERROR); mir_free(szFilename); int prevType = getByte(GG_KEY_AVATARTYPEPREV, -1); diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index 6f4f7a9019..4d87b2c10d 100644 --- a/protocols/Gadu-Gadu/src/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp @@ -682,7 +682,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath) { netlog("dccfileallow(): Failed to create file \"%s\". errno=%d: %s", fileName, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create transfer file. ERROR: %d: %s (dcc)\n%s"), errno, _tcserror(errno), szPath); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create transfer file. ERROR: %d: %s (dcc)\n%s"), errno, _tcserror(errno), szPath); showpopup(m_tszUserName, error, GG_POPUP_ERROR); ProtoBroadcastAck(dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc, 0); // Free transfer @@ -733,7 +733,7 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath) { netlog("dcc7fileallow(): Failed to create file \"%s\". errno=%d: %s", fileName, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create transfer file. ERROR: %d: %s (dcc7)\n%s"), errno, _tcserror(errno), szPath); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create transfer file. ERROR: %d: %s (dcc7)\n%s"), errno, _tcserror(errno), szPath); showpopup(m_tszUserName, error, GG_POPUP_ERROR); gg_dcc7_reject(dcc7, GG_DCC7_REJECT_USER); ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0); diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 4a86881d19..5e69a74f66 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -830,7 +830,7 @@ int GGPROTO::img_displayasmsg(HANDLE hContact, void *img) } else { netlog("img_displayasmsg(): Can not create directory for image cache: %S. errno=%d: %s", szPath, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create image cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szPath); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create image cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szPath); showpopup(m_tszUserName, error, GG_POPUP_ERROR | GG_POPUP_ALLOW_MSGBOX | GG_POPUP_ONCE); } } @@ -985,7 +985,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName) free(dat); netlog("img_loadpicture(): fopen(\"%S\", \"rb\") failed. errno=%d: %s", szFileName, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not open image file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szFileName); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot open image file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szFileName); showpopup(m_tszUserName, error, GG_POPUP_ERROR); return NULL; } diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index 80ed636d4e..63426ab80a 100644 --- a/protocols/Gadu-Gadu/src/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp @@ -243,7 +243,7 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam) if (_tremove(pai->filename) != 0){ netlog("getavatarinfo(): refresh. _tremove 1 file %S error. errno=%d: %s", pai->filename, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not remove old avatar file before refresh. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot remove old avatar file before refresh. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename); showpopup(m_tszUserName, error, GG_POPUP_ERROR); } setString(pai->hContact, GG_KEY_AVATARHASH, AvatarHash); @@ -258,7 +258,7 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam) if (_tremove(pai->filename) != 0){ netlog("getavatarinfo(): delete. _tremove file %S error. errno=%d: %s", pai->filename, errno, strerror(errno)); TCHAR error[512]; - mir_sntprintf(error, SIZEOF(error), TranslateT("Can not remove old avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename); + mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot remove old avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename); showpopup(m_tszUserName, error, GG_POPUP_ERROR); } delSetting(pai->hContact, GG_KEY_AVATARHASH); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 7a7bb4d3db..6ee3d0a825 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -906,7 +906,7 @@ int CIrcProto::SetStatusInternal( int iNewStatus, bool bIsInternal ) msn.cbSize = sizeof( MIRANDASYSTRAYNOTIFY ); msn.szProto = m_szModuleName; msn.tszInfoTitle = TranslateT( "IRC error" ); - msn.tszInfo = TranslateT( "Connection can not be established! You have not completed all necessary fields (Nickname, User ID and m_name)." ); + msn.tszInfo = TranslateT( "Connection cannot be established! You have not completed all necessary fields (Nickname, User ID and m_name)." ); msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE; msn.uTimeout = 15000; CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&msn); diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp index e5d12e6735..6421be8ddf 100644 --- a/protocols/MRA/src/MraAvatars.cpp +++ b/protocols/MRA/src/MraAvatars.cpp @@ -311,7 +311,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter) } else { dwErrorCode = GetLastError(); - mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Avatars: cant open file %s, error"), wszFileName); + mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Avatars: can't open file %s, error"), wszFileName); ShowFormattedErrorMessage(szErrorText, dwErrorCode); } } diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp index da0c5e435c..58e9fd18ea 100644 --- a/protocols/MRA/src/MraFilesQueue.cpp +++ b/protocols/MRA/src/MraFilesQueue.cpp @@ -887,7 +887,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter) }// end while }else {// err allocating file disk space dwRetErrorCode = GetLastError(); - mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: cant allocate disk space for file, size %lu bytes, error"), dat->pmfqfFiles[i].dwSize); + mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: can't allocate disk space for file, size %lu bytes, error"), dat->pmfqfFiles[i].dwSize); ShowFormattedErrorMessage(szErrorText, dwRetErrorCode); } CloseHandle(hFile); @@ -900,7 +900,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter) } }else {// err on open file dwRetErrorCode = GetLastError(); - mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: cant open file %s, error"), wszFileName); + mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Receive files: can't open file %s, error"), wszFileName); ShowFormattedErrorMessage(szErrorText, dwRetErrorCode); bFailed = TRUE; break; @@ -1131,7 +1131,7 @@ void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter) } else {// err on open file dwRetErrorCode = GetLastError(); - mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Send files: cant open file %s, error"), dat->pmfqfFiles[j].lpwszName); + mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateT("Send files: can't open file %s, error"), dat->pmfqfFiles[j].lpwszName); ShowFormattedErrorMessage(szErrorText, dwRetErrorCode); bFailed = TRUE; break; diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index cd09ac5c27..f547e052dc 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -632,7 +632,7 @@ bool CMraProto::CmdPopSession(BinBuffer &buf) MraMPopSessionQueueStart(hMPopSessionQueue); } else { //error - MraPopupShowFromAgentW(MRA_POPUP_TYPE_WARNING, 0, TranslateT("Server error: cant get MPOP key for web authorize")); + MraPopupShowFromAgentW(MRA_POPUP_TYPE_WARNING, 0, TranslateT("Server error: can't get MPOP key for web authorize")); MraMPopSessionQueueFlush(hMPopSessionQueue); } return true; diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index 297d4b0b8f..d01e485dd2 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -189,7 +189,7 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM) if (db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT)) { TCHAR szQuestion[256+100]; - mir_sntprintf(szQuestion, SIZEOF(szQuestion), TranslateT("Are you sure you want to delete group '%s'? This operation can not be undone."), name); + mir_sntprintf(szQuestion, SIZEOF(szQuestion), TranslateT("Are you sure you want to delete group '%s'? This operation cannot be undone."), name); if (MessageBox(cli.hwndContactList, szQuestion, TranslateT("Delete Group"), MB_YESNO|MB_ICONQUESTION) == IDNO) return 1; } diff --git a/src/resource.rc b/src/resource.rc index 72b63ef5a7..be75f726e1 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -408,7 +408,7 @@ BEGIN LTEXT "You can select a different profile driver from the default, it may offer more features or abilities, if in doubt use the default.",IDC_STATIC,4,46,207,24 LTEXT "e.g. Miranda Database",IDC_STATIC,62,91,84,11 LTEXT "Driver",IDC_STATIC,20,77,37,9 - LTEXT "Problem: Unable to find any database drivers, this means you can not create a new profile, you need to get dbx_mmap.dll",IDC_NODBDRIVERS,4,104,203,22,NOT WS_VISIBLE + LTEXT "Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mmap.dll",IDC_NODBDRIVERS,4,104,203,22,NOT WS_VISIBLE END IDD_OPT_PLUGINS DIALOGEX 0, 0, 315, 252 -- cgit v1.2.3