tree wide s/e-mail/email/ fixup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/html-pmg/extract2-rulesystem.htm b/html-pmg/extract2-rulesystem.htm
index 9b3cd21ceba668c007abe91e8b53a7dbe194881e..5a4139422b4473e2b9810a1de036babe0e2a9c36 100644 (file)
--- a/html-pmg/extract2-rulesystem.htm
+++ b/html-pmg/extract2-rulesystem.htm
@@ -35,7 +35,7 @@
          <td valign="top"><img src="plus.png"></td>
          <td valign="top">
            <b>Who-objects</b><br>
-           The action of a rule will only be triggered if the e-mail contains the defined who-object.
+           The action of a rule will only be triggered if the email contains the defined who-object.
            <br><br>
          </td>
        </tr>
@@ -43,7 +43,7 @@
        <tr>
          <td valign="top"><img src="plus.png"></td>
          <td valign="top"><b>What-objects</b><br>
-           A what-object defines what will happen to an e-mail with a specific content.
+           A what-object defines what will happen to an email with a specific content.
            <br><br>
          </td>
        </tr> </tr>

diff --git a/html-pmg/extract3-spam.htm b/html-pmg/extract3-spam.htm
index 63e0d2fcc057b8e2156040f7f782a81efbcbda2f..6b3551a3049c11e89c15a499418bee066c5a1047 100644 (file)
--- a/html-pmg/extract3-spam.htm
+++ b/html-pmg/extract3-spam.htm
@@ -31,7 +31,7 @@
       <tr>
        <td valign="top"><img src="plus.png"></td>
        <td valign="top"><b>Flexible classification</b><br>
-         Every incoming e-mail will be analyzed and marked with a spam level. You can use
+         Every incoming email will be analyzed and marked with a spam level. You can use
          the rule system to mark, quarantine, block or forward spam mails into a spam folder.
          <br><br>
        </td>

diff --git a/html-pmg/passwd.htm b/html-pmg/passwd.htm
index f9c4fb579aadde13595cbb60fd68ead45615ea65..3e94480110e7b7060ddcf6a92b43da8bf753ca93 100644 (file)
--- a/html-pmg/passwd.htm
+++ b/html-pmg/passwd.htm
@@ -9,7 +9,7 @@
 <tr><td>&nbsp;</td></tr>
 <tr>
   <td colspan="4" align="center" width="800">
-    <b class="htext">Administration Password and E-Mail Address</b>
+    <b class="htext">Administration Password and Email Address</b>
   </td>
 </tr>
 <tr>
@@ -34,7 +34,7 @@
       </tr>
       <tr>
        <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>E-Mail:</b>
+       <td valign="top"><b>Email:</b>
          Enter a valid email address. Your Proxmox Mail Gateway will send
          important alert notifications to this email account (all mails for 'root').
          <br><br>

diff --git a/html-pve/passwd.htm b/html-pve/passwd.htm
index 69ce5b26713cc0008541dfed658fa9b927cc4e17..b1a8522bc2a1b2698bd8c230f74883fa3b4b9d06 100644 (file)
--- a/html-pve/passwd.htm
+++ b/html-pve/passwd.htm
@@ -9,7 +9,7 @@
 <tr><td>&nbsp;</td></tr>
 <tr>
   <td colspan="4" align="center" width="800">
-    <b class="htext">Administration Password and E-Mail Address</b>
+    <b class="htext">Administration Password and Email Address</b>
   </td>
 </tr>
 <tr>
@@ -34,7 +34,7 @@
       </tr>
       <tr>
        <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>E-Mail:</b>
+       <td valign="top"><b>Email:</b>
          Enter a valid email address. Your Proxmox VE server will send
          important alert notifications to this email account (such as backup
          failures, high availability events, etc.).

diff --git a/proxinstall b/proxinstall
index 9879df4634b51b866ca7f106e04df8ce92e7d6f4..a145f2c5bd691197b424d60c4e806cedfa6a87dd 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -2639,7 +2639,7 @@ sub create_password_view {
     $hbox2->pack_start($pwe2, 0, 0, 0);
 
     my $hbox3 = Gtk3::HBox->new(0, 0);
-    $label = Gtk3::Label->new("E-Mail");
+    $label = Gtk3::Label->new("Email");
     $label->set_size_request(150, -1);
     $label->set_alignment(1, 0.5);
     $hbox3->pack_start($label, 0, 0, 10);
@@ -2676,14 +2676,14 @@ sub create_password_view {
 
        my $t3 = $eme->get_text;
        if ($t3 !~ m/^[\w\+\-\~]+(\.[\w\+\-\~]+)*@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*$/) {
-           display_message("E-Mail does not look like a valid address" .
+           display_message("Email does not look like a valid address" .
                             " (user\@domain.tld)");
            $eme->grab_focus();
            return;
        }
 
        if ($t3 eq 'mail@example.invalid') {
-           display_message("Please enter a valid E-Mail address");
+           display_message("Please enter a valid Email address");
            $eme->grab_focus();
            return;
        }