From 4ded2c6afe6c5117dfcb96ec889a273fbe340f1e Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Mon, 12 Jan 2015 01:38:53 +0000 Subject: "acknowledgement" = en-gb, "acknowledgment" = en-us git-svn-id: http://svn.miranda-ng.org/main/trunk@11837 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/res/resource.rc | 2 +- protocols/JabberG/src/jabber_opt.cpp | 2 +- protocols/SkypeClassic/res/Resource.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols') diff --git a/protocols/Gadu-Gadu/res/resource.rc b/protocols/Gadu-Gadu/res/resource.rc index c4b663c818..5330896c24 100644 --- a/protocols/Gadu-Gadu/res/resource.rc +++ b/protocols/Gadu-Gadu/res/resource.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "Show connection errors",IDC_SHOWCERRORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,32,286,10 CONTROL "Automatically reconnect after unintentional disconnection",IDC_ARECONNECT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,286,10 - CONTROL "Send messages slower, but with full acknowledgement",IDC_MSGACK, + CONTROL "Send messages slower, but with full acknowledgment",IDC_MSGACK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,62,286,10 CONTROL "Manually specify connection servers' hosts",IDC_MANUALHOST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,286,10 diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 622138c74b..91add0957a 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -796,7 +796,7 @@ public: m_chkDirectManual.OnChange = Callback(this, &CDlgOptAdvanced::chkDirect_OnChange); m_chkProxy.OnChange = Callback(this, &CDlgOptAdvanced::chkProxy_OnChange); - m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Send messages slower, but with full acknowledgement"), m_proto->m_options.MsgAck); + m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Send messages slower, but with full acknowledgment"), m_proto->m_options.MsgAck); m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Enable avatars"), m_proto->m_options.EnableAvatars); m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Log chat state changes"), m_proto->m_options.LogChatstates); m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Log presence subscription state changes"), m_proto->m_options.LogPresence); diff --git a/protocols/SkypeClassic/res/Resource.rc b/protocols/SkypeClassic/res/Resource.rc index dbbc485baf..9cc23c2aa2 100644 --- a/protocols/SkypeClassic/res/Resource.rc +++ b/protocols/SkypeClassic/res/Resource.rc @@ -185,7 +185,7 @@ BEGIN LTEXT "SkypeOut contacts are in status:",IDC_STATIC,10,200,108,8 COMBOBOX IDC_SKYPEOUTSTAT,119,198,79,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Cleanup nicknames",IDC_CLEANUP,220,199,80,14,BS_MULTILINE | WS_GROUP - CONTROL "Do not wait for message SENT acknowledgement (for some buggy Skype versions >6)",IDC_NOACK, + CONTROL "Do not wait for message SENT acknowledgment (for some buggy Skype versions >6)",IDC_NOACK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,182,290,13 END -- cgit v1.2.3