Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

data/web/css/mailbox.css

@@ -9,7 +9,7 @@ table.footable>tbody>tr.footable-empty>td {
   overflow: visible !important;
 }
 .table-responsive {
-  overflow: visible !important;
+  overflow: auto !important;
 }
 @media screen and (max-width: 767px) {
   .table-responsive {

data/web/edit.php

@@ -271,7 +271,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
               </div>
             </div>
             <div class="form-group">
-              <label class="control-label col-sm-2" for="quota">Relayhost</label>
+              <label class="control-label col-sm-2" for="quota"><?=$lang['edit']['relayhost'];?></label>
               <div class="col-sm-10">
                 <select data-live-search="true" name="relayhost" class="form-control">
                   <?php
@@ -330,7 +330,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
       <hr>
       <form data-id="domratelimit" class="form-inline well" method="post">
         <div class="form-group">
-          <label class="control-label">Ratelimit</label>
+          <label class="control-label"><?=$lang['acl']['ratelimit'];?></label>
           <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled">
         </div>
         <div class="form-group">
@@ -440,7 +440,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
           <hr>
           <form data-id="domratelimit" class="form-inline well" method="post">
             <div class="form-group">
-              <label class="control-label">Ratelimit</label>
+              <label class="control-label"><?=$lang['acl']['ratelimit'];?></label>
               <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" autocomplete="off" class="form-control" placeholder="disabled">
             </div>
             <div class="form-group">
@@ -600,7 +600,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
         <form data-id="mboxratelimit" class="form-inline well" method="post">
           <div class="row">
             <div class="col-sm-1">
-              <p class="help-block">Ratelimit</p>
+              <p class="help-block"><?=$lang['acl']['ratelimit'];?></p>
             </div>
             <div class="col-sm-10">
               <div class="form-group">

data/web/lang/lang.cs.php

@@ -391,6 +391,7 @@ $lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s (+
 $lang['edit']['multiple_bookings'] = 'Vícenásobné rezervace';
 $lang['edit']['kind'] = 'Druh';
 $lang['edit']['resource'] = 'Zdroje';
+$lang['edit']['relayhost'] = 'Přeposílání závislé na odesílateli';
 
 $lang['acl']['spam_alias'] = 'Dočasné aliasy';
 $lang['acl']['tls_policy'] = 'Pravidla TLS';
@@ -404,7 +405,7 @@ $lang['acl']['quarantine'] = 'Karanténa';
 $lang['acl']['login_as'] = 'Přihlásit jako uživatel poštovní schránky';
 $lang['acl']['bcc_maps'] = 'BCC maps';
 $lang['acl']['filters'] = 'Filtry';
-$lang['acl']['ratelimit'] = 'Omezování provozu (Rate limit)';
+$lang['acl']['ratelimit'] = 'Omezování provozu';
 $lang['acl']['recipient_maps'] = 'Recipient maps';
 $lang['acl']['prohibited'] = 'Zakázáno z důvodu ACL';
 

data/web/lang/lang.en.php

@@ -389,6 +389,7 @@ $lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s (+
 $lang['edit']['multiple_bookings'] = 'Multiple bookings';
 $lang['edit']['kind'] = 'Kind';
 $lang['edit']['resource'] = 'Resource';
+$lang['edit']['relayhost'] = 'Sender-dependent transports';
 
 $lang['acl']['spam_alias'] = 'Temporary aliases';
 $lang['acl']['tls_policy'] = 'TLS policy';

data/web/modals/mailbox.php

@@ -131,7 +131,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
 					</div>
           <hr>
 					<div class="form-group">
-						<label class="control-label col-sm-2" for="rl_frame">Ratelimit</label>
+						<label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
             <div class="col-sm-7">
             <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
             </div>
@@ -328,7 +328,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
 					</div>
           <hr>
 					<div class="form-group">
-						<label class="control-label col-sm-2" for="rl_frame">Ratelimit</label>
+						<label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
             <div class="col-sm-7">
             <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
             </div>

generate_config.sh

@@ -159,7 +159,7 @@ USE_WATCHDOG=n
 
 LOG_LINES=9999
 
-# Internal IPv4 /24 subnet, format n.n.n. (expands to n.n.n.0/24)
+# Internal IPv4 /24 subnet, format n.n.n (expands to n.n.n.0/24)
 
 IPV4_NETWORK=172.22.1