summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Clist_modern/res/resource.rc2
-rw-r--r--plugins/StartupSilence/res/StartupSilence.rc2
-rw-r--r--plugins/TabSRMM/res/chat.rc2
-rw-r--r--plugins/TabSRMM/src/msgs.h2
-rw-r--r--plugins/UserInfoEx/res/resource.rc2
-rw-r--r--protocols/IRCG/res/IRC.rc2
-rw-r--r--protocols/JabberG/res/jabber.rc8
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp2
-rw-r--r--protocols/JabberG/src/jabber_form2.cpp2
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp4
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp2
-rw-r--r--protocols/JabberG/src/jabber_rc.cpp8
-rw-r--r--protocols/SkypeClassic/src/contacts.cpp2
13 files changed, 20 insertions, 20 deletions
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 6399744f98..035e850da0 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -530,7 +530,7 @@ BEGIN
LTEXT "Subcontacts indent:",IDC_SUBIDENTCAPT,26,164,126,10
CONTROL "Remove status message if contact became offline",IDC_REMOVE_OFFLINE_AWAYMSG,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,50,201,10
- CONTROL "Use improved search method in contactlist",IDC_FILTER_SEARCH,
+ CONTROL "Use improved search method in contact list",IDC_FILTER_SEARCH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,62,201,10
END
diff --git a/plugins/StartupSilence/res/StartupSilence.rc b/plugins/StartupSilence/res/StartupSilence.rc
index 693450c42b..2d384ff124 100644
--- a/plugins/StartupSilence/res/StartupSilence.rc
+++ b/plugins/StartupSilence/res/StartupSilence.rc
@@ -47,7 +47,7 @@ BEGIN
CTEXT "You need to configure it once for each computer, where you run your Miranda NG.",IDC_STATIC,7,195,295,20
LTEXT "No Apply button required.",IDC_STATIC,11,220,184,8
GROUPBOX "After startup set:",IDC_STATIC,3,136,303,57
- CONTROL "Filtered popups only (leave uncheck to no popups)",IDC_DEFPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,167,274,9
+ CONTROL "Filtered popups only (leave uncheck for no popups)",IDC_DEFPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,167,274,9
CONTROL "Enable sounds",IDC_DEFSOUNDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,181,287,9
CONTROL "Allow to set sounds and filtered popups only after startup (uncheck for all popups and sounds)",IDC_RESTORE,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,147,290,19
CONTROL "Allow mRadio or Weather popups, etc...",IDC_NONSTATUSES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,118,259,9
diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 3d269581b1..39e007e9e8 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -129,7 +129,7 @@ BEGIN
LTEXT "Maximum number of events in the message window",IDC_STATIC,10,142,225,11
EDITTEXT IDC_LOGLIMIT,248,139,38,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,281,138,11,14
- LTEXT "Groupchat userlist row height (pixels)",IDC_STATIC_ULIST,10,167,221,8
+ LTEXT "Group chat userlist row height (pixels)",IDC_STATIC_ULIST,10,167,221,8
EDITTEXT IDC_NICKROW2,247,164,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,167,11,14
PUSHBUTTON "Open log file base folder",IDC_MUC_OPENLOGBASEDIR,16,76,155,14
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 36a06aa8eb..bf2af3e24d 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -997,7 +997,7 @@ typedef struct {
#define TABSRMM_HK_SECTION_IM LPGEN("Message windows - IM")
#define TABSRMM_HK_SECTION_GENERIC LPGEN("Message windows - all")
-#define TABSRMM_HK_SECTION_GC LPGEN("Message windows - groupchats")
+#define TABSRMM_HK_SECTION_GC LPGEN("Message windows - group chats")
/*
* encryption status bar indicator
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index 90af7a75e7..fa7f4d1b2d 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -99,7 +99,7 @@ BEGIN
CONTROL "Country:",IDC_STATIC,"Static",SS_SIMPLE,9,57,54,8,WS_EX_RIGHT
COMBOBOX EDIT_COUNTRY,67,55,110,122,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
ICON "",ICO_ADDRESS,5,6,20,20,SS_REALSIZEIMAGE
- CONTROL "Contact added to ContactList:",IDC_STATIC,"Static",SS_SIMPLE,30,106,115,8,WS_EX_RIGHT
+ CONTROL "Contact added to contact list:",IDC_STATIC,"Static",SS_SIMPLE,30,106,115,8,WS_EX_RIGHT
CONTROL "Just from the beginning.",TXT_DATEADDED,"Static",SS_SIMPLE,152,106,146,8
ICON "",ICO_COUNTRY,180,56,21,20,SS_REALSIZEIMAGE
ICON "",ICO_CLOCK,8,102,20,20
diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc
index d55a004aad..64081b3469 100644
--- a/protocols/IRCG/res/IRC.rc
+++ b/protocols/IRCG/res/IRC.rc
@@ -405,7 +405,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,200,256,10
GROUPBOX "Ignore users",-1,8,6,289,150
GROUPBOX "Other",-1,8,156,289,62
- CONTROL "(*) Queries from users on your contactlist are never ignored",IDC_CUSTOM,
+ CONTROL "(*) Queries from users on your contact list are never ignored",IDC_CUSTOM,
"Hyperlink",WS_TABSTOP | 0x1,16,142,274,9
END
diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index e0b4597292..abea1fbb15 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -417,7 +417,7 @@ END
IDD_GROUPCHAT_JOIN DIALOGEX 0, 0, 258, 211
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
-CAPTION "Create or Join Groupchat"
+CAPTION "Create or Join group chat"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Jabber Multi-User Conference\nCreate or join existing conference room.",IDC_HEADERBAR,
@@ -469,7 +469,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER |
CAPTION "Invite Users"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "<room jid>\nSend groupchat invitation.",IDC_HEADERBAR,
+ CONTROL "<room jid>\nSend group chat invitation.",IDC_HEADERBAR,
"MHeaderbarCtrl",0x0,0,0,215,25
CONTROL "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x1,7,40,201,116,WS_EX_CLIENTEDGE
LTEXT "Other JID:",IDC_STATIC,7,162,46,8
@@ -484,10 +484,10 @@ END
IDD_GROUPCHAT_INVITE_ACCEPT DIALOGEX 0, 0, 216, 174
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Groupchat Invitation"
+CAPTION "Group chat invitation"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "<room jid>\nIncoming groupchat invitation.",IDC_HEADERBAR,
+ CONTROL "<room jid>\nIncoming group chat invitation.",IDC_HEADERBAR,
"MHeaderbarCtrl",0x0,0,0,216,25
LTEXT "You are invited to conference room by",IDC_STATIC,7,40,202,8
EDITTEXT IDC_FROM,17,51,192,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index a476fb137e..4ac1cf5967 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -748,7 +748,7 @@ public:
CSuper::OnInitDialog();
TCHAR buf[256];
- mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nSend groupchat invitation."), m_room);
+ mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nSend group chat invitation."), m_room);
SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf);
WindowSetIcon(m_hwnd, m_proto, "group");
diff --git a/protocols/JabberG/src/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp
index a8d62506a3..72766f4efa 100644
--- a/protocols/JabberG/src/jabber_form2.cpp
+++ b/protocols/JabberG/src/jabber_form2.cpp
@@ -194,7 +194,7 @@ namespace NSJabberRegistry
{ _T("auto-offline"), JDFT_BOOLEAN, LPGENT("Whether to automatically go offline when idle") },
{ _T("sounds"), JDFT_BOOLEAN, LPGENT("Whether to play sounds") },
{ _T("files"), JDFT_LIST_MULTI, LPGENT("A list of pending file transfers") },
- { _T("groupchats"), JDFT_LIST_MULTI, LPGENT("A list of joined groupchat rooms") },
+ { _T("groupchats"), JDFT_LIST_MULTI, LPGENT("A list of joined group chat rooms") },
{ _T("status"), JDFT_LIST_SINGLE, LPGENT("A presence or availability status") },
{ _T("status-message"), JDFT_TEXT_MULTI, LPGENT("The status message text") },
{ _T("status-priority"), JDFT_TEXT_SINGLE, LPGENT("The new priority for the client") },
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 77ad82e833..04a2debf41 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -642,7 +642,7 @@ INT_PTR CJabberDlgGcJoin::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
{
sttRoomListAppend(GetDlgItem(m_hwnd, IDC_ROOM), RoomInfo::ROOM_FAIL,
TranslateT("Jabber Error"),
- TranslateT("Please specify groupchat directory first."),
+ TranslateT("Please specify group chat directory first."),
_T(""));
}
}
@@ -1196,7 +1196,7 @@ public:
CSuper::OnInitDialog();
TCHAR buf[256];
- mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nIncoming groupchat invitation."), m_info->roomJid);
+ mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nIncoming group chat invitation."), m_info->roomJid);
SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf);
SetDlgItemText(m_hwnd, IDC_FROM, m_info->from);
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index ed2ade7d7e..e409f419b2 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -684,7 +684,7 @@ void CJabberProto::MenuInit()
CreateProtoService("/Groupchat", &CJabberProto::OnMenuHandleJoinGroupchat);
strcpy(tDest, "/Groupchat");
- mi.pszName = LPGEN("Create/Join groupchat");
+ mi.pszName = LPGEN("Create/Join group chat");
mi.position = 2000050006;
mi.icolibItem = GetIconHandle(IDI_GROUP);
m_hMenuGroupchat = Menu_AddProtoMenuItem(&mi);
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index a32bb457ed..b5cf36b79e 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -221,7 +221,7 @@ BOOL CJabberAdhocManager::FillDefaultNodes()
AddNode(NULL, JABBER_FEAT_RC_SET_STATUS, TranslateT("Set status"), &CJabberProto::AdhocSetStatusHandler);
AddNode(NULL, JABBER_FEAT_RC_SET_OPTIONS, TranslateT("Set options"), &CJabberProto::AdhocOptionsHandler);
AddNode(NULL, JABBER_FEAT_RC_FORWARD, TranslateT("Forward unread messages"), &CJabberProto::AdhocForwardHandler);
- AddNode(NULL, JABBER_FEAT_RC_LEAVE_GROUPCHATS, TranslateT("Leave groupchats"), &CJabberProto::AdhocLeaveGroupchatsHandler);
+ AddNode(NULL, JABBER_FEAT_RC_LEAVE_GROUPCHATS, TranslateT("Leave group chats"), &CJabberProto::AdhocLeaveGroupchatsHandler);
AddNode(NULL, JABBER_FEAT_RC_WS_LOCK, TranslateT("Lock workstation"), &CJabberProto::AdhocLockWSHandler);
AddNode(NULL, JABBER_FEAT_RC_QUIT_MIRANDA, TranslateT("Quit Miranda NG"), &CJabberProto::AdhocQuitMirandaHandler);
return TRUE;
@@ -710,7 +710,7 @@ int CJabberProto::AdhocLeaveGroupchatsHandler(HXML, CJabberIqInfo *pInfo, CJabbe
if ( !nChatsCount) {
TCHAR szMsg[ 1024 ];
- mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("There is no groupchats to leave"));
+ mir_sntprintf(szMsg, SIZEOF(szMsg), TranslateT("There is no group chats to leave"));
m_ThreadInfo->send(
XmlNodeIq(_T("result"), pInfo)
@@ -729,8 +729,8 @@ int CJabberProto::AdhocLeaveGroupchatsHandler(HXML, CJabberIqInfo *pInfo, CJabbe
<< XATTR(_T("sessionid"), pSession->GetSessionId()) << XATTR(_T("status"), _T("executing"))
<< XCHILDNS(_T("x"), JABBER_FEAT_DATA_FORMS) << XATTR(_T("type"), _T("form"));
- xNode << XCHILD(_T("title"), TranslateT("Leave groupchats"));
- xNode << XCHILD(_T("instructions"), TranslateT("Choose the groupchats you want to leave"));
+ xNode << XCHILD(_T("title"), TranslateT("Leave group chats"));
+ xNode << XCHILD(_T("instructions"), TranslateT("Choose the group chats you want to leave"));
xNode << XCHILD(_T("field")) << XATTR(_T("type"), _T("hidden")) << XATTR(_T("var"), _T("FORM_TYPE"))
<< XATTR(_T("value"), JABBER_FEAT_RC);
diff --git a/protocols/SkypeClassic/src/contacts.cpp b/protocols/SkypeClassic/src/contacts.cpp
index 8e25ae7c9d..ead7b9ffc8 100644
--- a/protocols/SkypeClassic/src/contacts.cpp
+++ b/protocols/SkypeClassic/src/contacts.cpp
@@ -145,7 +145,7 @@ CLISTMENUITEM ChatInitItem(void) {
mi.position=-2000020000;
mi.flags=CMIF_HIDDEN|CMIF_NOTOFFLINE|CMIF_TCHAR;
mi.hIcon=LoadIcon( hInst, MAKEINTRESOURCE( IDI_INVITE ));
- mi.ptszName=LPGENT("&Open groupchat");
+ mi.ptszName=LPGENT("&Open group chat");
mi.pszContactOwner=SKYPE_PROTONAME;
mi.pszService=SKYPE_CHATNEW;
return mi;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:16:19 +0000