diff options
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/res/jabber.rc | 8 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_form2.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_rc.cpp | 8 |
6 files changed, 13 insertions, 13 deletions
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);
|