summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-03-06 19:53:49 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-03-06 19:53:49 +0000
commit7f78de1c025a6a6be22bd7b6754a67097aa3a32f (patch)
tree2623565f23aaa8713bed515254ec759f2d8102fb /protocols
parentcaad3bfa4001d285030a97c855125b9522923207 (diff)
- langpacks/english: update;
- langpacks/russian: update; - grammar correction; git-svn-id: http://svn.miranda-ng.org/main/trunk@8432 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/MRA/res/resource.rc2
-rw-r--r--protocols/MRA/src/Mra_proto.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc
index 5928f0ea9d..e911b91f22 100644
--- a/protocols/MRA/res/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -83,7 +83,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,72,263,8
CONTROL "Automatically grant authorization to new users",IDC_AUTO_AUTH_GRAND_NEW_USERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,83,263,8
- CONTROL "Automatically authorization on mail.ru web services",IDC_AUTO_AUTH_ON_WEB_SVCS,
+ CONTROL "Automatic authorization on mail.ru web services",IDC_AUTO_AUTH_ON_WEB_SVCS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,263,8
CONTROL "Notify me when a message delivery has failed",IDC_SLOWSEND,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,107,263,8
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 3a0c9bb6c0..704bec82a9 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -24,7 +24,7 @@ DWORD CMraProto::StartConnect()
InterlockedExchange((volatile LONG*)&m_dwThreadWorkerLastPingTime, GetTickCount());
if (INVALID_HANDLE_VALUE != ForkThreadEx(&CMraProto::MraThreadProc, NULL, 0))
return 0; /* OK. */
- MraPopupShowFromAgentW(MRA_POPUP_TYPE_ERROR, 0, TranslateT("Thread create fail"));
+ MraPopupShowFromAgentW(MRA_POPUP_TYPE_ERROR, 0, TranslateT("Thread creation failure"));
}
InterlockedExchange((volatile LONG*)&m_dwThreadWorkerRunning, FALSE);
return ERROR_OPERATION_ABORTED;