diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-19 14:10:37 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-19 14:10:37 +0300 |
| commit | e7ca07ff3871bb91337f50adce8274f0eee43f26 (patch) | |
| tree | 797ccbadd7699905e8fac8a5c0fbe1ed07a185a3 /src/core | |
| parent | 12c0a01bc1826949fa9e146b668a400cab679a63 (diff) | |
merge with master till
fixes #1368 (Hide dbx_mmap from profile manager)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdmsg/res/resource.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index 9acdd24f88..78770d7b6a 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -61,7 +61,7 @@ BEGIN CONTROL "Send message on double 'Enter'",IDC_SENDONDBLENTER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,148,166,149,10
CONTROL "Send message on 'Enter'",IDC_SENDONENTER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,148,179,152,10
- CONTROL "Send message on 'Ctrl-Enter'",IDC_SENDONCTRLENTER, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,148,192,152,10
+ CONTROL "Send message on 'Ctrl+Enter'",IDC_SENDONCTRLENTER, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,148,192,152,10
LTEXT "Show warning when message has not been received after",IDC_STATIC,8,208,211,8
EDITTEXT IDC_SECONDS,223,206,25,12,ES_AUTOHSCROLL
|