fix(ui): Swap translations for oversized dropdown
* Fix other typos * Fixes #6400 Signed-off-by: Marvin A. Ruder <signed@mruder.dev>
This commit is contained in:
Marvin A. Ruder
parent
d584dd387e
commit
05fc4f7aba
11 changed files with 30 additions and 30 deletions
|
|
@ -241,9 +241,9 @@ async def handle_pubsub_messages(channel: aioredis.client.PubSub):
|
|||
else:
|
||||
dockerapi.logger.error("api call: missing container_name, post_action or request")
|
||||
else:
|
||||
dockerapi.logger.error("Unknwon PubSub recieved - %s" % json.dumps(data_json))
|
||||
dockerapi.logger.error("Unknown PubSub received - %s" % json.dumps(data_json))
|
||||
else:
|
||||
dockerapi.logger.error("Unknwon PubSub recieved - %s" % json.dumps(data_json))
|
||||
dockerapi.logger.error("Unknown PubSub received - %s" % json.dumps(data_json))
|
||||
|
||||
await asyncio.sleep(0.0)
|
||||
except asyncio.TimeoutError:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
# 2013101601 Optical clean up #
|
||||
# 2013101602 Rewrite help output #
|
||||
# 2013101700 Handle Slave IO in 'Connecting' state #
|
||||
# 2013101701 Minor changes in output, handling UNKWNON situations now #
|
||||
# 2013101701 Minor changes in output, handling UNKNOWN situations now #
|
||||
# 2013101702 Exit CRITICAL when Slave IO in Connecting state #
|
||||
# 2013123000 Slave_SQL_Running also matched Slave_SQL_Running_State #
|
||||
# 2015011600 Added 'moving' check to catch possible connection issues #
|
||||
|
|
@ -131,7 +131,7 @@ elif [[ -n "${socket}" && (-z "${user}" || -z "${password}") ]]; then
|
|||
fi
|
||||
|
||||
# Connect to the DB server and store output in vars
|
||||
if [[ -n $socket ]]; then
|
||||
if [[ -n $socket ]]; then
|
||||
ConnectionResult=$(mariadb --skip-ssl ${optfile} ${socket} ${user} -e "show slave ${connection} status\G" 2>&1)
|
||||
else
|
||||
ConnectionResult=$(mariadb --skip-ssl ${optfile} ${host} ${port} ${user} -e "show slave ${connection} status\G" 2>&1)
|
||||
|
|
@ -178,33 +178,33 @@ if [ ${check} = ${ok} ] && [ ${checkio} = ${ok} ]; then
|
|||
then echo "CRITICAL: Slave is ${delayinfo} seconds behind Master | delay=${delayinfo}s"; exit ${STATE_CRITICAL}
|
||||
elif [[ ${delayinfo} -ge ${warn_delay} ]]
|
||||
then echo "WARNING: Slave is ${delayinfo} seconds behind Master | delay=${delayinfo}s"; exit ${STATE_WARNING}
|
||||
else
|
||||
else
|
||||
# Everything looks OK here but now let us check if the replication is moving
|
||||
if [[ -n ${moving} ]] && [[ -n ${tmpfile} ]] && [[ $readpos -eq $execpos ]]
|
||||
then
|
||||
#echo "Debug: Read pos is $readpos - Exec pos is $execpos"
|
||||
then
|
||||
#echo "Debug: Read pos is $readpos - Exec pos is $execpos"
|
||||
# Check if tmp file exists
|
||||
curtime=`date +%s`
|
||||
if [[ -w $tmpfile ]]
|
||||
then
|
||||
if [[ -w $tmpfile ]]
|
||||
then
|
||||
tmpfiletime=`date +%s -r $tmpfile`
|
||||
if [[ `expr $curtime - $tmpfiletime` -gt ${moving} ]]
|
||||
then
|
||||
exectmp=`cat $tmpfile`
|
||||
#echo "Debug: Exec pos in tmpfile is $exectmp"
|
||||
if [[ $exectmp -eq $execpos ]]
|
||||
then
|
||||
then
|
||||
# The value read from the tmp file and from db are the same. Replication hasnt moved!
|
||||
echo "WARNING: Slave replication has not moved in ${moving} seconds. Manual check required."; exit ${STATE_WARNING}
|
||||
else
|
||||
else
|
||||
# Replication has moved since the tmp file was written. Delete tmp file and output OK.
|
||||
rm $tmpfile
|
||||
echo "OK: Slave SQL running: ${check} Slave IO running: ${checkio} / master: ${masterinfo} / slave is ${delayinfo} seconds behind master | delay=${delayinfo}s"; exit ${STATE_OK};
|
||||
fi
|
||||
else
|
||||
else
|
||||
echo "OK: Slave SQL running: ${check} Slave IO running: ${checkio} / master: ${masterinfo} / slave is ${delayinfo} seconds behind master | delay=${delayinfo}s"; exit ${STATE_OK};
|
||||
fi
|
||||
else
|
||||
else
|
||||
echo "$execpos" > $tmpfile
|
||||
echo "OK: Slave SQL running: ${check} Slave IO running: ${checkio} / master: ${masterinfo} / slave is ${delayinfo} seconds behind master | delay=${delayinfo}s"; exit ${STATE_OK};
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ while (true) {
|
|||
curl_close($ch);
|
||||
|
||||
if ($code != 200){
|
||||
logMsg("err", "Recieved HTTP {$code}");
|
||||
logMsg("err", "Received HTTP {$code}");
|
||||
session_destroy();
|
||||
exit;
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ while (true) {
|
|||
break;
|
||||
}
|
||||
if (!is_array($response)){
|
||||
logMsg("err", "Recieved malformed response from keycloak api");
|
||||
logMsg("err", "Received malformed response from keycloak api");
|
||||
break;
|
||||
}
|
||||
if (count($response) == 0) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ if ($iam_provider){
|
|||
}
|
||||
} elseif ($_GET['code'] && $_GET['state'] === $_SESSION['oauth2state']) {
|
||||
// Check given state against previously stored one to mitigate CSRF attack
|
||||
// Recieved access token in $_GET['code']
|
||||
// Received access token in $_GET['code']
|
||||
// extract info and verify user
|
||||
identity_provider('verify-sso');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -624,7 +624,7 @@
|
|||
"alias": "Edit alias",
|
||||
"allow_from_smtp": "Only allow these IPs to use <b>SMTP</b>",
|
||||
"allow_from_smtp_info": "Leave empty to allow all senders.<br>IPv4/IPv6 addresses and networks.",
|
||||
"allowed_protocols": "Allowed protocols",
|
||||
"allowed_protocols": "Allowed protocols for direct user access (does not affect app password protocols)",
|
||||
"app_name": "App name",
|
||||
"app_passwd": "App password",
|
||||
"app_passwd_protocols": "Allowed protocols for app password",
|
||||
|
|
@ -844,7 +844,7 @@
|
|||
"all_domains": "All Domains",
|
||||
"allow_from_smtp": "Only allow these IPs to use <b>SMTP</b>",
|
||||
"allow_from_smtp_info": "Leave empty to allow all senders.<br>IPv4/IPv6 addresses and networks.",
|
||||
"allowed_protocols": "Allowed protocols for direct user access (does not affect app password protocols)",
|
||||
"allowed_protocols": "Allowed protocols",
|
||||
"backup_mx": "Relay domain",
|
||||
"bcc": "BCC",
|
||||
"bcc_destination": "BCC destination",
|
||||
|
|
|
|||
|
|
@ -581,7 +581,7 @@
|
|||
"alias": "エイリアスを編集",
|
||||
"allow_from_smtp": "<b>SMTP</b>を使用するこれらのIPのみを許可",
|
||||
"allow_from_smtp_info": "すべての送信者を許可するには空欄にしてください。<br>IPv4/IPv6アドレスおよびネットワークを指定できます。",
|
||||
"allowed_protocols": "許可されたプロトコル",
|
||||
"allowed_protocols": "直接ユーザーアクセスで許可されるプロトコル（アプリパスワードプロトコルには影響しません）",
|
||||
"app_name": "アプリ名",
|
||||
"app_passwd": "アプリパスワード",
|
||||
"app_passwd_protocols": "アプリパスワードで許可されるプロトコル",
|
||||
|
|
@ -798,7 +798,7 @@
|
|||
"all_domains": "すべてのドメイン",
|
||||
"allow_from_smtp": "<b>SMTP</b>を使用するこれらのIPのみを許可",
|
||||
"allow_from_smtp_info": "すべての送信者を許可するには空欄にしてください。<br>IPv4/IPv6アドレスおよびネットワークを指定可能。",
|
||||
"allowed_protocols": "直接ユーザーアクセスで許可されるプロトコル（アプリパスワードプロトコルには影響しません）",
|
||||
"allowed_protocols": "許可されたプロトコル",
|
||||
"backup_mx": "リレードメイン",
|
||||
"bcc": "BCC",
|
||||
"bcc_destination": "BCC送信先",
|
||||
|
|
|
|||
|
|
@ -581,7 +581,7 @@
|
|||
"alias": "Editar alias",
|
||||
"allow_from_smtp": "<b>Permita que esses IPs usem apenas SMTP</b>",
|
||||
"allow_from_smtp_info": "Deixe em branco para permitir todos os remetentes. Endereços e <br>redes IPv4/IPv6.",
|
||||
"allowed_protocols": "Protocolos permitidos",
|
||||
"allowed_protocols": "Protocolos permitidos para acesso direto do usuário (não afeta os protocolos de senha do aplicativo)",
|
||||
"app_name": "Nome do aplicativo",
|
||||
"app_passwd": "Senha do aplicativo",
|
||||
"app_passwd_protocols": "Protocolos permitidos para a senha do aplicativo",
|
||||
|
|
@ -793,7 +793,7 @@
|
|||
"all_domains": "Todos os domínios",
|
||||
"allow_from_smtp": "<b>Permita que esses IPs usem apenas SMTP</b>",
|
||||
"allow_from_smtp_info": "Deixe em branco para permitir todos os remetentes. Endereços e <br>redes IPv4/IPv6.",
|
||||
"allowed_protocols": "Protocolos permitidos para acesso direto do usuário (não afeta os protocolos de senha do aplicativo)",
|
||||
"allowed_protocols": "Protocolos permitidos",
|
||||
"backup_mx": "Domínio de retransmissão",
|
||||
"bcc": "BCC",
|
||||
"bcc_destination": "Destino BCC",
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@
|
|||
"sender_acl_disabled": "<span class=\\\"label label-danger\\\">Gönderen denetimi devre dışı</span>",
|
||||
"allow_from_smtp": "Yalnızca bu IP'lerin <b>SMTP</b> kullanmasına izin verin",
|
||||
"allow_from_smtp_info": "Tüm gönderenlere izin vermek için boş bırakın.<br>IPv4/IPv6 adresleri ve ağları.",
|
||||
"allowed_protocols": "İzin verilen protokoller",
|
||||
"allowed_protocols": "Doğrudan kullanıcı erişimi için izin verilen protokoller (uygulama parola protokollerini etkilemez)",
|
||||
"app_name": "Uygulama adı",
|
||||
"app_passwd": "Uygulama şifresi",
|
||||
"app_passwd_protocols": "Uygulama şifresi için izin verilen protokoller",
|
||||
|
|
@ -782,7 +782,7 @@
|
|||
"aliases": "Takma Adlar",
|
||||
"all_domains": "Tüm Alan Adları",
|
||||
"allow_from_smtp": "Yalnızca bu IP'lerin <b>SMTP</b> kullanmasına izin verin",
|
||||
"allowed_protocols": "Doğrudan kullanıcı erişimi için izin verilen protokoller (uygulama parola protokollerini etkilemez)",
|
||||
"allowed_protocols": "İzin verilen protokoller",
|
||||
"backup_mx": "Geçiş alanı",
|
||||
"bcc": "BCC",
|
||||
"bcc_destination": "Gizli hedef",
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@
|
|||
"alias": "编辑别名",
|
||||
"allow_from_smtp": "只允许这些 IP 使用 <b>SMTP</b>",
|
||||
"allow_from_smtp_info": "留空以允许所有发送者。<br>IPv4/IPv6 地址和网络。",
|
||||
"allowed_protocols": "允许的协议",
|
||||
"allowed_protocols": "允许用户直接访问的协议 (不会影响应用的密码协议)",
|
||||
"app_name": "应用名称",
|
||||
"app_passwd": "应用密码",
|
||||
"app_passwd_protocols": "应用密码允许的协议",
|
||||
|
|
@ -770,7 +770,7 @@
|
|||
"all_domains": "全部域名",
|
||||
"allow_from_smtp": "只允许这些 IP 使用 <b>SMTP</b>",
|
||||
"allow_from_smtp_info": "留空以允许所有发送者。<br>IPv4/IPv6 地址或网络。",
|
||||
"allowed_protocols": "允许用户直接访问的协议 (不会影响应用的密码协议)",
|
||||
"allowed_protocols": "允许的协议",
|
||||
"backup_mx": "中继域名",
|
||||
"bcc": "BCC",
|
||||
"bcc_destination": "BCC 目标地址",
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@
|
|||
"alias": "編輯別名",
|
||||
"allow_from_smtp": "只允許這些 IP 使用 <b>SMTP</b>",
|
||||
"allow_from_smtp_info": "留空將允許所有寄件人<br>IPv4/IPv6 地址或網路",
|
||||
"allowed_protocols": "允許的協定",
|
||||
"allowed_protocols": "使用者直接存取時允許的協定 (不影響應用程式密碼所能使用的協定)",
|
||||
"app_name": "應用程式名稱",
|
||||
"app_passwd": "應用程式密碼",
|
||||
"app_passwd_protocols": "應用程式密碼允許的協定",
|
||||
|
|
@ -763,7 +763,7 @@
|
|||
"all_domains": "所有域名",
|
||||
"allow_from_smtp": "只允許這些 IP 使用<b>SMTP</b>",
|
||||
"allow_from_smtp_info": "留空以允許所有發送者<br>IPv4/IPv6 地址或網路",
|
||||
"allowed_protocols": "使用者直接存取時允許的協定 (不影響應用程式密碼所能使用的協定)",
|
||||
"allowed_protocols": "允許的協定",
|
||||
"backup_mx": "中繼域名",
|
||||
"bcc": "密件副本",
|
||||
"bcc_destination": "密件副本目標地址",
|
||||
|
|
|
|||
|
|
@ -911,7 +911,7 @@ while (($#)); do
|
|||
--skip-start - Do not start mailcow after update
|
||||
--skip-ping-check - Skip ICMP Check to public DNS resolvers (Use it only if you'\''ve blocked any ICMP Connections to your mailcow machine)
|
||||
--stable - Switch your mailcow updates to the stable (master) branch. Default unless you changed it with --nightly or --legacy.
|
||||
--legacy - Switch your mailcow updates to the legacy branch. The legacy branch will only recieve security updates until February 2026.
|
||||
--legacy - Switch your mailcow updates to the legacy branch. The legacy branch will only receive security updates until February 2026.
|
||||
-f|--force - Force update, do not ask questions
|
||||
-d|--dev - Enables Developer Mode (No Checkout of update.sh for tests)
|
||||
'
|
||||
|
|
@ -1318,7 +1318,7 @@ if ! [ "$NEW_BRANCH" ]; then
|
|||
echo -e "\e[33mTo change that run the update.sh Script one time with the --stable parameter to switch to stable builds.\e[0m"
|
||||
|
||||
elif [ "${BRANCH}" == "legacy" ]; then
|
||||
echo -e "\e[31mYou are receiving legacy updates. The legacy branch will only recieve security updates until February 2026.\e[0m"
|
||||
echo -e "\e[31mYou are receiving legacy updates. The legacy branch will only receive security updates until February 2026.\e[0m"
|
||||
sleep 1
|
||||
echo -e "\e[33mTo change that run the update.sh Script one time with the --stable parameter to switch to stable builds.\e[0m"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue