From 61ca7956cc035ad6f537953dce9e719c83c43af8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 28 Nov 2014 08:44:03 +0100
Subject: Fix button label: ignore -> Ignore (#1490170)

---
 program/localization/en_CA/labels.inc | 2 +-
 program/localization/en_GB/labels.inc | 2 +-
 program/localization/en_US/labels.inc | 3 ++-
 program/steps/settings/func.inc       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/program/localization/en_CA/labels.inc b/program/localization/en_CA/labels.inc
index b48b2f230..df46a8433 100644
--- a/program/localization/en_CA/labels.inc
+++ b/program/localization/en_CA/labels.inc
@@ -374,7 +374,7 @@ $labels['askuser'] = 'ask me';
 $labels['autosend'] = 'send receipt';
 $labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
 $labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
+$labels['ignore'] = 'Ignore';
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Do not show deleted messages';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 7fc6d8c0b..373b38731 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -406,7 +406,7 @@ $labels['askuser'] = 'ask each time';
 $labels['autosend'] = 'send automatically';
 $labels['autosendknown'] = 'send receipt to my contacts, otherwise ask';
 $labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
+$labels['ignore'] = 'Ignore';
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Do not show deleted messages';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 191e143e0..482c18570 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -256,6 +256,7 @@ $labels['revertto']      = 'Revert to';
 
 $labels['restore'] = 'Restore';
 $labels['restoremessage'] = 'Restore message?';
+$labels['ignore'] = 'Ignore';
 
 $labels['responses'] = 'Responses';
 $labels['insertresponse'] = 'Insert a response';
@@ -463,7 +464,7 @@ $labels['askuser'] = 'ask me';
 $labels['autosend'] = 'send receipt';
 $labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
 $labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
+$labels['ignorerequest'] = 'ignore request';
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Do not show deleted messages';
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 887aebc3b..f700e4f77 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -456,7 +456,7 @@ function rcmail_user_prefs($current = null)
                 $select->add($RCMAIL->gettext('autosend'), 1);
                 $select->add($RCMAIL->gettext('autosendknown'), 3);
                 $select->add($RCMAIL->gettext('autosendknownignore'), 4);
-                $select->add($RCMAIL->gettext('ignore'), 2);
+                $select->add($RCMAIL->gettext('ignorerequest'), 2);
 
                 $blocks['main']['options']['mdn_requests'] = array(
                     'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('mdnrequests'))),
-- 
cgit v1.2.3