summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/Actman/services.ini2
-rw-r--r--plugins/Actman30/services.ini2
-rw-r--r--plugins/Clist_modern/res/resource.rc8
-rw-r--r--plugins/CmdLine/src/mimcmd_data.h2
-rw-r--r--plugins/ListeningTo/res/resource.rc12
-rw-r--r--plugins/MenuItemEx/src/main.cpp4
-rw-r--r--plugins/NewXstatusNotify/src/xstatus.cpp2
-rw-r--r--plugins/NewXstatusNotify/src/xstatus.h2
-rw-r--r--plugins/TipperYM/res/resource.rc2
-rw-r--r--plugins/TipperYM/src/popwin.cpp4
-rw-r--r--plugins/TipperYM/src/preset_items.cpp4
-rw-r--r--plugins/Watrack/status/i_opt_11.inc2
-rw-r--r--plugins/Watrack/status/i_opt_3.inc10
-rw-r--r--plugins/Watrack/status/status.rc12
-rw-r--r--protocols/IcqOscarJ/src/init.cpp2
-rw-r--r--protocols/MRA/src/MraProto.cpp2
16 files changed, 36 insertions, 36 deletions
diff --git a/plugins/Actman/services.ini b/plugins/Actman/services.ini
index 3cf4afd823..fcf82289c6 100644
--- a/plugins/Actman/services.ini
+++ b/plugins/Actman/services.ini
@@ -448,7 +448,7 @@ alias=MS_XSTATUS_SHOWDETAILS
wparam=0|hContact
lparam=0
plugin=ICQ
-descr=Display XStatus detail
+descr=Display xStatus detail
[Event:Actions/Changed]
alias=ME_ACT_CHANGED
diff --git a/plugins/Actman30/services.ini b/plugins/Actman30/services.ini
index ecdd9cd95b..7d0bda9289 100644
--- a/plugins/Actman30/services.ini
+++ b/plugins/Actman30/services.ini
@@ -460,7 +460,7 @@ alias=MS_XSTATUS_SHOWDETAILS
wparam=0|hContact
lparam=0
plugin=ICQ
-descr=Display XStatus detail
+descr=Display xStatus detail
[Event:Actions/Changed]
alias=ME_ACT_CHANGED
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 941a4c7618..0112fec402 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -679,8 +679,8 @@ BEGIN
"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | BS_MULTILINE | WS_TABSTOP,150,76,99,18
CONTROL "Show listening to if there is no status message",IDC_SHOW_LISTENING_IF_NOAWAY,
"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | BS_MULTILINE | WS_TABSTOP,150,94,99,18
- CONTROL "XStatus has priority",IDC_XSTATUS_HAS_PRIORITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,99,12
- CONTROL "Use 'XStatus: XMessage'",IDC_USE_NAME_AND_MESSAGE,
+ CONTROL "xStatus has priority",IDC_XSTATUS_HAS_PRIORITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,99,12
+ CONTROL "Use 'xStatus: xMessage'",IDC_USE_NAME_AND_MESSAGE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,122,99,12
RTEXT "(Variables will be replaced)",IDC_VARIABLES_L,141,136,108,8
END
@@ -708,8 +708,8 @@ BEGIN
"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | BS_MULTILINE | WS_TABSTOP,150,76,99,18
CONTROL "Show listening to if there is no status message",IDC_SHOW_LISTENING_IF_NOAWAY,
"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | BS_MULTILINE | WS_TABSTOP,150,94,99,18
- CONTROL "XStatus has priority",IDC_XSTATUS_HAS_PRIORITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,99,12
- CONTROL "Use 'XStatus: XMessage'",IDC_USE_NAME_AND_MESSAGE,
+ CONTROL "xStatus has priority",IDC_XSTATUS_HAS_PRIORITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,99,12
+ CONTROL "Use 'xStatus: xMessage'",IDC_USE_NAME_AND_MESSAGE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,122,99,12
RTEXT "(Variables will be replaced)",IDC_VARIABLES_L,141,136,108,8
END
diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h
index 713496f7b3..8688351a81 100644
--- a/plugins/CmdLine/src/mimcmd_data.h
+++ b/plugins/CmdLine/src/mimcmd_data.h
@@ -91,7 +91,7 @@ typedef TSharedData *PSharedData;
#define MIMCMD_HELP_STATUS LPGEN("Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.")
#define MIMCMD_HELP_AWAYMSG LPGEN("Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.")
-#define MIMCMD_HELP_XSTATUS LPGEN("Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<XStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.")
+#define MIMCMD_HELP_XSTATUS LPGEN("Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.")
#define MIMCMD_HELP_POPUPS LPGEN("Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.")
#define MIMCMD_HELP_SOUNDS LPGEN("Disables or enables sounds.\nUsage: sounds (disable | enable | toggle).\nThe command will either disable or enable sounds.")
#define MIMCMD_HELP_CLIST LPGEN("Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.")
diff --git a/plugins/ListeningTo/res/resource.rc b/plugins/ListeningTo/res/resource.rc
index d27c9aee20..a4f424ff9e 100644
--- a/plugins/ListeningTo/res/resource.rc
+++ b/plugins/ListeningTo/res/resource.rc
@@ -37,13 +37,13 @@ BEGIN
CONTROL "Video",IDC_ENABLE_VIDEO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,40,52,11
CONTROL "Others",IDC_ENABLE_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,224,40,52,11
LTEXT "You also have to enable it per protocol in the main menu",IDC_STATIC,12,55,262,13
- GROUPBOX "XStatus",IDC_XSTATUS_G,3,74,282,88
- LTEXT "For protocols that don't support listening to but support XStatus:",IDC_XSTATUS_L,12,88,263,11
- CONTROL "Set XStatus to Music and show listening info",IDC_SET_XSTATUS,
+ GROUPBOX "xStatus",IDC_XSTATUS_G,3,74,282,88
+ LTEXT "For protocols that don't support listening to but support xStatus:",IDC_XSTATUS_L,12,88,263,11
+ CONTROL "Set xStatus to Music and show listening info",IDC_SET_XSTATUS,
"Button",BS_AUTORADIOBUTTON,19,101,257,12
- CONTROL "If other XStatus is not set, set XStatus to Music and show listening info",IDC_CHECK_XSTATUS,
+ CONTROL "If other xStatus is not set, set xStatus to Music and show listening info",IDC_CHECK_XSTATUS,
"Button",BS_AUTORADIOBUTTON,19,115,257,12
- CONTROL "If XStatus is Music, show listening info",IDC_CHECK_XSTATUS_MUSIC,
+ CONTROL "If xStatus is Music, show listening info",IDC_CHECK_XSTATUS_MUSIC,
"Button",BS_AUTORADIOBUTTON,19,129,257,12
CONTROL "Do nothing",IDC_IGNORE_XSTATUS,"Button",BS_AUTORADIOBUTTON,19,143,257,12
GROUPBOX "Contacts",IDC_CONTACTS_G,3,166,282,32
@@ -93,7 +93,7 @@ BEGIN
LTEXT "%type% - Media type (Music, Radio, Video, etc.)",IDC_TYPE_L,11,99,265,8
LTEXT "When variable not found, use:",IDC_UNKNOWN_L,11,117,108,10
EDITTEXT IDC_UNKNOWN,122,114,152,13,ES_AUTOHSCROLL
- GROUPBOX "XStatus",IDC_XSTATUS_G,3,137,282,79
+ GROUPBOX "xStatus",IDC_XSTATUS_G,3,137,282,79
LTEXT "Title:",IDC_NAME_L,11,152,55,10
EDITTEXT IDC_XSTATUS_NAME,72,150,202,13,ES_AUTOHSCROLL
LTEXT "Message:",IDC_MESSAGE_L,11,167,55,10
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 7adfafe758..702a585406 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -34,8 +34,8 @@ struct {
}
static const statusMsg[] = {
{ "CList", "StatusMsg", LPGENT("Status message"), 1 },
- { 0, "XStatusName", LPGENT("XStatus title"), 4 },
- { 0, "XStatusMsg", LPGENT("XStatus message"), 2 },
+ { 0, "XStatusName", LPGENT("xStatus title"), 4 },
+ { 0, "XStatusMsg", LPGENT("xStatus message"), 2 },
{ "AdvStatus", "tune/text", LPGENT("Listening to"), 8 },
{ "AdvStatus", "activity/title", LPGENT("Activity title"), 8 },
{ "AdvStatus", "activity/text", LPGENT("Activity text"), 8 }
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 99a941f5c9..113d20a642 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -84,7 +84,7 @@ TCHAR *GetStatusTypeAsString(int type, TCHAR *buff)
case TYPE_JABBER_ACTIVITY:
_tcscpy(buff, TranslateT("Activity")); break;
case TYPE_ICQ_XSTATUS:
- _tcscpy(buff, TranslateT("XStatus")); break;
+ _tcscpy(buff, TranslateT("xStatus")); break;
default:
_tcscpy(buff, TranslateT("<unknown>"));
}
diff --git a/plugins/NewXstatusNotify/src/xstatus.h b/plugins/NewXstatusNotify/src/xstatus.h
index 69b63b18bc..3804b21b04 100644
--- a/plugins/NewXstatusNotify/src/xstatus.h
+++ b/plugins/NewXstatusNotify/src/xstatus.h
@@ -67,7 +67,7 @@
// Variables help text
#define VARIABLES_HELP_TEXT TranslateT("These variables are available:\r\n\r\n\
-%n\textra status name (Xstatus, Mood, Activity)\r\n\
+%n\textra status name (xStatus, Mood, Activity)\r\n\
%t\textra status title\r\n\
%m\textra status message\r\n\
%c\tcustom nickname\r\n\
diff --git a/plugins/TipperYM/res/resource.rc b/plugins/TipperYM/res/resource.rc
index 51c52e03d4..702bf96419 100644
--- a/plugins/TipperYM/res/resource.rc
+++ b/plugins/TipperYM/res/resource.rc
@@ -172,7 +172,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,123,273,10
CONTROL "Disable in invisible status",IDC_CHK_DISABLEINVISIBLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,138,258,10
- CONTROL "Retrieve XStatus details if auto-retrieve is disabled",IDC_CHK_RETRIEVEXSTATUS,
+ CONTROL "Retrieve xStatus details if auto-retrieve is disabled",IDC_CHK_RETRIEVEXSTATUS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,153,273,10
GROUPBOX "Status bar and tray tooltip",IDC_STATIC,7,176,284,46
CONTROL "Limit status messages in status bar and tray tooltips to:",IDC_CHK_LIMITMSG,
diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 2568132110..192a451d0d 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -152,7 +152,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
swzAdvTitle = GetProtoExtraStatusTitle(pwd->clcit.szProto);
if (swzAdvTitle) {
StripBBCodesInPlace(swzAdvTitle);
- AddRow(pwd, TranslateT("XStatus:"), swzAdvTitle, pwd->clcit.szProto, true, false, true);
+ AddRow(pwd, TranslateT("xStatus:"), swzAdvTitle, pwd->clcit.szProto, true, false, true);
}
// xstatus message
@@ -1567,7 +1567,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
swzAdvTitle = GetProtoExtraStatusTitle(pa->szModuleName);
if (swzAdvTitle) {
StripBBCodesInPlace(swzAdvTitle);
- AddRow(pwd, TranslateT("XStatus:"), swzAdvTitle, pa->szModuleName, true, false, false);
+ AddRow(pwd, TranslateT("xStatus:"), swzAdvTitle, pa->szModuleName, true, false, false);
mir_free(swzAdvTitle);
}
diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index 38ac8e1be2..ba5f179f4d 100644
--- a/plugins/TipperYM/src/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
@@ -40,8 +40,8 @@ PRESETITEM presetItems[] =
"status", LPGENT("Status"), LPGENT("Status:"), _T("%Status%"), "status", 0, 0,
"statusmsg", LPGENT("Status message"), LPGENT("Status message:"), _T("%sys:status_msg%"), 0, 0, 0,
"time", LPGENT("Contact time"), LPGENT("Time:"), _T("%sys:time%"), 0, 0, 0,
- "xtitle", LPGENT("XStatus title"), LPGENT("XStatus title:"), _T("%xsname%"), "xname", 0, 0,
- "xtext", LPGENT("XStatus text"), LPGENT("XStatus text:"), _T("%raw:/XStatusMsg%"), 0, 0, 0,
+ "xtitle", LPGENT("xStatus title"), LPGENT("xStatus title:"), _T("%xsname%"), "xname", 0, 0,
+ "xtext", LPGENT("xStatus text"), LPGENT("xStatus text:"), _T("%raw:/XStatusMsg%"), 0, 0, 0,
"acttitle", LPGENT("[jabber.dll] Activity title"), LPGENT("Activity title:"), _T("%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%"), 0, 0, 0,
"acttext", LPGENT("[jabber.dll] Activity text"), LPGENT("Activity text:"), _T("%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%"), 0, 0, 0,
"lastseentime", LPGENT("[seenplugin.dll] Last seen time"), LPGENT("Last seen time:"), _T("%lastseen_date% @ %lastseen_time%"), "lsdate", "lstime", 0,
diff --git a/plugins/Watrack/status/i_opt_11.inc b/plugins/Watrack/status/i_opt_11.inc
index 9cf8cd778d..2bb1546015 100644
--- a/plugins/Watrack/status/i_opt_11.inc
+++ b/plugins/Watrack/status/i_opt_11.inc
@@ -243,7 +243,7 @@ begin
SendMessage(wnd,CB_RESETCONTENT,0,0);
CB_AddStrDataW(wnd,TranslateW('Status'),0);
- if IsXStatusSupported(uint_ptr(proto)) then CB_AddStrDataW(wnd,TranslateW('XStatus'),1);
+ if IsXStatusSupported(uint_ptr(proto)) then CB_AddStrDataW(wnd,TranslateW('xStatus'),1);
if IsTunesSupported (uint_ptr(proto)) then CB_AddStrDataW(wnd,TranslateW('Tunes' ),2);
SendMessage(wnd,CB_SETCURSEL,0,0);
diff --git a/plugins/Watrack/status/i_opt_3.inc b/plugins/Watrack/status/i_opt_3.inc
index 7a77ab549d..db74cf8b01 100644
--- a/plugins/Watrack/status/i_opt_3.inc
+++ b/plugins/Watrack/status/i_opt_3.inc
@@ -19,7 +19,7 @@ begin
'changed next time.');
CheckDlgButton(Dialog,IDC_SIMPLEMODE,SimpleMode);
MakeHint(Dialog,IDC_INDEPENDED,
- 'If this option is "ON", XStatus doesn''t depend on protocol status.');
+ 'If this option is "ON", xStatus doesn''t depend on protocol status.');
CheckDlgButton(Dialog,IDC_INDEPENDED,XIndepended);
MakeHint(Dialog,IDC_USESTATUS,
'If this option is "ON", status text will be replaced by music info.');
@@ -29,13 +29,13 @@ begin
'message window pressing hotkey.');
CheckDlgButton(Dialog,IDC_USEMSGS,UseMessages);
MakeHint(Dialog,IDC_KEEPSTATUS,
- 'If this option is "ON", XStatus won''t be changed when player is shut down.');
+ 'If this option is "ON", xStatus won''t be changed when player is shut down.');
CheckDlgButton(Dialog,IDC_KEEPSTATUS,KeepStatus);
MakeHint(Dialog,IDC_CLEARXSTAT,
'xStatus will be cleared before text changing and restored with new text later.');
CheckDlgButton(Dialog,IDC_CLEARXSTAT,ClearXStat);
MakeHint(Dialog,IDC_EXTSTATUS,
- 'If this option is "ON", XStatus will be changed to "Music" and '+
+ 'If this option is "ON", xStatus will be changed to "Music" and '+
'status text will be replaced by music info.');
CheckDlgButton(Dialog,IDC_EXTSTATUS ,UseExtStatus);
MakeHint(Dialog,IDC_LISTENINGTO,
@@ -45,9 +45,9 @@ begin
wnd:=GetDlgItem(Dialog,IDC_SETXSTATUS);
// SendMessage(wnd,CB_RESETCONTENT,0,0);
- CB_AddStrDataW(wnd,TranslateW('any XStatus is set' ),0,0);
+ CB_AddStrDataW(wnd,TranslateW('any xStatus is set' ),0,0);
CB_AddStrDataW(wnd,TranslateW('''Music'' status is set' ),1,1);
- CB_AddStrDataW(wnd,TranslateW('XStatus is empty or ''Music'''),2,2);
+ CB_AddStrDataW(wnd,TranslateW('xStatus is empty or ''Music'''),2,2);
CB_SelectData(wnd,XStatusSet);
SendMessage(Dialog,WM_COMMAND,(BN_CLICKED shl 16)+IDC_EXTSTATUS,
diff --git a/plugins/Watrack/status/status.rc b/plugins/Watrack/status/status.rc
index 867d26b566..3b95cd8913 100644
--- a/plugins/Watrack/status/status.rc
+++ b/plugins/Watrack/status/status.rc
@@ -14,13 +14,13 @@ FONT 8, "MS Shell Dlg", 0, 0
AUTOCHECKBOX "Use status messages" , IDC_USESTATUS , 6, 50, 182, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
AUTOCHECKBOX "Use listening info" , IDC_LISTENINGTO, 6, 66, 182, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
- AUTOCHECKBOX "Use XStatus" , IDC_EXTSTATUS , 6, 86, 182, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
+ AUTOCHECKBOX "Use xStatus" , IDC_EXTSTATUS , 6, 86, 182, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
AUTOCHECKBOX "Independent xStatus" , IDC_INDEPENDED, 14, 102, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
AUTOCHECKBOX "Clear xStatus before set new one" , IDC_CLEARXSTAT, 14, 118, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
- AUTOCHECKBOX "Keep 'Music' XStatus" , IDC_KEEPSTATUS, 14, 134, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
-// AUTOCHECKBOX "Use existing XStatus" , IDC_OLDXSTATUS, 14, 134, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
+ AUTOCHECKBOX "Keep 'Music' xStatus" , IDC_KEEPSTATUS, 14, 134, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
+// AUTOCHECKBOX "Use existing xStatus" , IDC_OLDXSTATUS, 14, 134, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
// AUTOCHECKBOX "Only if 'Music' status was set", IDC_ONLYMUSIC , 14, 150, 174, 14, BS_VCENTER | BS_MULTILINE// | BS_NOTIFY
- LTEXT "Set XStatus when...", -1, 14, 150, 174, 14
+ LTEXT "Set xStatus when...", -1, 14, 150, 174, 14
COMBOBOX IDC_SETXSTATUS, 14, 166, 174, 96, CBS_DROPDOWNLIST | WS_VSCROLL
}
@@ -49,7 +49,7 @@ FONT 8, "MS Shell Dlg", 0, 0
EDITTEXT IDC_EDIT_CHANNEL, 6, 116, 290, 44, ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
AUTOCHECKBOX "Enable Status message" , IDC_STAT_ENABLE , 6, 161, 174, 12, BS_VCENTER | BS_MULTILINE
- AUTOCHECKBOX "Enable XStatus message", IDC_XSTAT_ENABLE, 6, 161, 174, 12, BS_VCENTER | BS_MULTILINE
+ AUTOCHECKBOX "Enable xStatus message", IDC_XSTAT_ENABLE, 6, 161, 174, 12, BS_VCENTER | BS_MULTILINE
AUTOCHECKBOX "Enable Tunes message" , IDC_TUNES_ENABLE, 6, 161, 174, 12, BS_VCENTER | BS_MULTILINE
COMBOBOX IDC_CBSTATYPE,196,161,100,56,CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
EDITTEXT IDC_STATUS_TEXT , 6, 175, 290, 45, ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
@@ -82,7 +82,7 @@ FONT 8, "MS Shell Dlg", 0, 0
CTEXT "Chat Template", -1, 6, 102, 290, 10
EDITTEXT IDC_EDIT_CHANNEL, 6, 112, 290, 48, ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- CTEXT "[X]Status Title / Text", -1, 6, 165, 290, 10
+ CTEXT "[x]Status Title / Text", -1, 6, 165, 290, 10
EDITTEXT IDC_XSTATUS_TITLE, 6, 175, 290, 14, ES_AUTOHSCROLL
EDITTEXT IDC_STATUS_TEXT , 6, 192, 290, 28, ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
}
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 20f3da0c97..f021d6ee6c 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -115,7 +115,7 @@ extern "C" int __declspec(dllexport) Load(void)
HookEvent(ME_SYSTEM_MODULELOAD, ModuleLoad);
HookEvent(ME_SYSTEM_MODULEUNLOAD, ModuleLoad);
- hExtraXStatus = ExtraIcon_Register("xstatus", LPGEN("ICQ XStatus"), "icq_xstatus13");
+ hExtraXStatus = ExtraIcon_Register("xstatus", LPGEN("ICQ xStatus"), "icq_xstatus13");
g_MenuInit();
return 0;
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 1733019ddc..53b9006494 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -54,7 +54,7 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu);
- hExtraXstatusIcon = ExtraIcon_Register("MRAXstatus", LPGEN("Mail.ru Xstatus"), "mra_xstatus25");
+ hExtraXstatusIcon = ExtraIcon_Register("MRAXstatus", LPGEN("Mail.ru xStatus"), "mra_xstatus25");
hExtraInfo = ExtraIcon_Register("MRAStatus", LPGEN("Mail.ru extra info"), MRA_XSTATUS_UNKNOWN_STR);
bHideXStatusUI = FALSE;