From 4797057a072a23dd836fb968687884e64235b3de Mon Sep 17 00:00:00 2001
From: Antoine Sirinelli <antoine@monte-stello.com>
Date: Mon, 23 Oct 2017 22:45:51 +0200
Subject: [PATCH] Remove the duplicate string definitions (english)

The following strings were defined twice in lang.en.php.
The first occurence has been removed to avoid confusion (and bugs from
translation tools):

- $lang['danger']['whitelist_from_invalid']
- $lang['success']['aliasd_modified']
- $lang['user']['spamfilter_default_score']
- $lang['edit']['save']
- $lang['tfa']['totp']
- $lang['admin']['sr']
- $lang['admin']['save']
---
 data/web/lang/lang.en.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index aa41d1b0..c1d8bfbd 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -23,7 +23,6 @@ $lang['danger']['dkim_key_length_invalid'] = "DKIM key length invalid";
 $lang['success']['dkim_removed'] = "DKIM key %s has been removed";
 $lang['success']['dkim_added'] = "DKIM key has been saved";
 $lang['danger']['access_denied'] = "Access denied or invalid form data";
-$lang['danger']['whitelist_from_invalid'] = "Whitelist entry invalid";
 $lang['danger']['domain_invalid'] = "Domain name is invalid";
 $lang['danger']['mailbox_quota_exceeds_domain_quota'] = "Max. quota exceeds domain quota limit";
 $lang['danger']['object_is_not_numeric'] = "Value %s is not numeric";
@@ -47,7 +46,6 @@ $lang['danger']['aliasd_targetd_identical'] = "Alias domain must not be equal to
 $lang['danger']['maxquota_empty'] = 'Max. quota per mailbox must not be 0.';
 $lang['success']['alias_added'] = "Alias address/es has/have been added";
 $lang['success']['alias_modified'] = "Changes to alias/es %s have been saved";
-$lang['success']['aliasd_modified'] = "Changes to alias domain have been saved";
 $lang['success']['mailbox_modified'] = "Changes to mailbox %s have been saved";
 $lang['success']['resource_modified'] = "Changes to mailbox %s have been saved";
 $lang['success']['object_modified'] = "Changes to object %s have been saved";
@@ -150,7 +148,6 @@ $lang['user']['spamfilter_table_action'] = 'Action';
 $lang['user']['spamfilter_table_empty'] = 'No data to display';
 $lang['user']['spamfilter_table_remove'] = 'remove';
 $lang['user']['spamfilter_table_add'] = 'Add item';
-$lang['user']['spamfilter_default_score'] = 'Spam score:';
 $lang['user']['spamfilter_green'] = 'Green: this message is not spam';
 $lang['user']['spamfilter_yellow'] = 'Yellow: this message may be spam, will be tagged as spam and moved to your junk folder';
 $lang['user']['spamfilter_red'] = 'Red: This message is spam and will be rejected by the server';
@@ -288,7 +285,6 @@ $lang['delete']['remove_button'] = 'Remove';
 $lang['delete']['previous'] = 'Previous page';
 
 $lang['edit']['syncjob'] = 'Edit sync job';
-$lang['edit']['save'] = 'Save changes';
 $lang['edit']['username'] = 'Username';
 $lang['edit']['hostname'] = 'Hostname';
 $lang['edit']['encryption'] = 'Encryption';
@@ -414,7 +410,6 @@ $lang['tfa']['key_id_totp'] = "An identifier for your key";
 $lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an API key for your key <a href="https://upgrade.yubico.com/getapikey/" target="_blank">here</a>';
 $lang['tfa']['u2f'] = "U2F authentication";
 $lang['tfa']['hotp'] = "HOTP authentication";
-$lang['tfa']['totp'] = "TOTP authentication";
 $lang['tfa']['none'] = "Deactivate";
 $lang['tfa']['delete_tfa'] = "Disable TFA";
 $lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
@@ -441,7 +436,6 @@ $lang['admin']['f2b_whitelist'] = 'Whitelisted networks/hosts';
 $lang['admin']['search_domain_da'] = 'Search domains';
 $lang['admin']['restrictions'] = 'Postfix Restrictions';
 $lang['admin']['rr'] = 'Postfix Recipient Restrictions';
-$lang['admin']['sr'] = 'Postfix Sender Restrictions';
 $lang['admin']['reset_defaults'] = 'Reset to defaults';
 $lang['admin']['sr'] = 'Postfix Sender Restrictions';
 $lang['admin']['r_inactive'] = 'Inactive restrictions';
@@ -470,7 +464,6 @@ $lang['admin']['sender_acl'] = 'Allow to send as:';
 $lang['admin']['msg_size'] = 'Message size';
 $lang['admin']['msg_size_limit'] = 'Message size limit now';
 $lang['admin']['msg_size_limit_details'] = 'Applying a new limit will reload Postfix and the webserver.';
-$lang['admin']['save'] = 'Save changes';
 $lang['admin']['maintenance'] = 'Maintenance and Information';
 $lang['admin']['sys_info'] = 'System information';
 $lang['admin']['dkim_add_key'] = 'Add ARC/DKIM key';