Fix wording of "Mark previewed messages as read" to "Mark messages as…

… read" (#5952) Since we use the option not only for the preview frame the "previewed" word was confusing.
roundcube · Sep 17, 2017 · cd8b91f · cd8b91f
1 parent 6dfa7ff
commit cd8b91f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
 - Fix so files size/count limit is verified (client-side) also on drag-n-drop uploads (#5940)
 - Fix invalid template loading on a message error in preview frame (#5941)
 - Fix bug where HTML messages could have been rendered empty on some systems (#5957)
+- Fix wording of "Mark previewed messages as read" to "Mark messages as read" (#5952)
 
 RELEASE 1.3.1
 -------------

diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
@@ -541,7 +541,7 @@ $labels['replyandforwardonly'] = 'replies and forwards only';
 $labels['insertsignature'] = 'Insert signature';
 $labels['sigbelow'] = 'Place signature below the quoted message';
 $labels['sigseparator'] = 'Force standard separator in signatures';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['automarkread']  = 'Mark messages as read';
 $labels['afternseconds']  = 'after $n seconds';
 $labels['reqmdn'] = 'Always request a return receipt';
 $labels['reqdsn'] = 'Always request a delivery status notification';

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
@@ -449,7 +449,7 @@ function rcmail_user_prefs($current = null)
                 }
 
                 $blocks['main']['options']['mail_read_time'] = array(
-                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('previewpanemarkread'))),
+                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('automarkread'))),
                     'content' => $select->show($config['mail_read_time']),
                 );
             }