Merge pull request #954 from mailcow/master

Merge master to dev

data/web/js/quarantaine.js

@@ -15,7 +15,7 @@ jQuery(function($){
         {"name":"sender","title":lang.sender,"breakpoints":"xs sm"},
         {"name":"rcpt","title":lang.rcpt, "type": "text"},
         {"name":"created","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleString();},"title":lang.received,"style":{"width":"170px"}},
-        {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right"},"style":{"width":"205px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
+        {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right"},"style":{"width":"220px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
       ],
       "rows": $.ajax({
         dataType: 'json',
@@ -81,4 +81,4 @@ jQuery(function($){
   }
   // Initial table drawings
   draw_quarantaine_table();
-});
+});

data/web/lang/lang.en.php

@@ -570,7 +570,7 @@ $lang['admin']['api_key'] = "API key";
 $lang['admin']['activate_api'] = "Activate API";
 $lang['admin']['regen_api_key'] = "Regenerate API key";
 
-$lang['admin']['quarantine'] = "Quarantine";
+$lang['admin']['quarantine'] = "Quarantaine";
 $lang['admin']['quarantine_retention_size'] = "Retentions per mailbox:";
 $lang['admin']['quarantine_max_size'] = "Maximum size in MiB (larger elements are discarded):";
 $lang['admin']['quarantine_exclude_domains'] = "Exclude domains and alias-domains:";