From 18a381e82a1fb4df42659c53d1b7b1804688049a Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Tue, 5 Aug 2014 14:11:12 +0000 Subject: 'xStatus' correction git-svn-id: http://svn.miranda-ng.org/main/trunk@10071 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Watrack/status/i_opt_11.inc | 2 +- plugins/Watrack/status/i_opt_3.inc | 10 +++++----- plugins/Watrack/status/status.rc | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/Watrack') 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 } -- cgit v1.2.3