diff --git a/locale/de/freedombone-addcert.mo b/locale/de/freedombone-addcert.mo
index 2a3d0777..c61febb1 100644
Binary files a/locale/de/freedombone-addcert.mo and b/locale/de/freedombone-addcert.mo differ
diff --git a/locale/de/freedombone-addsipuser.mo b/locale/de/freedombone-addsipuser.mo
index b0ea78fc..aa08c1e5 100644
Binary files a/locale/de/freedombone-addsipuser.mo and b/locale/de/freedombone-addsipuser.mo differ
diff --git a/locale/de/freedombone-adduser.mo b/locale/de/freedombone-adduser.mo
index 59b6a862..9ccc35c8 100644
Binary files a/locale/de/freedombone-adduser.mo and b/locale/de/freedombone-adduser.mo differ
diff --git a/locale/de/freedombone-clientcert.mo b/locale/de/freedombone-clientcert.mo
index e94ad8aa..9b64bae3 100644
Binary files a/locale/de/freedombone-clientcert.mo and b/locale/de/freedombone-clientcert.mo differ
diff --git a/locale/de/freedombone-config.mo b/locale/de/freedombone-config.mo
index c9cf132b..5744704c 100644
Binary files a/locale/de/freedombone-config.mo and b/locale/de/freedombone-config.mo differ
diff --git a/locale/de/freedombone-controlpanel.mo b/locale/de/freedombone-controlpanel.mo
index ce8c3f5b..8ec664cc 100644
Binary files a/locale/de/freedombone-controlpanel.mo and b/locale/de/freedombone-controlpanel.mo differ
diff --git a/locale/de/freedombone-image.mo b/locale/de/freedombone-image.mo
index 56f2f339..92d19ac4 100644
Binary files a/locale/de/freedombone-image.mo and b/locale/de/freedombone-image.mo differ
diff --git a/locale/de/freedombone-keydrive.mo b/locale/de/freedombone-keydrive.mo
index d408603d..b29e8db2 100644
Binary files a/locale/de/freedombone-keydrive.mo and b/locale/de/freedombone-keydrive.mo differ
diff --git a/locale/de/freedombone-meshweb.mo b/locale/de/freedombone-meshweb.mo
index 447606dd..2c0b174b 100644
Binary files a/locale/de/freedombone-meshweb.mo and b/locale/de/freedombone-meshweb.mo differ
diff --git a/locale/de/freedombone-recoverkey.mo b/locale/de/freedombone-recoverkey.mo
index 6f619998..ddde319b 100644
Binary files a/locale/de/freedombone-recoverkey.mo and b/locale/de/freedombone-recoverkey.mo differ
diff --git a/locale/de/freedombone-remote.mo b/locale/de/freedombone-remote.mo
index 541795a2..1adbc83a 100644
Binary files a/locale/de/freedombone-remote.mo and b/locale/de/freedombone-remote.mo differ
diff --git a/locale/de/freedombone-renew-cert.mo b/locale/de/freedombone-renew-cert.mo
index 3f2b9614..ba40c605 100644
Binary files a/locale/de/freedombone-renew-cert.mo and b/locale/de/freedombone-renew-cert.mo differ
diff --git a/locale/de/freedombone-rmsipuser.mo b/locale/de/freedombone-rmsipuser.mo
index 8e0207ae..e75e13e4 100644
Binary files a/locale/de/freedombone-rmsipuser.mo and b/locale/de/freedombone-rmsipuser.mo differ
diff --git a/locale/de/freedombone-sec.mo b/locale/de/freedombone-sec.mo
index ebfe26e0..33405281 100644
Binary files a/locale/de/freedombone-sec.mo and b/locale/de/freedombone-sec.mo differ
diff --git a/locale/de/freedombone-splitkey.mo b/locale/de/freedombone-splitkey.mo
index a38c9a9e..008ad2dc 100644
Binary files a/locale/de/freedombone-splitkey.mo and b/locale/de/freedombone-splitkey.mo differ
diff --git a/locale/de/freedombone.mo b/locale/de/freedombone.mo
index 62a32207..44ce9bd2 100644
Binary files a/locale/de/freedombone.mo and b/locale/de/freedombone.mo differ
diff --git a/locale/es/freedombone-addcert.mo b/locale/es/freedombone-addcert.mo
index 2a3d0777..c61febb1 100644
Binary files a/locale/es/freedombone-addcert.mo and b/locale/es/freedombone-addcert.mo differ
diff --git a/locale/es/freedombone-addsipuser.mo b/locale/es/freedombone-addsipuser.mo
index b0ea78fc..aa08c1e5 100644
Binary files a/locale/es/freedombone-addsipuser.mo and b/locale/es/freedombone-addsipuser.mo differ
diff --git a/locale/es/freedombone-adduser.mo b/locale/es/freedombone-adduser.mo
index 59b6a862..9ccc35c8 100644
Binary files a/locale/es/freedombone-adduser.mo and b/locale/es/freedombone-adduser.mo differ
diff --git a/locale/es/freedombone-clientcert.mo b/locale/es/freedombone-clientcert.mo
index e94ad8aa..9b64bae3 100644
Binary files a/locale/es/freedombone-clientcert.mo and b/locale/es/freedombone-clientcert.mo differ
diff --git a/locale/es/freedombone-config.mo b/locale/es/freedombone-config.mo
index c9cf132b..5744704c 100644
Binary files a/locale/es/freedombone-config.mo and b/locale/es/freedombone-config.mo differ
diff --git a/locale/es/freedombone-controlpanel.mo b/locale/es/freedombone-controlpanel.mo
index ce8c3f5b..8ec664cc 100644
Binary files a/locale/es/freedombone-controlpanel.mo and b/locale/es/freedombone-controlpanel.mo differ
diff --git a/locale/es/freedombone-image.mo b/locale/es/freedombone-image.mo
index 56f2f339..92d19ac4 100644
Binary files a/locale/es/freedombone-image.mo and b/locale/es/freedombone-image.mo differ
diff --git a/locale/es/freedombone-keydrive.mo b/locale/es/freedombone-keydrive.mo
index d408603d..b29e8db2 100644
Binary files a/locale/es/freedombone-keydrive.mo and b/locale/es/freedombone-keydrive.mo differ
diff --git a/locale/es/freedombone-meshweb.mo b/locale/es/freedombone-meshweb.mo
index 447606dd..2c0b174b 100644
Binary files a/locale/es/freedombone-meshweb.mo and b/locale/es/freedombone-meshweb.mo differ
diff --git a/locale/es/freedombone-recoverkey.mo b/locale/es/freedombone-recoverkey.mo
index 6f619998..ddde319b 100644
Binary files a/locale/es/freedombone-recoverkey.mo and b/locale/es/freedombone-recoverkey.mo differ
diff --git a/locale/es/freedombone-remote.mo b/locale/es/freedombone-remote.mo
index 541795a2..1adbc83a 100644
Binary files a/locale/es/freedombone-remote.mo and b/locale/es/freedombone-remote.mo differ
diff --git a/locale/es/freedombone-renew-cert.mo b/locale/es/freedombone-renew-cert.mo
index 3f2b9614..ba40c605 100644
Binary files a/locale/es/freedombone-renew-cert.mo and b/locale/es/freedombone-renew-cert.mo differ
diff --git a/locale/es/freedombone-rmsipuser.mo b/locale/es/freedombone-rmsipuser.mo
index 8e0207ae..e75e13e4 100644
Binary files a/locale/es/freedombone-rmsipuser.mo and b/locale/es/freedombone-rmsipuser.mo differ
diff --git a/locale/es/freedombone-sec.mo b/locale/es/freedombone-sec.mo
index ebfe26e0..33405281 100644
Binary files a/locale/es/freedombone-sec.mo and b/locale/es/freedombone-sec.mo differ
diff --git a/locale/es/freedombone-splitkey.mo b/locale/es/freedombone-splitkey.mo
index a38c9a9e..008ad2dc 100644
Binary files a/locale/es/freedombone-splitkey.mo and b/locale/es/freedombone-splitkey.mo differ
diff --git a/locale/es/freedombone.mo b/locale/es/freedombone.mo
index 62a32207..44ce9bd2 100644
Binary files a/locale/es/freedombone.mo and b/locale/es/freedombone.mo differ
diff --git a/locale/fr/freedombone-addcert.mo b/locale/fr/freedombone-addcert.mo
index c79e2371..f426630e 100644
Binary files a/locale/fr/freedombone-addcert.mo and b/locale/fr/freedombone-addcert.mo differ
diff --git a/locale/fr/freedombone-addsipuser.mo b/locale/fr/freedombone-addsipuser.mo
index a58dd903..33c98182 100644
Binary files a/locale/fr/freedombone-addsipuser.mo and b/locale/fr/freedombone-addsipuser.mo differ
diff --git a/locale/fr/freedombone-adduser.mo b/locale/fr/freedombone-adduser.mo
index 3bd173fc..01ad0181 100644
Binary files a/locale/fr/freedombone-adduser.mo and b/locale/fr/freedombone-adduser.mo differ
diff --git a/locale/fr/freedombone-clientcert.mo b/locale/fr/freedombone-clientcert.mo
index 3b33f58b..dd26f452 100644
Binary files a/locale/fr/freedombone-clientcert.mo and b/locale/fr/freedombone-clientcert.mo differ
diff --git a/locale/fr/freedombone-config.mo b/locale/fr/freedombone-config.mo
index d1374c45..71e7acee 100644
Binary files a/locale/fr/freedombone-config.mo and b/locale/fr/freedombone-config.mo differ
diff --git a/locale/fr/freedombone-controlpanel.mo b/locale/fr/freedombone-controlpanel.mo
index 80331ee3..ef73b88d 100644
Binary files a/locale/fr/freedombone-controlpanel.mo and b/locale/fr/freedombone-controlpanel.mo differ
diff --git a/locale/fr/freedombone-image.mo b/locale/fr/freedombone-image.mo
index 456cca99..bd6ffed5 100644
Binary files a/locale/fr/freedombone-image.mo and b/locale/fr/freedombone-image.mo differ
diff --git a/locale/fr/freedombone-keydrive.mo b/locale/fr/freedombone-keydrive.mo
index 5312916b..d7146959 100644
Binary files a/locale/fr/freedombone-keydrive.mo and b/locale/fr/freedombone-keydrive.mo differ
diff --git a/locale/fr/freedombone-meshweb.mo b/locale/fr/freedombone-meshweb.mo
index 5edc533e..f85f4b93 100644
Binary files a/locale/fr/freedombone-meshweb.mo and b/locale/fr/freedombone-meshweb.mo differ
diff --git a/locale/fr/freedombone-recoverkey.mo b/locale/fr/freedombone-recoverkey.mo
index 487000be..da028b5e 100644
Binary files a/locale/fr/freedombone-recoverkey.mo and b/locale/fr/freedombone-recoverkey.mo differ
diff --git a/locale/fr/freedombone-remote.mo b/locale/fr/freedombone-remote.mo
index 0e54ed23..b53a9803 100644
Binary files a/locale/fr/freedombone-remote.mo and b/locale/fr/freedombone-remote.mo differ
diff --git a/locale/fr/freedombone-renew-cert.mo b/locale/fr/freedombone-renew-cert.mo
index 531fc485..4d403cc2 100644
Binary files a/locale/fr/freedombone-renew-cert.mo and b/locale/fr/freedombone-renew-cert.mo differ
diff --git a/locale/fr/freedombone-rmsipuser.mo b/locale/fr/freedombone-rmsipuser.mo
index 02e26fcf..b6fb45da 100644
Binary files a/locale/fr/freedombone-rmsipuser.mo and b/locale/fr/freedombone-rmsipuser.mo differ
diff --git a/locale/fr/freedombone-sec.mo b/locale/fr/freedombone-sec.mo
index 23b7a854..2eec1e38 100644
Binary files a/locale/fr/freedombone-sec.mo and b/locale/fr/freedombone-sec.mo differ
diff --git a/locale/fr/freedombone-splitkey.mo b/locale/fr/freedombone-splitkey.mo
index 827c81ee..9e53adf0 100644
Binary files a/locale/fr/freedombone-splitkey.mo and b/locale/fr/freedombone-splitkey.mo differ
diff --git a/locale/fr/freedombone.mo b/locale/fr/freedombone.mo
index 71a34160..f6bf3a51 100644
Binary files a/locale/fr/freedombone.mo and b/locale/fr/freedombone.mo differ
diff --git a/src/freedombone b/src/freedombone
index da8e541d..de24b303 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -86,6 +86,7 @@ INSTALLING_FROM_CONFIGURATION_FILE="no"
 CONFIGURATION_FILE="${PROJECT_NAME}.cfg"
 
 SSH_PORT=2222
+SSH_ONION_PORT=8094
 IRC_PORT=6697
 
 # An optional password to log into IRC. This applies to all users
@@ -3680,6 +3681,40 @@ function configure_ssh {
     echo 'configure_ssh' >> $COMPLETION_FILE
 }
 
+function configure_ssh_onion {
+    if grep -Fxq "configure_ssh_onion" $COMPLETION_FILE; then
+        return
+    fi
+    if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
+        return
+    fi
+
+    if [ ! -d /var/lib/tor ]; then
+        echo $'No Tor installation found. ssh onion domain cannot be configured.'
+        exit 32672
+    fi
+    if ! grep -q "hidden_service_ssh" /etc/tor/torrc; then
+        echo 'HiddenServiceDir /var/lib/tor/hidden_service_ssh/' >> /etc/tor/torrc
+        echo "HiddenServicePort ${SSH_PORT} 127.0.0.1:${SSH_ONION_PORT}" >> /etc/tor/torrc
+        echo $'Added onion domain for ssh'
+    fi
+
+    systemctl restart tor
+
+    if [ ! -f /var/lib/tor/hidden_service_ssh/hostname ]; then
+        echo $'ssh onion domain hostname not found'
+        exit 62983
+    fi
+    SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)
+    if ! grep -q "ssh onion domain" $COMPLETION_FILE; then
+        echo "ssh onion domain:${SSH_ONION_HOSTNAME}" >> $COMPLETION_FILE
+    else
+        sed -i "s|ssh onion domain.*|ssh onion domain:${SSH_ONION_HOSTNAME}|g" $COMPLETION_FILE
+    fi
+
+    echo 'configure_ssh_onion' >> $COMPLETION_FILE
+}
+
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html
 function ssh_remove_small_moduli {
     awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
@@ -9712,6 +9747,7 @@ time_synchronisation
 configure_internet_protocol
 create_git_project
 configure_ssh
+configure_ssh_onion
 remove_instructions_from_motd
 check_hwrng
 search_for_attached_usb_drive