| 1 | Index: roundcubemail/program/localization/en_GB/labels.inc |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- roundcubemail/program/localization/en_GB/labels.inc (revision 2503) |
|---|
| 4 | +++ roundcubemail/program/localization/en_GB/labels.inc (working copy) |
|---|
| 5 | @@ -233,8 +233,7 @@ |
|---|
| 6 | $labels['always'] = 'always'; |
|---|
| 7 | $labels['showinlineimages'] = 'Display attached images below the message'; |
|---|
| 8 | $labels['autosavedraft'] = 'Automatically save draft'; |
|---|
| 9 | -$labels['everynminutes'] = 'every $n minutes'; |
|---|
| 10 | -$labels['keepaliveevery'] = 'every $n minute(s)'; |
|---|
| 11 | +$labels['everynminutes'] = 'every $n minute(s)'; |
|---|
| 12 | $labels['keepalive'] = 'Check for new messages on'; |
|---|
| 13 | $labels['never'] = 'never'; |
|---|
| 14 | $labels['messagesdisplaying'] = 'Displaying Messages'; |
|---|
| 15 | Index: roundcubemail/program/localization/en_US/labels.inc |
|---|
| 16 | =================================================================== |
|---|
| 17 | --- roundcubemail/program/localization/en_US/labels.inc (revision 2503) |
|---|
| 18 | +++ roundcubemail/program/localization/en_US/labels.inc (working copy) |
|---|
| 19 | @@ -288,8 +288,7 @@ |
|---|
| 20 | $labels['always'] = 'always'; |
|---|
| 21 | $labels['showinlineimages'] = 'Display attached images below the message'; |
|---|
| 22 | $labels['autosavedraft'] = 'Automatically save draft'; |
|---|
| 23 | -$labels['everynminutes'] = 'every $n minutes'; |
|---|
| 24 | -$labels['keepaliveevery'] = 'every $n minute(s)'; |
|---|
| 25 | +$labels['everynminutes'] = 'every $n minute(s)'; |
|---|
| 26 | $labels['keepalive'] = 'Check for new messages on'; |
|---|
| 27 | $labels['never'] = 'never'; |
|---|
| 28 | $labels['messagesdisplaying'] = 'Displaying Messages'; |
|---|
| 29 | Index: roundcubemail/program/steps/settings/func.inc |
|---|
| 30 | =================================================================== |
|---|
| 31 | --- roundcubemail/program/steps/settings/func.inc (revision 2503) |
|---|
| 32 | +++ roundcubemail/program/steps/settings/func.inc (working copy) |
|---|
| 33 | @@ -204,7 +204,7 @@ |
|---|
| 34 | foreach(array(1, 3, 5, 10, 15, 30, 60) as $min) |
|---|
| 35 | if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60) |
|---|
| 36 | && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) { |
|---|
| 37 | - $select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min); |
|---|
| 38 | + $select_keep_alive->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min); |
|---|
| 39 | } |
|---|
| 40 | |
|---|
| 41 | $table->add('title', html::label($field_id, Q(rcube_label('keepalive')))); |
|---|
| 42 | @@ -282,7 +282,7 @@ |
|---|
| 43 | $field_id = 'rcmfd_autosave'; |
|---|
| 44 | $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox']))); |
|---|
| 45 | $select_autosave->add(rcube_label('never'), 0); |
|---|
| 46 | - foreach (array(3, 5, 10) as $i => $min) |
|---|
| 47 | + foreach (array(1, 3, 5, 10) as $i => $min) |
|---|
| 48 | $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60); |
|---|
| 49 | |
|---|
| 50 | $table->add('title', html::label($field_id, Q(rcube_label('autosavedraft')))); |
|---|
