diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
| commit | 2a877dcf06389fdc1dcd65e9c56562eb3a0787f0 (patch) | |
| tree | 89d311474a357955269c975ccbc5a6abf8b2b1a9 /plugins/StatusPlugins/resource.rc | |
| parent | 072bfe7969fded36f765cc14185879ccbc90c8b6 (diff) | |
| parent | 38e45092ed0f39dd347e33833f74fafd51d94597 (diff) | |
Merge remote-tracking branch 'origin/master' into jabber_test
Conflicts:
protocols/JabberG/src/jabber_util.cpp
Diffstat (limited to 'plugins/StatusPlugins/resource.rc')
| -rw-r--r-- | plugins/StatusPlugins/resource.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc index 360fb2b7c1..5553c4dbf6 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/plugins/StatusPlugins/resource.rc @@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
CONTROL "Check connection",IDC_CHECKCONNECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,51,162,10
EDITTEXT IDC_MAXRETRIES,21,70,22,14,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "Max. retries",IDC_STATIC,47,73,129,14
+ LTEXT "Maximum retries (0 - infinite)",IDC_STATIC,47,73,129,14
GROUPBOX "Account connection",IDC_STATIC,3,32,286,116
EDITTEXT IDC_INITDELAY,21,92,22,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Delay between retries (secs)",IDC_STATIC,47,95,130,17
|