From c8d11f683891d99ffd648a1f662a8b8c65f6361c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 28 Apr 2016 14:54:38 +0100
Subject: [PATCH] Update translations

---
 locale/af/freedombone-config.json             |   9 +-
 locale/af/freedombone-controlpanel.json       |  23 +-
 locale/af/freedombone-dhparam.json            |   2 +
 locale/af/freedombone-image.json              |   7 +-
 locale/af/freedombone-wifi.json               |   6 +
 locale/af/freedombone.json                    |   3 +
 locale/ar/freedombone-config.json             |   9 +-
 locale/ar/freedombone-controlpanel.json       |  23 +-
 locale/ar/freedombone-dhparam.json            |   2 +
 locale/ar/freedombone-image.json              |   7 +-
 locale/ar/freedombone-wifi.json               |   6 +
 locale/ar/freedombone.json                    |   3 +
 locale/be/freedombone-config.json             |   9 +-
 locale/be/freedombone-controlpanel.json       |  23 +-
 locale/be/freedombone-dhparam.json            |   2 +
 locale/be/freedombone-image.json              |   7 +-
 locale/be/freedombone-wifi.json               |   6 +
 locale/be/freedombone.json                    |   3 +
 locale/bg/freedombone-config.json             |   9 +-
 locale/bg/freedombone-controlpanel.json       |  23 +-
 locale/bg/freedombone-dhparam.json            |   2 +
 locale/bg/freedombone-image.json              |   7 +-
 locale/bg/freedombone-wifi.json               |   6 +
 locale/bg/freedombone.json                    |   3 +
 locale/bs/freedombone-config.json             |   9 +-
 locale/bs/freedombone-controlpanel.json       |  23 +-
 locale/bs/freedombone-dhparam.json            |   2 +
 locale/bs/freedombone-image.json              |   7 +-
 locale/bs/freedombone-wifi.json               |   6 +
 locale/bs/freedombone.json                    |   3 +
 locale/ca/freedombone-config.json             |   9 +-
 locale/ca/freedombone-controlpanel.json       |  23 +-
 locale/ca/freedombone-dhparam.json            |   2 +
 locale/ca/freedombone-image.json              |   7 +-
 locale/ca/freedombone-wifi.json               |   6 +
 locale/ca/freedombone.json                    |   3 +
 locale/cs/freedombone-config.json             |   9 +-
 locale/cs/freedombone-controlpanel.json       |  23 +-
 locale/cs/freedombone-dhparam.json            |   2 +
 locale/cs/freedombone-image.json              |   7 +-
 locale/cs/freedombone-wifi.json               |   6 +
 locale/cs/freedombone.json                    |   3 +
 locale/da/freedombone-config.json             |   9 +-
 locale/da/freedombone-controlpanel.json       |  23 +-
 locale/da/freedombone-dhparam.json            |   2 +
 locale/da/freedombone-image.json              |   7 +-
 locale/da/freedombone-wifi.json               |   6 +
 locale/da/freedombone.json                    |   3 +
 locale/de/freedombone-config.json             |   9 +-
 locale/de/freedombone-controlpanel.json       |  23 +-
 locale/de/freedombone-dhparam.json            |   2 +
 locale/de/freedombone-image.json              |   7 +-
 locale/de/freedombone-wifi.json               |   6 +
 locale/de/freedombone.json                    |   3 +
 locale/de_du/freedombone-config.json          |   9 +-
 locale/de_du/freedombone-controlpanel.json    |  23 +-
 locale/de_du/freedombone-dhparam.json         |   2 +
 locale/de_du/freedombone-image.json           |   7 +-
 locale/de_du/freedombone-wifi.json            |   6 +
 locale/de_du/freedombone.json                 |   3 +
 locale/el/freedombone-config.json             |   9 +-
 locale/el/freedombone-controlpanel.json       |  23 +-
 locale/el/freedombone-dhparam.json            |   2 +
 locale/el/freedombone-image.json              |   7 +-
 locale/el/freedombone-wifi.json               |   6 +
 locale/el/freedombone.json                    |   3 +
 locale/en_us/freedombone-config.json          |   9 +-
 locale/en_us/freedombone-controlpanel.json    |  23 +-
 locale/en_us/freedombone-dhparam.json         |   2 +
 locale/en_us/freedombone-image.json           |   7 +-
 locale/en_us/freedombone-wifi.json            |   6 +
 locale/en_us/freedombone.json                 |   3 +
 locale/es/freedombone-config.json             |   9 +-
 locale/es/freedombone-controlpanel.json       |  23 +-
 locale/es/freedombone-dhparam.json            |   2 +
 locale/es/freedombone-image.json              |   7 +-
 locale/es/freedombone-wifi.json               |   6 +
 locale/es/freedombone.json                    |   3 +
 locale/et/freedombone-config.json             |   9 +-
 locale/et/freedombone-controlpanel.json       |  23 +-
 locale/et/freedombone-dhparam.json            |   2 +
 locale/et/freedombone-image.json              |   7 +-
 locale/et/freedombone-wifi.json               |   6 +
 locale/et/freedombone.json                    |   3 +
 locale/eu/freedombone-config.json             |   9 +-
 locale/eu/freedombone-controlpanel.json       |  23 +-
 locale/eu/freedombone-dhparam.json            |   2 +
 locale/eu/freedombone-image.json              |   7 +-
 locale/eu/freedombone-wifi.json               |   6 +
 locale/eu/freedombone.json                    |   3 +
 locale/fa/freedombone-config.json             |   9 +-
 locale/fa/freedombone-controlpanel.json       |  23 +-
 locale/fa/freedombone-dhparam.json            |   2 +
 locale/fa/freedombone-image.json              |   7 +-
 locale/fa/freedombone-wifi.json               |   6 +
 locale/fa/freedombone.json                    |   3 +
 locale/fi/freedombone-config.json             |   9 +-
 locale/fi/freedombone-controlpanel.json       |  23 +-
 locale/fi/freedombone-dhparam.json            |   2 +
 locale/fi/freedombone-image.json              |   7 +-
 locale/fi/freedombone-wifi.json               |   6 +
 locale/fi/freedombone.json                    |   3 +
 locale/fil/freedombone-config.json            |   9 +-
 locale/fil/freedombone-controlpanel.json      |  23 +-
 locale/fil/freedombone-dhparam.json           |   2 +
 locale/fil/freedombone-image.json             |   7 +-
 locale/fil/freedombone-wifi.json              |   6 +
 locale/fil/freedombone.json                   |   3 +
 locale/fr/freedombone-config.json             |   9 +-
 locale/fr/freedombone-controlpanel.json       |  23 +-
 locale/fr/freedombone-dhparam.json            |   2 +
 locale/fr/freedombone-image.json              |   7 +-
 locale/fr/freedombone-wifi.json               |   6 +
 locale/fr/freedombone.json                    |   3 +
 locale/fr_BE/freedombone-addcert.json         |   7 +
 locale/fr_BE/freedombone-addcert.mo           | Bin 0 -> 704 bytes
 locale/fr_BE/freedombone-addemail.json        |   3 +
 locale/fr_BE/freedombone-addemail.mo          | Bin 0 -> 449 bytes
 locale/fr_BE/freedombone-addlist.json         |   4 +
 locale/fr_BE/freedombone-addlist.mo           | Bin 0 -> 522 bytes
 locale/fr_BE/freedombone-addsipuser.json      |   7 +
 locale/fr_BE/freedombone-addsipuser.mo        | Bin 0 -> 596 bytes
 locale/fr_BE/freedombone-adduser.json         |  15 ++
 locale/fr_BE/freedombone-adduser.mo           | Bin 0 -> 1151 bytes
 locale/fr_BE/freedombone-addxmpp.json         |   3 +
 locale/fr_BE/freedombone-addxmpp.mo           | Bin 0 -> 394 bytes
 locale/fr_BE/freedombone-backup-local.json    |  35 +++
 locale/fr_BE/freedombone-backup-local.mo      | Bin 0 -> 2324 bytes
 locale/fr_BE/freedombone-backup-remote.json   |  51 ++++
 locale/fr_BE/freedombone-backup-remote.mo     | Bin 0 -> 2983 bytes
 locale/fr_BE/freedombone-blog.json            |   3 +
 locale/fr_BE/freedombone-blog.mo              | Bin 0 -> 395 bytes
 locale/fr_BE/freedombone-client.json          |   3 +
 locale/fr_BE/freedombone-client.mo            | Bin 0 -> 358 bytes
 locale/fr_BE/freedombone-clientcert.json      |   4 +
 locale/fr_BE/freedombone-clientcert.mo        | Bin 0 -> 424 bytes
 locale/fr_BE/freedombone-config.json          | 228 +++++++++++++++++
 locale/fr_BE/freedombone-config.mo            | Bin 0 -> 10560 bytes
 .../fr_BE/freedombone-controlpanel-user.json  | 110 +++++++++
 locale/fr_BE/freedombone-controlpanel-user.mo | Bin 0 -> 6155 bytes
 locale/fr_BE/freedombone-controlpanel.json    | 229 ++++++++++++++++++
 locale/fr_BE/freedombone-controlpanel.mo      | Bin 0 -> 11854 bytes
 locale/fr_BE/freedombone-dhparam.json         |   7 +
 locale/fr_BE/freedombone-dhparam.mo           | Bin 0 -> 580 bytes
 locale/fr_BE/freedombone-encrypt-mail.json    |   8 +
 locale/fr_BE/freedombone-encrypt-mail.mo      | Bin 0 -> 684 bytes
 locale/fr_BE/freedombone-format.json          |   5 +
 locale/fr_BE/freedombone-format.mo            | Bin 0 -> 494 bytes
 locale/fr_BE/freedombone-ignore.json          |   3 +
 locale/fr_BE/freedombone-ignore.mo            | Bin 0 -> 420 bytes
 locale/fr_BE/freedombone-image-customise.json |  11 +
 locale/fr_BE/freedombone-image-customise.mo   | Bin 0 -> 1340 bytes
 .../freedombone-image-hardware-setup.json     |   3 +
 .../fr_BE/freedombone-image-hardware-setup.mo | Bin 0 -> 369 bytes
 locale/fr_BE/freedombone-image-make.json      |   4 +
 locale/fr_BE/freedombone-image-make.mo        | Bin 0 -> 450 bytes
 locale/fr_BE/freedombone-image-mesh.json      |  18 ++
 locale/fr_BE/freedombone-image-mesh.mo        | Bin 0 -> 1355 bytes
 locale/fr_BE/freedombone-image.json           |  10 +
 locale/fr_BE/freedombone-image.mo             | Bin 0 -> 843 bytes
 locale/fr_BE/freedombone-keydrive.json        |  17 ++
 locale/fr_BE/freedombone-keydrive.mo          | Bin 0 -> 1496 bytes
 locale/fr_BE/freedombone-mesh-install.json    |   7 +
 locale/fr_BE/freedombone-mesh-install.mo      | Bin 0 -> 723 bytes
 locale/fr_BE/freedombone-mesh.json            |  11 +
 locale/fr_BE/freedombone-mesh.mo              | Bin 0 -> 858 bytes
 locale/fr_BE/freedombone-meshweb.json         |  27 +++
 locale/fr_BE/freedombone-meshweb.mo           | Bin 0 -> 1875 bytes
 locale/fr_BE/freedombone-mirrors.json         |   8 +
 locale/fr_BE/freedombone-mirrors.mo           | Bin 0 -> 794 bytes
 locale/fr_BE/freedombone-pin-cert.json        |   3 +
 locale/fr_BE/freedombone-pin-cert.mo          | Bin 0 -> 373 bytes
 locale/fr_BE/freedombone-recoverkey.json      |  11 +
 locale/fr_BE/freedombone-recoverkey.mo        | Bin 0 -> 960 bytes
 locale/fr_BE/freedombone-remote.json          |   6 +
 locale/fr_BE/freedombone-remote.mo            | Bin 0 -> 630 bytes
 locale/fr_BE/freedombone-renew-cert.json      |  11 +
 locale/fr_BE/freedombone-renew-cert.mo        | Bin 0 -> 903 bytes
 locale/fr_BE/freedombone-repair-database.json |   4 +
 locale/fr_BE/freedombone-repair-database.mo   | Bin 0 -> 472 bytes
 locale/fr_BE/freedombone-restore-local.json   |  55 +++++
 locale/fr_BE/freedombone-restore-local.mo     | Bin 0 -> 3303 bytes
 locale/fr_BE/freedombone-restore-remote.json  |  41 ++++
 locale/fr_BE/freedombone-restore-remote.mo    | Bin 0 -> 2425 bytes
 locale/fr_BE/freedombone-rmemail.json         |   3 +
 locale/fr_BE/freedombone-rmemail.mo           | Bin 0 -> 394 bytes
 locale/fr_BE/freedombone-rmlist.json          |   3 +
 locale/fr_BE/freedombone-rmlist.mo            | Bin 0 -> 423 bytes
 locale/fr_BE/freedombone-rmsipuser.json       |   6 +
 locale/fr_BE/freedombone-rmsipuser.mo         | Bin 0 -> 530 bytes
 locale/fr_BE/freedombone-rmuser.json          |  10 +
 locale/fr_BE/freedombone-rmuser.mo            | Bin 0 -> 800 bytes
 locale/fr_BE/freedombone-rmxmpp.json          |   3 +
 locale/fr_BE/freedombone-rmxmpp.mo            | Bin 0 -> 377 bytes
 locale/fr_BE/freedombone-sec.json             |  29 +++
 locale/fr_BE/freedombone-sec.mo               | Bin 0 -> 1694 bytes
 locale/fr_BE/freedombone-splitkey.json        |  12 +
 locale/fr_BE/freedombone-splitkey.mo          | Bin 0 -> 1020 bytes
 locale/fr_BE/freedombone-unignore.json        |   3 +
 locale/fr_BE/freedombone-unignore.mo          | Bin 0 -> 422 bytes
 locale/fr_BE/freedombone-update-date.json     |   5 +
 locale/fr_BE/freedombone-update-date.mo       | Bin 0 -> 487 bytes
 locale/fr_BE/freedombone-wifi.json            |   9 +
 locale/fr_BE/freedombone-wifi.mo              | Bin 0 -> 782 bytes
 locale/fr_BE/freedombone-xmpp-pass.json       |   3 +
 locale/fr_BE/freedombone-xmpp-pass.mo         | Bin 0 -> 380 bytes
 locale/fr_BE/freedombone-zram.json            |   3 +
 locale/fr_BE/freedombone-zram.mo              | Bin 0 -> 365 bytes
 locale/fr_BE/freedombone.json                 | 146 +++++++++++
 locale/fr_BE/freedombone.mo                   | Bin 0 -> 10918 bytes
 locale/fr_CH/freedombone-addcert.json         |   7 +
 locale/fr_CH/freedombone-addcert.mo           | Bin 0 -> 704 bytes
 locale/fr_CH/freedombone-addemail.json        |   3 +
 locale/fr_CH/freedombone-addemail.mo          | Bin 0 -> 449 bytes
 locale/fr_CH/freedombone-addlist.json         |   4 +
 locale/fr_CH/freedombone-addlist.mo           | Bin 0 -> 522 bytes
 locale/fr_CH/freedombone-addsipuser.json      |   7 +
 locale/fr_CH/freedombone-addsipuser.mo        | Bin 0 -> 596 bytes
 locale/fr_CH/freedombone-adduser.json         |  15 ++
 locale/fr_CH/freedombone-adduser.mo           | Bin 0 -> 1151 bytes
 locale/fr_CH/freedombone-addxmpp.json         |   3 +
 locale/fr_CH/freedombone-addxmpp.mo           | Bin 0 -> 394 bytes
 locale/fr_CH/freedombone-backup-local.json    |  35 +++
 locale/fr_CH/freedombone-backup-local.mo      | Bin 0 -> 2324 bytes
 locale/fr_CH/freedombone-backup-remote.json   |  51 ++++
 locale/fr_CH/freedombone-backup-remote.mo     | Bin 0 -> 2983 bytes
 locale/fr_CH/freedombone-blog.json            |   3 +
 locale/fr_CH/freedombone-blog.mo              | Bin 0 -> 395 bytes
 locale/fr_CH/freedombone-client.json          |   3 +
 locale/fr_CH/freedombone-client.mo            | Bin 0 -> 358 bytes
 locale/fr_CH/freedombone-clientcert.json      |   4 +
 locale/fr_CH/freedombone-clientcert.mo        | Bin 0 -> 424 bytes
 locale/fr_CH/freedombone-config.json          | 228 +++++++++++++++++
 locale/fr_CH/freedombone-config.mo            | Bin 0 -> 10560 bytes
 .../fr_CH/freedombone-controlpanel-user.json  | 110 +++++++++
 locale/fr_CH/freedombone-controlpanel-user.mo | Bin 0 -> 6155 bytes
 locale/fr_CH/freedombone-controlpanel.json    | 229 ++++++++++++++++++
 locale/fr_CH/freedombone-controlpanel.mo      | Bin 0 -> 11854 bytes
 locale/fr_CH/freedombone-dhparam.json         |   7 +
 locale/fr_CH/freedombone-dhparam.mo           | Bin 0 -> 580 bytes
 locale/fr_CH/freedombone-encrypt-mail.json    |   8 +
 locale/fr_CH/freedombone-encrypt-mail.mo      | Bin 0 -> 684 bytes
 locale/fr_CH/freedombone-format.json          |   5 +
 locale/fr_CH/freedombone-format.mo            | Bin 0 -> 494 bytes
 locale/fr_CH/freedombone-ignore.json          |   3 +
 locale/fr_CH/freedombone-ignore.mo            | Bin 0 -> 420 bytes
 locale/fr_CH/freedombone-image-customise.json |  11 +
 locale/fr_CH/freedombone-image-customise.mo   | Bin 0 -> 1340 bytes
 .../freedombone-image-hardware-setup.json     |   3 +
 .../fr_CH/freedombone-image-hardware-setup.mo | Bin 0 -> 369 bytes
 locale/fr_CH/freedombone-image-make.json      |   4 +
 locale/fr_CH/freedombone-image-make.mo        | Bin 0 -> 450 bytes
 locale/fr_CH/freedombone-image-mesh.json      |  18 ++
 locale/fr_CH/freedombone-image-mesh.mo        | Bin 0 -> 1355 bytes
 locale/fr_CH/freedombone-image.json           |  10 +
 locale/fr_CH/freedombone-image.mo             | Bin 0 -> 843 bytes
 locale/fr_CH/freedombone-keydrive.json        |  17 ++
 locale/fr_CH/freedombone-keydrive.mo          | Bin 0 -> 1496 bytes
 locale/fr_CH/freedombone-mesh-install.json    |   7 +
 locale/fr_CH/freedombone-mesh-install.mo      | Bin 0 -> 723 bytes
 locale/fr_CH/freedombone-mesh.json            |  11 +
 locale/fr_CH/freedombone-mesh.mo              | Bin 0 -> 858 bytes
 locale/fr_CH/freedombone-meshweb.json         |  27 +++
 locale/fr_CH/freedombone-meshweb.mo           | Bin 0 -> 1875 bytes
 locale/fr_CH/freedombone-mirrors.json         |   8 +
 locale/fr_CH/freedombone-mirrors.mo           | Bin 0 -> 794 bytes
 locale/fr_CH/freedombone-pin-cert.json        |   3 +
 locale/fr_CH/freedombone-pin-cert.mo          | Bin 0 -> 373 bytes
 locale/fr_CH/freedombone-recoverkey.json      |  11 +
 locale/fr_CH/freedombone-recoverkey.mo        | Bin 0 -> 960 bytes
 locale/fr_CH/freedombone-remote.json          |   6 +
 locale/fr_CH/freedombone-remote.mo            | Bin 0 -> 630 bytes
 locale/fr_CH/freedombone-renew-cert.json      |  11 +
 locale/fr_CH/freedombone-renew-cert.mo        | Bin 0 -> 903 bytes
 locale/fr_CH/freedombone-repair-database.json |   4 +
 locale/fr_CH/freedombone-repair-database.mo   | Bin 0 -> 472 bytes
 locale/fr_CH/freedombone-restore-local.json   |  55 +++++
 locale/fr_CH/freedombone-restore-local.mo     | Bin 0 -> 3303 bytes
 locale/fr_CH/freedombone-restore-remote.json  |  41 ++++
 locale/fr_CH/freedombone-restore-remote.mo    | Bin 0 -> 2425 bytes
 locale/fr_CH/freedombone-rmemail.json         |   3 +
 locale/fr_CH/freedombone-rmemail.mo           | Bin 0 -> 394 bytes
 locale/fr_CH/freedombone-rmlist.json          |   3 +
 locale/fr_CH/freedombone-rmlist.mo            | Bin 0 -> 423 bytes
 locale/fr_CH/freedombone-rmsipuser.json       |   6 +
 locale/fr_CH/freedombone-rmsipuser.mo         | Bin 0 -> 530 bytes
 locale/fr_CH/freedombone-rmuser.json          |  10 +
 locale/fr_CH/freedombone-rmuser.mo            | Bin 0 -> 800 bytes
 locale/fr_CH/freedombone-rmxmpp.json          |   3 +
 locale/fr_CH/freedombone-rmxmpp.mo            | Bin 0 -> 377 bytes
 locale/fr_CH/freedombone-sec.json             |  29 +++
 locale/fr_CH/freedombone-sec.mo               | Bin 0 -> 1694 bytes
 locale/fr_CH/freedombone-splitkey.json        |  12 +
 locale/fr_CH/freedombone-splitkey.mo          | Bin 0 -> 1020 bytes
 locale/fr_CH/freedombone-unignore.json        |   3 +
 locale/fr_CH/freedombone-unignore.mo          | Bin 0 -> 422 bytes
 locale/fr_CH/freedombone-update-date.json     |   5 +
 locale/fr_CH/freedombone-update-date.mo       | Bin 0 -> 487 bytes
 locale/fr_CH/freedombone-wifi.json            |   9 +
 locale/fr_CH/freedombone-wifi.mo              | Bin 0 -> 782 bytes
 locale/fr_CH/freedombone-xmpp-pass.json       |   3 +
 locale/fr_CH/freedombone-xmpp-pass.mo         | Bin 0 -> 380 bytes
 locale/fr_CH/freedombone-zram.json            |   3 +
 locale/fr_CH/freedombone-zram.mo              | Bin 0 -> 365 bytes
 locale/fr_CH/freedombone.json                 | 146 +++++++++++
 locale/fr_CH/freedombone.mo                   | Bin 0 -> 10918 bytes
 locale/fr_ca/freedombone-config.json          |   9 +-
 locale/fr_ca/freedombone-controlpanel.json    |  23 +-
 locale/fr_ca/freedombone-dhparam.json         |   2 +
 locale/fr_ca/freedombone-image.json           |   7 +-
 locale/fr_ca/freedombone-wifi.json            |   6 +
 locale/fr_ca/freedombone.json                 |   3 +
 locale/ga/freedombone-config.json             |   9 +-
 locale/ga/freedombone-controlpanel.json       |  23 +-
 locale/ga/freedombone-dhparam.json            |   2 +
 locale/ga/freedombone-image.json              |   7 +-
 locale/ga/freedombone-wifi.json               |   6 +
 locale/ga/freedombone.json                    |   3 +
 locale/gl/freedombone-config.json             |   9 +-
 locale/gl/freedombone-controlpanel.json       |  23 +-
 locale/gl/freedombone-dhparam.json            |   2 +
 locale/gl/freedombone-image.json              |   7 +-
 locale/gl/freedombone-wifi.json               |   6 +
 locale/gl/freedombone.json                    |   3 +
 locale/gu/freedombone-config.json             |   9 +-
 locale/gu/freedombone-controlpanel.json       |  23 +-
 locale/gu/freedombone-dhparam.json            |   2 +
 locale/gu/freedombone-image.json              |   7 +-
 locale/gu/freedombone-wifi.json               |   6 +
 locale/gu/freedombone.json                    |   3 +
 locale/he/freedombone-config.json             |   9 +-
 locale/he/freedombone-controlpanel.json       |  23 +-
 locale/he/freedombone-dhparam.json            |   2 +
 locale/he/freedombone-image.json              |   7 +-
 locale/he/freedombone-wifi.json               |   6 +
 locale/he/freedombone.json                    |   3 +
 locale/hi/freedombone-config.json             |   9 +-
 locale/hi/freedombone-controlpanel.json       |  23 +-
 locale/hi/freedombone-dhparam.json            |   2 +
 locale/hi/freedombone-image.json              |   7 +-
 locale/hi/freedombone-wifi.json               |   6 +
 locale/hi/freedombone.json                    |   3 +
 locale/hr/freedombone-config.json             |   9 +-
 locale/hr/freedombone-controlpanel.json       |  23 +-
 locale/hr/freedombone-dhparam.json            |   2 +
 locale/hr/freedombone-image.json              |   7 +-
 locale/hr/freedombone-wifi.json               |   6 +
 locale/hr/freedombone.json                    |   3 +
 locale/hu/freedombone-config.json             |   9 +-
 locale/hu/freedombone-controlpanel.json       |  23 +-
 locale/hu/freedombone-dhparam.json            |   2 +
 locale/hu/freedombone-image.json              |   7 +-
 locale/hu/freedombone-wifi.json               |   6 +
 locale/hu/freedombone.json                    |   3 +
 locale/id/freedombone-config.json             |   9 +-
 locale/id/freedombone-controlpanel.json       |  23 +-
 locale/id/freedombone-dhparam.json            |   2 +
 locale/id/freedombone-image.json              |   7 +-
 locale/id/freedombone-wifi.json               |   6 +
 locale/id/freedombone.json                    |   3 +
 locale/is/freedombone-config.json             |   9 +-
 locale/is/freedombone-controlpanel.json       |  23 +-
 locale/is/freedombone-dhparam.json            |   2 +
 locale/is/freedombone-image.json              |   7 +-
 locale/is/freedombone-wifi.json               |   6 +
 locale/is/freedombone.json                    |   3 +
 locale/it/freedombone-config.json             |   9 +-
 locale/it/freedombone-controlpanel.json       |  23 +-
 locale/it/freedombone-dhparam.json            |   2 +
 locale/it/freedombone-image.json              |   7 +-
 locale/it/freedombone-wifi.json               |   6 +
 locale/it/freedombone.json                    |   3 +
 locale/ja/freedombone-config.json             |   9 +-
 locale/ja/freedombone-controlpanel.json       |  23 +-
 locale/ja/freedombone-dhparam.json            |   2 +
 locale/ja/freedombone-image.json              |   7 +-
 locale/ja/freedombone-wifi.json               |   6 +
 locale/ja/freedombone.json                    |   3 +
 locale/ka/freedombone-config.json             |   9 +-
 locale/ka/freedombone-controlpanel.json       |  23 +-
 locale/ka/freedombone-dhparam.json            |   2 +
 locale/ka/freedombone-image.json              |   7 +-
 locale/ka/freedombone-wifi.json               |   6 +
 locale/ka/freedombone.json                    |   3 +
 locale/km/freedombone-config.json             |   9 +-
 locale/km/freedombone-controlpanel.json       |  23 +-
 locale/km/freedombone-dhparam.json            |   2 +
 locale/km/freedombone-image.json              |   7 +-
 locale/km/freedombone-wifi.json               |   6 +
 locale/km/freedombone.json                    |   3 +
 locale/kn/freedombone-config.json             |   9 +-
 locale/kn/freedombone-controlpanel.json       |  23 +-
 locale/kn/freedombone-dhparam.json            |   2 +
 locale/kn/freedombone-image.json              |   7 +-
 locale/kn/freedombone-wifi.json               |   6 +
 locale/kn/freedombone.json                    |   3 +
 locale/ko/freedombone-config.json             |   9 +-
 locale/ko/freedombone-controlpanel.json       |  23 +-
 locale/ko/freedombone-dhparam.json            |   2 +
 locale/ko/freedombone-image.json              |   7 +-
 locale/ko/freedombone-wifi.json               |   6 +
 locale/ko/freedombone.json                    |   3 +
 locale/lo/freedombone-config.json             |   9 +-
 locale/lo/freedombone-controlpanel.json       |  23 +-
 locale/lo/freedombone-dhparam.json            |   2 +
 locale/lo/freedombone-image.json              |   7 +-
 locale/lo/freedombone-wifi.json               |   6 +
 locale/lo/freedombone.json                    |   3 +
 locale/lt/freedombone-config.json             |   9 +-
 locale/lt/freedombone-controlpanel.json       |  23 +-
 locale/lt/freedombone-dhparam.json            |   2 +
 locale/lt/freedombone-image.json              |   7 +-
 locale/lt/freedombone-wifi.json               |   6 +
 locale/lt/freedombone.json                    |   3 +
 locale/lv/freedombone-config.json             |   9 +-
 locale/lv/freedombone-controlpanel.json       |  23 +-
 locale/lv/freedombone-dhparam.json            |   2 +
 locale/lv/freedombone-image.json              |   7 +-
 locale/lv/freedombone-wifi.json               |   6 +
 locale/lv/freedombone.json                    |   3 +
 locale/mi_tn/freedombone-config.json          |   9 +-
 locale/mi_tn/freedombone-controlpanel.json    |  23 +-
 locale/mi_tn/freedombone-dhparam.json         |   2 +
 locale/mi_tn/freedombone-image.json           |   7 +-
 locale/mi_tn/freedombone-wifi.json            |   6 +
 locale/mi_tn/freedombone.json                 |   3 +
 locale/mi_wwow/freedombone-config.json        |   9 +-
 locale/mi_wwow/freedombone-controlpanel.json  |  23 +-
 locale/mi_wwow/freedombone-dhparam.json       |   2 +
 locale/mi_wwow/freedombone-image.json         |   7 +-
 locale/mi_wwow/freedombone-wifi.json          |   6 +
 locale/mi_wwow/freedombone.json               |   3 +
 locale/ml/freedombone-config.json             |   9 +-
 locale/ml/freedombone-controlpanel.json       |  23 +-
 locale/ml/freedombone-dhparam.json            |   2 +
 locale/ml/freedombone-image.json              |   7 +-
 locale/ml/freedombone-wifi.json               |   6 +
 locale/ml/freedombone.json                    |   3 +
 locale/mn/freedombone-config.json             |   9 +-
 locale/mn/freedombone-controlpanel.json       |  23 +-
 locale/mn/freedombone-dhparam.json            |   2 +
 locale/mn/freedombone-image.json              |   7 +-
 locale/mn/freedombone-wifi.json               |   6 +
 locale/mn/freedombone.json                    |   3 +
 locale/ms/freedombone-config.json             |   9 +-
 locale/ms/freedombone-controlpanel.json       |  23 +-
 locale/ms/freedombone-dhparam.json            |   2 +
 locale/ms/freedombone-image.json              |   7 +-
 locale/ms/freedombone-wifi.json               |   6 +
 locale/ms/freedombone.json                    |   3 +
 locale/nl/freedombone-config.json             |   9 +-
 locale/nl/freedombone-controlpanel.json       |  23 +-
 locale/nl/freedombone-dhparam.json            |   2 +
 locale/nl/freedombone-image.json              |   7 +-
 locale/nl/freedombone-wifi.json               |   6 +
 locale/nl/freedombone.json                    |   3 +
 locale/nn/freedombone-config.json             |   9 +-
 locale/nn/freedombone-controlpanel.json       |  23 +-
 locale/nn/freedombone-dhparam.json            |   2 +
 locale/nn/freedombone-image.json              |   7 +-
 locale/nn/freedombone-wifi.json               |   6 +
 locale/nn/freedombone.json                    |   3 +
 locale/no/freedombone-config.json             |   9 +-
 locale/no/freedombone-controlpanel.json       |  23 +-
 locale/no/freedombone-dhparam.json            |   2 +
 locale/no/freedombone-image.json              |   7 +-
 locale/no/freedombone-wifi.json               |   6 +
 locale/no/freedombone.json                    |   3 +
 locale/no_gr/freedombone-config.json          |   9 +-
 locale/no_gr/freedombone-controlpanel.json    |  23 +-
 locale/no_gr/freedombone-dhparam.json         |   2 +
 locale/no_gr/freedombone-image.json           |   7 +-
 locale/no_gr/freedombone-wifi.json            |   6 +
 locale/no_gr/freedombone.json                 |   3 +
 locale/pl/freedombone-config.json             |   9 +-
 locale/pl/freedombone-controlpanel.json       |  23 +-
 locale/pl/freedombone-dhparam.json            |   2 +
 locale/pl/freedombone-image.json              |   7 +-
 locale/pl/freedombone-wifi.json               |   6 +
 locale/pl/freedombone.json                    |   3 +
 locale/pt/freedombone-config.json             |   9 +-
 locale/pt/freedombone-controlpanel.json       |  23 +-
 locale/pt/freedombone-dhparam.json            |   2 +
 locale/pt/freedombone-image.json              |   7 +-
 locale/pt/freedombone-wifi.json               |   6 +
 locale/pt/freedombone.json                    |   3 +
 locale/pt_br/freedombone-config.json          |   9 +-
 locale/pt_br/freedombone-controlpanel.json    |  23 +-
 locale/pt_br/freedombone-dhparam.json         |   2 +
 locale/pt_br/freedombone-image.json           |   7 +-
 locale/pt_br/freedombone-wifi.json            |   6 +
 locale/pt_br/freedombone.json                 |   3 +
 locale/ro/freedombone-config.json             |   9 +-
 locale/ro/freedombone-controlpanel.json       |  23 +-
 locale/ro/freedombone-dhparam.json            |   2 +
 locale/ro/freedombone-image.json              |   7 +-
 locale/ro/freedombone-wifi.json               |   6 +
 locale/ro/freedombone.json                    |   3 +
 locale/ru/freedombone-config.json             |   9 +-
 locale/ru/freedombone-controlpanel.json       |  23 +-
 locale/ru/freedombone-dhparam.json            |   2 +
 locale/ru/freedombone-image.json              |   7 +-
 locale/ru/freedombone-wifi.json               |   6 +
 locale/ru/freedombone.json                    |   3 +
 locale/sk/freedombone-config.json             |   9 +-
 locale/sk/freedombone-controlpanel.json       |  23 +-
 locale/sk/freedombone-dhparam.json            |   2 +
 locale/sk/freedombone-image.json              |   7 +-
 locale/sk/freedombone-wifi.json               |   6 +
 locale/sk/freedombone.json                    |   3 +
 locale/sl/freedombone-config.json             |   9 +-
 locale/sl/freedombone-controlpanel.json       |  23 +-
 locale/sl/freedombone-dhparam.json            |   2 +
 locale/sl/freedombone-image.json              |   7 +-
 locale/sl/freedombone-wifi.json               |   6 +
 locale/sl/freedombone.json                    |   3 +
 locale/sm/freedombone-config.json             |   9 +-
 locale/sm/freedombone-controlpanel.json       |  23 +-
 locale/sm/freedombone-dhparam.json            |   2 +
 locale/sm/freedombone-image.json              |   7 +-
 locale/sm/freedombone-wifi.json               |   6 +
 locale/sm/freedombone.json                    |   3 +
 locale/so/freedombone-config.json             |   9 +-
 locale/so/freedombone-controlpanel.json       |  23 +-
 locale/so/freedombone-dhparam.json            |   2 +
 locale/so/freedombone-image.json              |   7 +-
 locale/so/freedombone-wifi.json               |   6 +
 locale/so/freedombone.json                    |   3 +
 locale/sq/freedombone-config.json             |   9 +-
 locale/sq/freedombone-controlpanel.json       |  23 +-
 locale/sq/freedombone-dhparam.json            |   2 +
 locale/sq/freedombone-image.json              |   7 +-
 locale/sq/freedombone-wifi.json               |   6 +
 locale/sq/freedombone.json                    |   3 +
 locale/sr/freedombone-config.json             |   9 +-
 locale/sr/freedombone-controlpanel.json       |  23 +-
 locale/sr/freedombone-dhparam.json            |   2 +
 locale/sr/freedombone-image.json              |   7 +-
 locale/sr/freedombone-wifi.json               |   6 +
 locale/sr/freedombone.json                    |   3 +
 locale/sv/freedombone-config.json             |   9 +-
 locale/sv/freedombone-controlpanel.json       |  23 +-
 locale/sv/freedombone-dhparam.json            |   2 +
 locale/sv/freedombone-image.json              |   7 +-
 locale/sv/freedombone-wifi.json               |   6 +
 locale/sv/freedombone.json                    |   3 +
 locale/ta/freedombone-config.json             |   9 +-
 locale/ta/freedombone-controlpanel.json       |  23 +-
 locale/ta/freedombone-dhparam.json            |   2 +
 locale/ta/freedombone-image.json              |   7 +-
 locale/ta/freedombone-wifi.json               |   6 +
 locale/ta/freedombone.json                    |   3 +
 locale/th/freedombone-config.json             |   9 +-
 locale/th/freedombone-controlpanel.json       |  23 +-
 locale/th/freedombone-dhparam.json            |   2 +
 locale/th/freedombone-image.json              |   7 +-
 locale/th/freedombone-wifi.json               |   6 +
 locale/th/freedombone.json                    |   3 +
 locale/tl/freedombone-config.json             |   9 +-
 locale/tl/freedombone-controlpanel.json       |  23 +-
 locale/tl/freedombone-dhparam.json            |   2 +
 locale/tl/freedombone-image.json              |   7 +-
 locale/tl/freedombone-wifi.json               |   6 +
 locale/tl/freedombone.json                    |   3 +
 locale/to/freedombone-config.json             |   9 +-
 locale/to/freedombone-controlpanel.json       |  23 +-
 locale/to/freedombone-dhparam.json            |   2 +
 locale/to/freedombone-image.json              |   7 +-
 locale/to/freedombone-wifi.json               |   6 +
 locale/to/freedombone.json                    |   3 +
 locale/tr/freedombone-config.json             |   9 +-
 locale/tr/freedombone-controlpanel.json       |  23 +-
 locale/tr/freedombone-dhparam.json            |   2 +
 locale/tr/freedombone-image.json              |   7 +-
 locale/tr/freedombone-wifi.json               |   6 +
 locale/tr/freedombone.json                    |   3 +
 locale/uk/freedombone-config.json             |   9 +-
 locale/uk/freedombone-controlpanel.json       |  23 +-
 locale/uk/freedombone-dhparam.json            |   2 +
 locale/uk/freedombone-image.json              |   7 +-
 locale/uk/freedombone-wifi.json               |   6 +
 locale/uk/freedombone.json                    |   3 +
 locale/vi/freedombone-config.json             |   9 +-
 locale/vi/freedombone-controlpanel.json       |  23 +-
 locale/vi/freedombone-dhparam.json            |   2 +
 locale/vi/freedombone-image.json              |   7 +-
 locale/vi/freedombone-wifi.json               |   6 +
 locale/vi/freedombone.json                    |   3 +
 locale/zh_cn/freedombone-config.json          |   9 +-
 locale/zh_cn/freedombone-controlpanel.json    |  23 +-
 locale/zh_cn/freedombone-dhparam.json         |   2 +
 locale/zh_cn/freedombone-image.json           |   7 +-
 locale/zh_cn/freedombone-wifi.json            |   6 +
 locale/zh_cn/freedombone.json                 |   3 +
 locale/zh_tw/freedombone-config.json          |   9 +-
 locale/zh_tw/freedombone-controlpanel.json    |  23 +-
 locale/zh_tw/freedombone-dhparam.json         |   2 +
 locale/zh_tw/freedombone-image.json           |   7 +-
 locale/zh_tw/freedombone-wifi.json            |   6 +
 locale/zh_tw/freedombone.json                 |   3 +
 600 files changed, 4658 insertions(+), 1156 deletions(-)
 create mode 100644 locale/fr_BE/freedombone-addcert.json
 create mode 100644 locale/fr_BE/freedombone-addcert.mo
 create mode 100644 locale/fr_BE/freedombone-addemail.json
 create mode 100644 locale/fr_BE/freedombone-addemail.mo
 create mode 100644 locale/fr_BE/freedombone-addlist.json
 create mode 100644 locale/fr_BE/freedombone-addlist.mo
 create mode 100644 locale/fr_BE/freedombone-addsipuser.json
 create mode 100644 locale/fr_BE/freedombone-addsipuser.mo
 create mode 100644 locale/fr_BE/freedombone-adduser.json
 create mode 100644 locale/fr_BE/freedombone-adduser.mo
 create mode 100644 locale/fr_BE/freedombone-addxmpp.json
 create mode 100644 locale/fr_BE/freedombone-addxmpp.mo
 create mode 100644 locale/fr_BE/freedombone-backup-local.json
 create mode 100644 locale/fr_BE/freedombone-backup-local.mo
 create mode 100644 locale/fr_BE/freedombone-backup-remote.json
 create mode 100644 locale/fr_BE/freedombone-backup-remote.mo
 create mode 100644 locale/fr_BE/freedombone-blog.json
 create mode 100644 locale/fr_BE/freedombone-blog.mo
 create mode 100644 locale/fr_BE/freedombone-client.json
 create mode 100644 locale/fr_BE/freedombone-client.mo
 create mode 100644 locale/fr_BE/freedombone-clientcert.json
 create mode 100644 locale/fr_BE/freedombone-clientcert.mo
 create mode 100644 locale/fr_BE/freedombone-config.json
 create mode 100644 locale/fr_BE/freedombone-config.mo
 create mode 100644 locale/fr_BE/freedombone-controlpanel-user.json
 create mode 100644 locale/fr_BE/freedombone-controlpanel-user.mo
 create mode 100644 locale/fr_BE/freedombone-controlpanel.json
 create mode 100644 locale/fr_BE/freedombone-controlpanel.mo
 create mode 100644 locale/fr_BE/freedombone-dhparam.json
 create mode 100644 locale/fr_BE/freedombone-dhparam.mo
 create mode 100644 locale/fr_BE/freedombone-encrypt-mail.json
 create mode 100644 locale/fr_BE/freedombone-encrypt-mail.mo
 create mode 100644 locale/fr_BE/freedombone-format.json
 create mode 100644 locale/fr_BE/freedombone-format.mo
 create mode 100644 locale/fr_BE/freedombone-ignore.json
 create mode 100644 locale/fr_BE/freedombone-ignore.mo
 create mode 100644 locale/fr_BE/freedombone-image-customise.json
 create mode 100644 locale/fr_BE/freedombone-image-customise.mo
 create mode 100644 locale/fr_BE/freedombone-image-hardware-setup.json
 create mode 100644 locale/fr_BE/freedombone-image-hardware-setup.mo
 create mode 100644 locale/fr_BE/freedombone-image-make.json
 create mode 100644 locale/fr_BE/freedombone-image-make.mo
 create mode 100644 locale/fr_BE/freedombone-image-mesh.json
 create mode 100644 locale/fr_BE/freedombone-image-mesh.mo
 create mode 100644 locale/fr_BE/freedombone-image.json
 create mode 100644 locale/fr_BE/freedombone-image.mo
 create mode 100644 locale/fr_BE/freedombone-keydrive.json
 create mode 100644 locale/fr_BE/freedombone-keydrive.mo
 create mode 100644 locale/fr_BE/freedombone-mesh-install.json
 create mode 100644 locale/fr_BE/freedombone-mesh-install.mo
 create mode 100644 locale/fr_BE/freedombone-mesh.json
 create mode 100644 locale/fr_BE/freedombone-mesh.mo
 create mode 100644 locale/fr_BE/freedombone-meshweb.json
 create mode 100644 locale/fr_BE/freedombone-meshweb.mo
 create mode 100644 locale/fr_BE/freedombone-mirrors.json
 create mode 100644 locale/fr_BE/freedombone-mirrors.mo
 create mode 100644 locale/fr_BE/freedombone-pin-cert.json
 create mode 100644 locale/fr_BE/freedombone-pin-cert.mo
 create mode 100644 locale/fr_BE/freedombone-recoverkey.json
 create mode 100644 locale/fr_BE/freedombone-recoverkey.mo
 create mode 100644 locale/fr_BE/freedombone-remote.json
 create mode 100644 locale/fr_BE/freedombone-remote.mo
 create mode 100644 locale/fr_BE/freedombone-renew-cert.json
 create mode 100644 locale/fr_BE/freedombone-renew-cert.mo
 create mode 100644 locale/fr_BE/freedombone-repair-database.json
 create mode 100644 locale/fr_BE/freedombone-repair-database.mo
 create mode 100644 locale/fr_BE/freedombone-restore-local.json
 create mode 100644 locale/fr_BE/freedombone-restore-local.mo
 create mode 100644 locale/fr_BE/freedombone-restore-remote.json
 create mode 100644 locale/fr_BE/freedombone-restore-remote.mo
 create mode 100644 locale/fr_BE/freedombone-rmemail.json
 create mode 100644 locale/fr_BE/freedombone-rmemail.mo
 create mode 100644 locale/fr_BE/freedombone-rmlist.json
 create mode 100644 locale/fr_BE/freedombone-rmlist.mo
 create mode 100644 locale/fr_BE/freedombone-rmsipuser.json
 create mode 100644 locale/fr_BE/freedombone-rmsipuser.mo
 create mode 100644 locale/fr_BE/freedombone-rmuser.json
 create mode 100644 locale/fr_BE/freedombone-rmuser.mo
 create mode 100644 locale/fr_BE/freedombone-rmxmpp.json
 create mode 100644 locale/fr_BE/freedombone-rmxmpp.mo
 create mode 100644 locale/fr_BE/freedombone-sec.json
 create mode 100644 locale/fr_BE/freedombone-sec.mo
 create mode 100644 locale/fr_BE/freedombone-splitkey.json
 create mode 100644 locale/fr_BE/freedombone-splitkey.mo
 create mode 100644 locale/fr_BE/freedombone-unignore.json
 create mode 100644 locale/fr_BE/freedombone-unignore.mo
 create mode 100644 locale/fr_BE/freedombone-update-date.json
 create mode 100644 locale/fr_BE/freedombone-update-date.mo
 create mode 100644 locale/fr_BE/freedombone-wifi.json
 create mode 100644 locale/fr_BE/freedombone-wifi.mo
 create mode 100644 locale/fr_BE/freedombone-xmpp-pass.json
 create mode 100644 locale/fr_BE/freedombone-xmpp-pass.mo
 create mode 100644 locale/fr_BE/freedombone-zram.json
 create mode 100644 locale/fr_BE/freedombone-zram.mo
 create mode 100644 locale/fr_BE/freedombone.json
 create mode 100644 locale/fr_BE/freedombone.mo
 create mode 100644 locale/fr_CH/freedombone-addcert.json
 create mode 100644 locale/fr_CH/freedombone-addcert.mo
 create mode 100644 locale/fr_CH/freedombone-addemail.json
 create mode 100644 locale/fr_CH/freedombone-addemail.mo
 create mode 100644 locale/fr_CH/freedombone-addlist.json
 create mode 100644 locale/fr_CH/freedombone-addlist.mo
 create mode 100644 locale/fr_CH/freedombone-addsipuser.json
 create mode 100644 locale/fr_CH/freedombone-addsipuser.mo
 create mode 100644 locale/fr_CH/freedombone-adduser.json
 create mode 100644 locale/fr_CH/freedombone-adduser.mo
 create mode 100644 locale/fr_CH/freedombone-addxmpp.json
 create mode 100644 locale/fr_CH/freedombone-addxmpp.mo
 create mode 100644 locale/fr_CH/freedombone-backup-local.json
 create mode 100644 locale/fr_CH/freedombone-backup-local.mo
 create mode 100644 locale/fr_CH/freedombone-backup-remote.json
 create mode 100644 locale/fr_CH/freedombone-backup-remote.mo
 create mode 100644 locale/fr_CH/freedombone-blog.json
 create mode 100644 locale/fr_CH/freedombone-blog.mo
 create mode 100644 locale/fr_CH/freedombone-client.json
 create mode 100644 locale/fr_CH/freedombone-client.mo
 create mode 100644 locale/fr_CH/freedombone-clientcert.json
 create mode 100644 locale/fr_CH/freedombone-clientcert.mo
 create mode 100644 locale/fr_CH/freedombone-config.json
 create mode 100644 locale/fr_CH/freedombone-config.mo
 create mode 100644 locale/fr_CH/freedombone-controlpanel-user.json
 create mode 100644 locale/fr_CH/freedombone-controlpanel-user.mo
 create mode 100644 locale/fr_CH/freedombone-controlpanel.json
 create mode 100644 locale/fr_CH/freedombone-controlpanel.mo
 create mode 100644 locale/fr_CH/freedombone-dhparam.json
 create mode 100644 locale/fr_CH/freedombone-dhparam.mo
 create mode 100644 locale/fr_CH/freedombone-encrypt-mail.json
 create mode 100644 locale/fr_CH/freedombone-encrypt-mail.mo
 create mode 100644 locale/fr_CH/freedombone-format.json
 create mode 100644 locale/fr_CH/freedombone-format.mo
 create mode 100644 locale/fr_CH/freedombone-ignore.json
 create mode 100644 locale/fr_CH/freedombone-ignore.mo
 create mode 100644 locale/fr_CH/freedombone-image-customise.json
 create mode 100644 locale/fr_CH/freedombone-image-customise.mo
 create mode 100644 locale/fr_CH/freedombone-image-hardware-setup.json
 create mode 100644 locale/fr_CH/freedombone-image-hardware-setup.mo
 create mode 100644 locale/fr_CH/freedombone-image-make.json
 create mode 100644 locale/fr_CH/freedombone-image-make.mo
 create mode 100644 locale/fr_CH/freedombone-image-mesh.json
 create mode 100644 locale/fr_CH/freedombone-image-mesh.mo
 create mode 100644 locale/fr_CH/freedombone-image.json
 create mode 100644 locale/fr_CH/freedombone-image.mo
 create mode 100644 locale/fr_CH/freedombone-keydrive.json
 create mode 100644 locale/fr_CH/freedombone-keydrive.mo
 create mode 100644 locale/fr_CH/freedombone-mesh-install.json
 create mode 100644 locale/fr_CH/freedombone-mesh-install.mo
 create mode 100644 locale/fr_CH/freedombone-mesh.json
 create mode 100644 locale/fr_CH/freedombone-mesh.mo
 create mode 100644 locale/fr_CH/freedombone-meshweb.json
 create mode 100644 locale/fr_CH/freedombone-meshweb.mo
 create mode 100644 locale/fr_CH/freedombone-mirrors.json
 create mode 100644 locale/fr_CH/freedombone-mirrors.mo
 create mode 100644 locale/fr_CH/freedombone-pin-cert.json
 create mode 100644 locale/fr_CH/freedombone-pin-cert.mo
 create mode 100644 locale/fr_CH/freedombone-recoverkey.json
 create mode 100644 locale/fr_CH/freedombone-recoverkey.mo
 create mode 100644 locale/fr_CH/freedombone-remote.json
 create mode 100644 locale/fr_CH/freedombone-remote.mo
 create mode 100644 locale/fr_CH/freedombone-renew-cert.json
 create mode 100644 locale/fr_CH/freedombone-renew-cert.mo
 create mode 100644 locale/fr_CH/freedombone-repair-database.json
 create mode 100644 locale/fr_CH/freedombone-repair-database.mo
 create mode 100644 locale/fr_CH/freedombone-restore-local.json
 create mode 100644 locale/fr_CH/freedombone-restore-local.mo
 create mode 100644 locale/fr_CH/freedombone-restore-remote.json
 create mode 100644 locale/fr_CH/freedombone-restore-remote.mo
 create mode 100644 locale/fr_CH/freedombone-rmemail.json
 create mode 100644 locale/fr_CH/freedombone-rmemail.mo
 create mode 100644 locale/fr_CH/freedombone-rmlist.json
 create mode 100644 locale/fr_CH/freedombone-rmlist.mo
 create mode 100644 locale/fr_CH/freedombone-rmsipuser.json
 create mode 100644 locale/fr_CH/freedombone-rmsipuser.mo
 create mode 100644 locale/fr_CH/freedombone-rmuser.json
 create mode 100644 locale/fr_CH/freedombone-rmuser.mo
 create mode 100644 locale/fr_CH/freedombone-rmxmpp.json
 create mode 100644 locale/fr_CH/freedombone-rmxmpp.mo
 create mode 100644 locale/fr_CH/freedombone-sec.json
 create mode 100644 locale/fr_CH/freedombone-sec.mo
 create mode 100644 locale/fr_CH/freedombone-splitkey.json
 create mode 100644 locale/fr_CH/freedombone-splitkey.mo
 create mode 100644 locale/fr_CH/freedombone-unignore.json
 create mode 100644 locale/fr_CH/freedombone-unignore.mo
 create mode 100644 locale/fr_CH/freedombone-update-date.json
 create mode 100644 locale/fr_CH/freedombone-update-date.mo
 create mode 100644 locale/fr_CH/freedombone-wifi.json
 create mode 100644 locale/fr_CH/freedombone-wifi.mo
 create mode 100644 locale/fr_CH/freedombone-xmpp-pass.json
 create mode 100644 locale/fr_CH/freedombone-xmpp-pass.mo
 create mode 100644 locale/fr_CH/freedombone-zram.json
 create mode 100644 locale/fr_CH/freedombone-zram.mo
 create mode 100644 locale/fr_CH/freedombone.json
 create mode 100644 locale/fr_CH/freedombone.mo

diff --git a/locale/af/freedombone-config.json b/locale/af/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/af/freedombone-config.json
+++ b/locale/af/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/af/freedombone-controlpanel.json b/locale/af/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/af/freedombone-controlpanel.json
+++ b/locale/af/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone-dhparam.json b/locale/af/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/af/freedombone-dhparam.json
+++ b/locale/af/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone-image.json b/locale/af/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/af/freedombone-image.json
+++ b/locale/af/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone-wifi.json b/locale/af/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/af/freedombone-wifi.json
+++ b/locale/af/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone.json b/locale/af/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/af/freedombone.json
+++ b/locale/af/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ar/freedombone-config.json b/locale/ar/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ar/freedombone-config.json
+++ b/locale/ar/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ar/freedombone-controlpanel.json b/locale/ar/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ar/freedombone-controlpanel.json
+++ b/locale/ar/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone-dhparam.json b/locale/ar/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ar/freedombone-dhparam.json
+++ b/locale/ar/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone-image.json b/locale/ar/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ar/freedombone-image.json
+++ b/locale/ar/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone-wifi.json b/locale/ar/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ar/freedombone-wifi.json
+++ b/locale/ar/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone.json b/locale/ar/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ar/freedombone.json
+++ b/locale/ar/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/be/freedombone-config.json b/locale/be/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/be/freedombone-config.json
+++ b/locale/be/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/be/freedombone-controlpanel.json b/locale/be/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/be/freedombone-controlpanel.json
+++ b/locale/be/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone-dhparam.json b/locale/be/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/be/freedombone-dhparam.json
+++ b/locale/be/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone-image.json b/locale/be/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/be/freedombone-image.json
+++ b/locale/be/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone-wifi.json b/locale/be/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/be/freedombone-wifi.json
+++ b/locale/be/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone.json b/locale/be/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/be/freedombone.json
+++ b/locale/be/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/bg/freedombone-config.json b/locale/bg/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/bg/freedombone-config.json
+++ b/locale/bg/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/bg/freedombone-controlpanel.json b/locale/bg/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/bg/freedombone-controlpanel.json
+++ b/locale/bg/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone-dhparam.json b/locale/bg/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/bg/freedombone-dhparam.json
+++ b/locale/bg/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone-image.json b/locale/bg/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/bg/freedombone-image.json
+++ b/locale/bg/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone-wifi.json b/locale/bg/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/bg/freedombone-wifi.json
+++ b/locale/bg/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone.json b/locale/bg/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/bg/freedombone.json
+++ b/locale/bg/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/bs/freedombone-config.json b/locale/bs/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/bs/freedombone-config.json
+++ b/locale/bs/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/bs/freedombone-controlpanel.json b/locale/bs/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/bs/freedombone-controlpanel.json
+++ b/locale/bs/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone-dhparam.json b/locale/bs/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/bs/freedombone-dhparam.json
+++ b/locale/bs/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone-image.json b/locale/bs/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/bs/freedombone-image.json
+++ b/locale/bs/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone-wifi.json b/locale/bs/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/bs/freedombone-wifi.json
+++ b/locale/bs/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone.json b/locale/bs/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/bs/freedombone.json
+++ b/locale/bs/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ca/freedombone-config.json b/locale/ca/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ca/freedombone-config.json
+++ b/locale/ca/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ca/freedombone-controlpanel.json b/locale/ca/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ca/freedombone-controlpanel.json
+++ b/locale/ca/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone-dhparam.json b/locale/ca/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ca/freedombone-dhparam.json
+++ b/locale/ca/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone-image.json b/locale/ca/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ca/freedombone-image.json
+++ b/locale/ca/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone-wifi.json b/locale/ca/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ca/freedombone-wifi.json
+++ b/locale/ca/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone.json b/locale/ca/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ca/freedombone.json
+++ b/locale/ca/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/cs/freedombone-config.json b/locale/cs/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/cs/freedombone-config.json
+++ b/locale/cs/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/cs/freedombone-controlpanel.json b/locale/cs/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/cs/freedombone-controlpanel.json
+++ b/locale/cs/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone-dhparam.json b/locale/cs/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/cs/freedombone-dhparam.json
+++ b/locale/cs/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone-image.json b/locale/cs/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/cs/freedombone-image.json
+++ b/locale/cs/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone-wifi.json b/locale/cs/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/cs/freedombone-wifi.json
+++ b/locale/cs/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone.json b/locale/cs/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/cs/freedombone.json
+++ b/locale/cs/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/da/freedombone-config.json b/locale/da/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/da/freedombone-config.json
+++ b/locale/da/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/da/freedombone-controlpanel.json b/locale/da/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/da/freedombone-controlpanel.json
+++ b/locale/da/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone-dhparam.json b/locale/da/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/da/freedombone-dhparam.json
+++ b/locale/da/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone-image.json b/locale/da/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/da/freedombone-image.json
+++ b/locale/da/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone-wifi.json b/locale/da/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/da/freedombone-wifi.json
+++ b/locale/da/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone.json b/locale/da/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/da/freedombone.json
+++ b/locale/da/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/de/freedombone-config.json b/locale/de/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/de/freedombone-config.json
+++ b/locale/de/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/de/freedombone-controlpanel.json b/locale/de/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/de/freedombone-controlpanel.json
+++ b/locale/de/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-dhparam.json b/locale/de/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/de/freedombone-dhparam.json
+++ b/locale/de/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-image.json b/locale/de/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/de/freedombone-image.json
+++ b/locale/de/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-wifi.json b/locale/de/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/de/freedombone-wifi.json
+++ b/locale/de/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone.json b/locale/de/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/de/freedombone.json
+++ b/locale/de/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/de_du/freedombone-config.json b/locale/de_du/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/de_du/freedombone-config.json
+++ b/locale/de_du/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/de_du/freedombone-controlpanel.json b/locale/de_du/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/de_du/freedombone-controlpanel.json
+++ b/locale/de_du/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone-dhparam.json b/locale/de_du/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/de_du/freedombone-dhparam.json
+++ b/locale/de_du/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone-image.json b/locale/de_du/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/de_du/freedombone-image.json
+++ b/locale/de_du/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone-wifi.json b/locale/de_du/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/de_du/freedombone-wifi.json
+++ b/locale/de_du/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone.json b/locale/de_du/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/de_du/freedombone.json
+++ b/locale/de_du/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/el/freedombone-config.json b/locale/el/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/el/freedombone-config.json
+++ b/locale/el/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/el/freedombone-controlpanel.json b/locale/el/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/el/freedombone-controlpanel.json
+++ b/locale/el/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone-dhparam.json b/locale/el/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/el/freedombone-dhparam.json
+++ b/locale/el/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone-image.json b/locale/el/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/el/freedombone-image.json
+++ b/locale/el/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone-wifi.json b/locale/el/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/el/freedombone-wifi.json
+++ b/locale/el/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone.json b/locale/el/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/el/freedombone.json
+++ b/locale/el/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/en_us/freedombone-config.json b/locale/en_us/freedombone-config.json
index af2f12e02..bbda8d6ca 100644
--- a/locale/en_us/freedombone-config.json
+++ b/locale/en_us/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "Set your username for the system\\n\\nYour username should not contain any spaces",
     "Don't use the default user account": "Don't use the default user account",
     "The directory /home/$MY_USERNAME does not exist": "The directory /home/$MY_USERNAME does not exist",
+    "Your full name (or nick)": "Your full name (or nick)",
     "Install Target": "Install Target",
     "\\nAre you installing onto a Beaglebone Black?": "\\nAre you installing onto a Beaglebone Black?",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.",
@@ -189,19 +190,11 @@
     "ValiDOM": "ValiDOM",
     "Freie Unzensierte": "Freie Unzensierte",
     "Google": "Google",
-    "Wifi Settings": "Wifi Settings",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:",
-    "Interface:": "Interface:",
-    "SSID:": "SSID:",
-    "Type:": "Type:",
-    "Passphrase:": "Passphrase:",
-    "Hotspot:": "Hotspot:",
     "Choose Dynamic DNS provider:": "Choose Dynamic DNS provider:",
     "Dynamic DNS provider username": "Dynamic DNS provider username",
     "Dynamic DNS provider password": "Dynamic DNS provider password",
     "Password quality check": "Password quality check",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.",
-    "Your full name (or nick)": "Your full name (or nick)",
     "Static local IP address": "Static local IP address",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10",
     "Local Network Configuration": "Local Network Configuration",
diff --git a/locale/en_us/freedombone-controlpanel.json b/locale/en_us/freedombone-controlpanel.json
index 5b96a6141..cdc92185c 100644
--- a/locale/en_us/freedombone-controlpanel.json
+++ b/locale/en_us/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "Set the IP address of your internet router/modem",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar",
     "Wifi Settings": "Wifi Settings",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:",
-    "Interface:": "Interface:",
+    "Wifi settings were changed": "Wifi settings were changed",
+    "Hotspot Settings": "Hotspot Settings",
+    "Enabled (yes/no):": "Enabled (yes/no):",
     "SSID:": "SSID:",
-    "Type:": "Type:",
+    "Type (wpa2-psk/none):": "Type (wpa2-psk/none):",
     "Passphrase:": "Passphrase:",
-    "Hotspot:": "Hotspot:",
-    "Wifi settings were changed": "Wifi settings were changed",
+    "No wifi hotspot passphrase was given": "No wifi hotspot passphrase was given",
+    "Wifi hotspot passphrase was too short": "Wifi hotspot passphrase was too short",
+    "Hotspot settings were changed": "Hotspot settings were changed",
     "Backup and Restore": "Backup and Restore",
     "Choose an operation:": "Choose an operation:",
     "Backup data to USB drive": "Backup data to USB drive",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "Attach a drive containing playable media",
     "Remove a drive containing playable media": "Remove a drive containing playable media",
     "Exit": "Exit",
+    "Enable Wifi": "Enable Wifi",
+    "\\nDo you wish to enable wifi?": "\\nDo you wish to enable wifi?",
+    "Wifi Menu": "Wifi Menu",
+    "${status_str}\\n\\nChoose an operation:": "${status_str}\\n\\nChoose an operation:",
+    "Enable or disable Wifi": "Enable or disable Wifi",
+    "Configure wifi networks": "Configure wifi networks",
+    "Manually edit wifi networks file": "Manually edit wifi networks file",
+    "Hotspot settings": "Hotspot settings",
     "IRC Menu": "IRC Menu",
     "No IRC server is installed": "No IRC server is installed",
     "Set a password for all IRC users": "Set a password for all IRC users",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "Set the main repository (repo mirrors)",
     "Media menu": "Media menu",
     "IRC menu": "IRC menu",
-    "Change your blog avatar": "Change your blog avatar"
+    "Change your blog avatar": "Change your blog avatar",
+    "Wifi menu": "Wifi menu"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone-dhparam.json b/locale/en_us/freedombone-dhparam.json
index fcfa97c08..44d478e57 100644
--- a/locale/en_us/freedombone-dhparam.json
+++ b/locale/en_us/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]",
     "Recalculated DH params for $filename": "Recalculated DH params for $filename",
+    "yes": "yes",
+    "y": "y",
     "$0: openssl is not installed, exiting": "$0: openssl is not installed, exiting"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone-image.json b/locale/en_us/freedombone-image.json
index 5c38ad2e1..2ac6eceff 100644
--- a/locale/en_us/freedombone-image.json
+++ b/locale/en_us/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "Config file $CONFIG_FILENAME not found",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters",
+    "$1": "$1",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "\nImage was created.\n\nYou will be able to log into it with:\n",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "    Username: $USERNAME\n    Password: $PASSWORD\n",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "\n    Username: $USERNAME\n    Password: $PASSWORD\n",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "    Username: $USERNAME\nPassword: $PASSWORD\n",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "\nUsername: $USERNAME\nPassword: $PASSWORD\n",
     "Username: $USERNAME\nPassword: $PASSWORD": "Username: $USERNAME\nPassword: $PASSWORD"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone-wifi.json b/locale/en_us/freedombone-wifi.json
index fdcf638e4..75a60ca7f 100644
--- a/locale/en_us/freedombone-wifi.json
+++ b/locale/en_us/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "Freedombone Configuration",
+    "Wifi Settings ${wifi_ctr}": "Wifi Settings ${wifi_ctr}",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:",
+    "SSID:": "SSID:",
+    "Type:": "Type:",
+    "Passphrase:": "Passphrase:",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone.json b/locale/en_us/freedombone.json
index 096ab1751..fb35e0e04 100644
--- a/locale/en_us/freedombone.json
+++ b/locale/en_us/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "Your search engine password is: $SEARCH_ENGINE_PASSWORD",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "Open http://$WEBMAIL_ONION_HOSTNAME",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "Open https://$HUBZILLA_DOMAIN_NAME and register a new user",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD",
diff --git a/locale/es/freedombone-config.json b/locale/es/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/es/freedombone-config.json
+++ b/locale/es/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/es/freedombone-controlpanel.json b/locale/es/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/es/freedombone-controlpanel.json
+++ b/locale/es/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-dhparam.json b/locale/es/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/es/freedombone-dhparam.json
+++ b/locale/es/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-image.json b/locale/es/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/es/freedombone-image.json
+++ b/locale/es/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-wifi.json b/locale/es/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/es/freedombone-wifi.json
+++ b/locale/es/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone.json b/locale/es/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/es/freedombone.json
+++ b/locale/es/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/et/freedombone-config.json b/locale/et/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/et/freedombone-config.json
+++ b/locale/et/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/et/freedombone-controlpanel.json b/locale/et/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/et/freedombone-controlpanel.json
+++ b/locale/et/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone-dhparam.json b/locale/et/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/et/freedombone-dhparam.json
+++ b/locale/et/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone-image.json b/locale/et/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/et/freedombone-image.json
+++ b/locale/et/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone-wifi.json b/locale/et/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/et/freedombone-wifi.json
+++ b/locale/et/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone.json b/locale/et/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/et/freedombone.json
+++ b/locale/et/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/eu/freedombone-config.json b/locale/eu/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/eu/freedombone-config.json
+++ b/locale/eu/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/eu/freedombone-controlpanel.json b/locale/eu/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/eu/freedombone-controlpanel.json
+++ b/locale/eu/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone-dhparam.json b/locale/eu/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/eu/freedombone-dhparam.json
+++ b/locale/eu/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone-image.json b/locale/eu/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/eu/freedombone-image.json
+++ b/locale/eu/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone-wifi.json b/locale/eu/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/eu/freedombone-wifi.json
+++ b/locale/eu/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone.json b/locale/eu/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/eu/freedombone.json
+++ b/locale/eu/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/fa/freedombone-config.json b/locale/fa/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/fa/freedombone-config.json
+++ b/locale/fa/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/fa/freedombone-controlpanel.json b/locale/fa/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/fa/freedombone-controlpanel.json
+++ b/locale/fa/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone-dhparam.json b/locale/fa/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/fa/freedombone-dhparam.json
+++ b/locale/fa/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone-image.json b/locale/fa/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/fa/freedombone-image.json
+++ b/locale/fa/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone-wifi.json b/locale/fa/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/fa/freedombone-wifi.json
+++ b/locale/fa/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone.json b/locale/fa/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/fa/freedombone.json
+++ b/locale/fa/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/fi/freedombone-config.json b/locale/fi/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/fi/freedombone-config.json
+++ b/locale/fi/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/fi/freedombone-controlpanel.json b/locale/fi/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/fi/freedombone-controlpanel.json
+++ b/locale/fi/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone-dhparam.json b/locale/fi/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/fi/freedombone-dhparam.json
+++ b/locale/fi/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone-image.json b/locale/fi/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/fi/freedombone-image.json
+++ b/locale/fi/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone-wifi.json b/locale/fi/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/fi/freedombone-wifi.json
+++ b/locale/fi/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone.json b/locale/fi/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/fi/freedombone.json
+++ b/locale/fi/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/fil/freedombone-config.json b/locale/fil/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/fil/freedombone-config.json
+++ b/locale/fil/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/fil/freedombone-controlpanel.json b/locale/fil/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/fil/freedombone-controlpanel.json
+++ b/locale/fil/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone-dhparam.json b/locale/fil/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/fil/freedombone-dhparam.json
+++ b/locale/fil/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone-image.json b/locale/fil/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/fil/freedombone-image.json
+++ b/locale/fil/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone-wifi.json b/locale/fil/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/fil/freedombone-wifi.json
+++ b/locale/fil/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone.json b/locale/fil/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/fil/freedombone.json
+++ b/locale/fil/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/fr/freedombone-config.json b/locale/fr/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/fr/freedombone-config.json
+++ b/locale/fr/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/fr/freedombone-controlpanel.json b/locale/fr/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/fr/freedombone-controlpanel.json
+++ b/locale/fr/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-dhparam.json b/locale/fr/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/fr/freedombone-dhparam.json
+++ b/locale/fr/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-image.json b/locale/fr/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/fr/freedombone-image.json
+++ b/locale/fr/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-wifi.json b/locale/fr/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/fr/freedombone-wifi.json
+++ b/locale/fr/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone.json b/locale/fr/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/fr/freedombone.json
+++ b/locale/fr/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/fr_BE/freedombone-addcert.json b/locale/fr_BE/freedombone-addcert.json
new file mode 100644
index 000000000..1b3ca325a
--- /dev/null
+++ b/locale/fr_BE/freedombone-addcert.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-addcert -h [hostname] -c [country code] -a [area] -l [location]": "",
+    "$0: openssl is not installed, exiting": "",
+    "Failed to install letsencrypt for domain $LETSENCRYPT_HOSTNAME": "",
+    "Certificate for $LETSENCRYPT_HOSTNAME could not be pinned": "",
+    "Certificate for $CERTFILE could not be pinned": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-addcert.mo b/locale/fr_BE/freedombone-addcert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1f7080cfb876cfe0eb8afa4437e4348d9248ead9
GIT binary patch
literal 704
zcmb7CQES^U5cWpcgZEPQyoY<pV1uc%y>?_SDQvF7Qj*4`X0V1bR9j9ol#`K^(y;ZX
zmHwpug`E@D4mJim_<WzN?>^nhzPr77*15aA2`HWro)bpxg5t+EZSo7^*91n`$`9|^
zdty6}f?z`VnDSEsY3SJovB&?xx={+Ik?5QT<p7Nbh0Y7DW%U~5mGTPbK_;zNwJL>|
zP#X)~j8BWfaKxcBD_w2ME+jMxQC7jH$!T%&Vaz)Np~wcj`Q-^(dMB~8>&9=4Dzg*{
zp*!NmDL=`kU-II<{BPc!KRWrnvOV;giK;58UtkNEEsXOhmhv1}2{URIy<L-W)xHrh
z6IKdh8fMzibjsj)r~5shPL6q21i3ZeWa-(kVxOgTw3~v8dnm6wD-B+T<KdV;Y{k1#
zm>KjEJuB9YOu>`#O`~bV11J~5I_di>U$fqW&I)w3w2UKlMR%P-??U-7*DEVD8yLHE
zDPXf%x_)v1TiSn#a0v0MFrO4Gqbb_n*%5u96p|=@$D%!!^osaxx}T)`d%H;#ospJJ
d<)vx|`KL5F3r7OyD={ax+J61W!|g8>{sdq3&tCul

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-addemail.json b/locale/fr_BE/freedombone-addemail.json
new file mode 100644
index 000000000..8787e7dd7
--- /dev/null
+++ b/locale/fr_BE/freedombone-addemail.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-addemail -u [username] -e [email address] -s [subject text] -g [group name] --public [yes|no]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-addemail.mo b/locale/fr_BE/freedombone-addemail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f08e4be942acedc22734c17f66cc98fde078247e
GIT binary patch
literal 449
zcmaJ+%SyvQ6phkV+_`o!3l|DbZPKQM)CgK5RICjpxM(OcO{Q@qnF;eK7WLCgKdHaq
zZ7X!=g~L7P&bg1-tXHRv&3a`)90Se(S6cybvroHR0S^HuN0#+x2L%kY^>R0ielW>%
zS`k(vY*1<xm7G*`iZDg#z77USm4cE&sWP(<nrWozr-n*_(n1PTqrWCxn_0;+lrE|I
z=3?47|BA<>r>LJ;u@u`*Jjn4Ym5K=-Am;cS2H{Nbg*_Y$qr;QaY}tLmHRT#7%bEte
zmDhDi81JF%ok&G>X!IQW2cINd&8fr@&qU665g>oYv>lg5k`g}(S*ZZ=dM8!r_RyY&
z7aZLp=hBWx3GPcuG+c)th=#3h%jx1)2fKdav;)r#Jg@1sI}`BYF<r3jNB*^TC-yVp
Qg&_q@o6EQR$hIu|7yq(^`Tzg`

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-addlist.json b/locale/fr_BE/freedombone-addlist.json
new file mode 100644
index 000000000..6c145e703
--- /dev/null
+++ b/locale/fr_BE/freedombone-addlist.json
@@ -0,0 +1,4 @@
+{
+    "${PROJECT_NAME}-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address] --public [yes|no]": "",
+    "Mailing list $MAILINGLIST was already added": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-addlist.mo b/locale/fr_BE/freedombone-addlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5390b8e86c921ac469494dac0aa21eda4d22ef36
GIT binary patch
literal 522
zcmaJ;O;5r=5Ur6@y?OR92M!vuND&ZAFhQ)Qh62IH0}U}tyWpC#CA(XYs6UPHllTix
zfdo%Z@-lB`-@N_WtXHSG&3a{E93##U<*dMH@6tA3BKHsr#1e6GWElG~tdL=y#h!VT
z$6QPx=1N1}Yr1W>^VD`<d{|HgG?t7;OQ2E2BBRsvoF9UGD<&xfsbW&lDH{TbA(;O4
z+P4)1Djj{WP=lru)G-LQ<1ABW#*!(8eKJc&F%KbFGW9KzVJ`pG>vx}>mT&ZAk{J*;
zBCkv;o(LPbRTJz}lQ0o;({nxNuw)gAW-Aez2~GUvjM<=3c{PhE7j+2VsZ>liQavWM
zgHBSR#!M1Ngh_-CVnc1jwb_ePNn`Su$f>eH%(kU!l<KgfjdKBaU|pEKu1{L{SQ<}9
z9;n7$OGT?nie*x&`PQ{vDcO~3;ih~$KrQLBInOTgpR{5P%r+I1lupoXEZ^=O6F<)U
E1#M)Sj{pDw

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-addsipuser.json b/locale/fr_BE/freedombone-addsipuser.json
new file mode 100644
index 000000000..09080aa69
--- /dev/null
+++ b/locale/fr_BE/freedombone-addsipuser.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-addsipuser -u [username] -e [extension] -p [password]": "",
+    "SIP configuration file not found": "",
+    "User $MY_USERNAME not found": "",
+    "SIP user $MY_USERNAME amended": "",
+    "SIP user $MY_USERNAME added": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-addsipuser.mo b/locale/fr_BE/freedombone-addsipuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..92aaf818ddc31dbcece4529351267ad14a174fc0
GIT binary patch
literal 596
zcmaJ;O;5r=5UqxIs5h^EWDXwmut-5nQ-g_ORg7qZV4}pBm2Pnj>^8ew)Tlqr@RRrp
z&Qc;?bds0%X6NnBOgkBWtrRBXF9%}@v4*&?3C2fGQw~voA^?%wSAWzxDrdoQ?8yf5
zG9p0OI9bg3bjD{hZp`@H^5tPO{3JAvHBU3m6p#$MRtP#|_dpnQ*{fkfb15)Qp_@{z
zU!;of3!Cpz>*_qLx1H-o1U)Gd-p>>@XoZ9i7zk+~k(r2{&UM(btpGc*xM2O$Zkx^9
zU$r3<e^-AVD|GCf_GYByGwT`Bh{+98cEkX<=L?*e;5Z|<*=UCIl2<Ibbt!NgL)vdC
z3&5arCmm2O_M!Jgm1d@vnS}UrpQ1u1Op#FZWXwfB0RNF2HyYrk19BqOPzNB=X{u}G
zeaK~POTYnm+irB#CUwQ8Uxge~gI&udZ;zCAN!f3Em7rP<s(!IrsobHLwAhH-MgFx`
V@7xP2`WfxxYl(U|3f=ryyWiI%pe_Ia

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-adduser.json b/locale/fr_BE/freedombone-adduser.json
new file mode 100644
index 000000000..179e11c3a
--- /dev/null
+++ b/locale/fr_BE/freedombone-adduser.json
@@ -0,0 +1,15 @@
+{
+    "The user $MY_USERNAME already exists": "",
+    "$COMPLETION_FILE not found": "",
+    "It's very important to add a password to your GPG key so that": "",
+    "if anyone does get access to your email they still won't be able": "",
+    "Adding an XMPP account for $MY_USERNAME": "",
+    "XMPP account not created": "",
+    "Adding XMPP client setup": "",
+    "Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs": "",
+    "New user $MY_USERNAME was created": "",
+    "Their SIP phone extension is $SIP_EXTENSION": "",
+    "Their login password is $NEW_USER_PASSWORD": "",
+    "They can download their GPG keys with:": "",
+    "They should also run ${PROJECT_NAME}-client on their system to ensure": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-adduser.mo b/locale/fr_BE/freedombone-adduser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..703100c947625cf3a1fb9fe88abfca723a3b69e8
GIT binary patch
literal 1151
zcmaJ=U2oGc6b;a)f_UHoA;iN)su&;2x)wH-Oht5ERs}U})OKtPMsX9jHKcZBI}H`$
zr%n4w`wLvRrV|JeDLE(h$@M+=-dtT?+$&sNUO0H&#rqN7_Vpj^!Dj6Rvimn2=ON+&
zVjb}uF<L8-`5X2eS@ovlJTV%?t@RGF(uO_WFnb2>zQwgWw;bm-Mhg+m^`WrFGm9TB
zezJIO@w3ID#V;0##gWC>Vq%dRY$OTe6F3c{2;!7cu0c_q%^m-A;CK2#w^JBQDU;9-
zBA8DFr$E1J$`unFn1T|nJ4Zp=2QD;>MaGjtso4#qwm-m+oj`9XSWvkHHk%8n2_B#Y
zkR$;DbD~r(WMWp9B9qXHTJVi7K?%@PqMc47^vhG7h*%YlIT@wYNXLvP(CQpRU&M^0
zz_`*RO^G%+5e?-9k>xzk%cU@A_PPh{Zfkhh4I4pc74WBPjiOqwys4$qbY?=Mu}o59
z8IzcbEX6ca%tmG$N<X4r_nqGyI8meDKk4=kZD~?5Vf@;RsY=H`86Nljp0kP+6Ap>U
zc`68cT^(tiD#)3hdXCW=vjy7^{9x4*6319lQ&<V5@WV!jSxHKgB{qX8txO`2Df*Wv
zCkkTJX_^!|G{08-5!*D*svI^3!k4DYiJ%H5R0F0!mD;q3&In752`rFiX$raETN*|b
zOnaP2imx=*ZjiX|sWemK0jtzF4viZNz9@!4=wEMDws(q6!EvCpJ6O)C2O5>-c}f`H
zhj>aPPGddOW4Cs#lZ2}=m9EcYVW!uE+KB05lxC8o?vao)<pH0sURAxi4{KU~%Ha)E
zo)x3+z-^kcV0P{yR>y<tPG!&CdF57XgUU;9x9aV_-mX>l&QR<2=z<v||CQFxifzIt
T8JS?Tu^b-w#r5C&`&s-21JXdt

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-addxmpp.json b/locale/fr_BE/freedombone-addxmpp.json
new file mode 100644
index 000000000..505bc43eb
--- /dev/null
+++ b/locale/fr_BE/freedombone-addxmpp.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-addxmpp -e [email address] -p [password]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-addxmpp.mo b/locale/fr_BE/freedombone-addxmpp.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2b3409afadb6e1eb989aae4ddb0ba57c50b4845d
GIT binary patch
literal 394
zcmaJ+O-}+b5Uqw&y?OS~g9l9<++9@G#Wg`(6O71)Y&<}Ssk;ShmbPgNVvIkH@RRrp
z7BJ!FBrh{>=FQh?xj3w>mJ8%;-{HvNY)zcqY~99(E{+`z_7Ix=<z1U&=(*WRet;Im
ze4-QqMh0v`c}ZMGGh>DX6d5RL%%{}FuyXvJ_PUQrD?_Q4A1t@fF5rb}!=;D__d~(v
z7IG<OxYO<=yOLk^a7zlygoW%&v4~iwJXa;<qCxU^stvR8)Q%wB=`<B)#55!#mjxH&
zh=gz4;<TJ<TEc_W6B7}kHq^vHgKWe2M37tJpW?KeK}$1g-F0wJt=k%S{uOu^5QLdu
oi!N)C=U0Pzz3;TpV>7;f<X`D^A3sqsp3<?KHqx(m2}TJ20ta7kF#rGn

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-backup-local.json b/locale/fr_BE/freedombone-backup-local.json
new file mode 100644
index 000000000..82a2f7b72
--- /dev/null
+++ b/locale/fr_BE/freedombone-backup-local.json
@@ -0,0 +1,35 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Unmount encrypted USB": "",
+    "Backup to USB drive is complete. You can now unplug it.": "",
+    "No MariaDB password was given": "",
+    "Obtaining ${1} database backup": "",
+    "${1} database could not be saved": "",
+    "WARNING: directory does not exist: ${1}": "",
+    "Backup key could not be found": "",
+    "There was a problem making the directory $USB_MOUNT/backup.": "",
+    "Less than 5% of space remaining on backup drive": "",
+    "Backing up gpg keys for $USERNAME": "",
+    "Backing up personal settings for $USERNAME": "",
+    "Backing up ssh keys for $USERNAME": "",
+    "Backing up fin files for $USERNAME": "",
+    "Backing up syncthing files for $USERNAME": "",
+    "Backing up config files for $USERNAME": "",
+    "Backing up local files for $USERNAME": "",
+    "Backing up Mutt settings for $USERNAME": "",
+    "Creating an email archive for $USERNAME": "",
+    "Backing up emails for $USERNAME": "",
+    "Backing up spamassassin settings for $USERNAME": "",
+    "Backing up procmail settings for $USERNAME": "",
+    "Backing up $source_directory to $dest_directory": "",
+    "Backing up ${PROJECT_NAME} configuration files": "",
+    "Backing up README": "",
+    "Backing up VoIP settings": "",
+    "Unable to backup mysql settings": "",
+    "Backing up some additional directories": "",
+    "WARNING: The backup directory $destination_dir is already used.": "",
+    "Choose a different destination name for backing up $backup_dir": "",
+    "WARNING: Directory $backup_dir does not exist": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-backup-local.mo b/locale/fr_BE/freedombone-backup-local.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9b193974f9d3cf4d6e5cad0a8f0a350138af21c2
GIT binary patch
literal 2324
zcmeHIZEqVz5MICqWcUC`NL1ows9Y!&=fo*(Er$ffu|Yw#W4TT%`hl{(+w&bc?;g8*
zNlnzBR`n<KFYxT0dp=8GBk>h0&huP$W_D(tnait}FFvZhdijFka|7Q`@%{D<_r%!u
zZ?2F)5AggI@K@l6K)8W@QnH&R`=VqwO7<n#^|u&n0QZ5nfxj&gk-%K+f;CI#yxy-d
zb_>`9eg=FDybsKPUjyL-wo|e;*tKi81$YQ_(f$NFU)X|uUb5>Yb2+oO8S4QE_%Tob
z-3?d3Lm<4typsI@_Q5;F-6P<8=p1ao+z0I4|Ji@;LF20RoC0q7lp8_5%94PjvNRQB
z_=N~qm;2|joKcq2AhVW?uolmTLZzv3_OL%59u4|cvvL2ZxBiz$>SR<pR!w~+!+1tv
zoQMqp#hk~<hVw9%+d|CJ8J&y8h9HUZd9p1`Dzs4&cH6s<YUR7U|Anbhb3r@^VjJhd
zgIEjSDjf?`ZI(&-oEw85)Vn<aW1=l3n}zgk<i!0a0U$cMwmuf2%49JXIJJt-9(F0v
z@r9t+z;d1@!ipySqB8Qi#4ue_CetLFQEZ#+SPSmvhj5hZN?iMq^Io5)2f`S#5v=as
zBoz{h_XTO^BAvUEG{s~hh5T+dI6WIqYLiH4L6_VRCkQZ2#GK~HH^0$FqLM5!$Mkj!
z$DJZp^X~)jd;y&MYh@ONubcemsM!s1rcoEN%3E2hY)#{8G(P>ge>`DBMFXy5-s@5d
z6)%+z@?2*qU$WDwUDmd~lSOK5lnA$>+*<BOD6ecgJChuRIw_VNnJ>&AtGTP3XEJXF
z`ifGVWKEhxP;D-_%)4##qh**NE?x!5^Bh46S0R19NUaE50_^e8cz81WsZ(i8ps>pB
z4I-Y!#&*aR!_c?daio+h0JdQWnWUva7${TpO>!)On*n#bQy9`VmbJs3*5lU7n|sS;
zfg}}c6vY#aTCkwZh@iQ$$B4Y{Q$@{6CN9~0{T6E~8kK2Gpc@-!{Is-UBdvaigLe{m
zkMMrL5OgSRwWWAwJ<P^MeQ+}9uZ~*H-TJYT77g$wi&S*T!g41~p#DDj5!cx5gUp6r
zdu68~5Sr%orLO{Xr$g;&Z0n;0W0!b8Dm^zHa$AN+bFjBh1wFVW>5y9A)JLZiuUI`L
zy&ku?b#J$I&)faZ+iOo+cRF|PbawZe_gnX#z}6d!i`W&i(X{=f{(#F_#%G8Y>Zjd)
Lz4(W`>397v+li{0

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-backup-remote.json b/locale/fr_BE/freedombone-backup-remote.json
new file mode 100644
index 000000000..854e5216c
--- /dev/null
+++ b/locale/fr_BE/freedombone-backup-remote.json
@@ -0,0 +1,51 @@
+{
+    "Creating backup key": "",
+    "Backup key could not be found": "",
+    "No MariaDB password was given": "",
+    "${1} database could not be saved": "",
+    "Unable to export ${1} database": "",
+    "${PROJECT_NAME} backup to friends": "",
+    "Backing up ${PROJECT_NAME} configuration files": "",
+    "Backing up personal settings for $USERNAME": "",
+    "Backing up gpg keys for $USERNAME": "",
+    "Backing up ssh keys for $USERNAME": "",
+    "Backing up syncthing files for $USERNAME": "",
+    "Backing up config files for $USERNAME": "",
+    "Backing up fin files for $USERNAME": "",
+    "Backing up local files for $USERNAME": "",
+    "Backing up Mutt settings for $USERNAME": "",
+    "Backing up procmail settings for $USERNAME": "",
+    "Backing up spamassassin settings for $USERNAME": "",
+    "Creating an email archive": "",
+    "Backing up emails for $USERNAME": "",
+    "Backing up Lets Encrypt settings": "",
+    "Backing up Tor settings": "",
+    "Backing up RSS reader installation": "",
+    "RSS reader domain specified but not found in /etc/share/ttrss}": "",
+    "Backing up GNU social installation": "",
+    "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
+    "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
+    "Backing up syncthing configuration": "",
+    "Backing up syncthing shared files": "",
+    "Backing up Mediagoblin": "",
+    "Obtaining Gogs settings backup": "",
+    "Obtaining Gogs repos backup": "",
+    "Obtaining Gogs authorized_keys backup": "",
+    "Backing up wiki": "",
+    "Backing up blog": "",
+    "Blog domain specified but not found in /var/www/${FULLBLOG_DOMAIN_NAME}": "",
+    "Backing up certificates": "",
+    "Backing up the public mailing list": "",
+    "Backing up the XMPP settings": "",
+    "Backing up web settings": "",
+    "Backing up README": "",
+    "Backing up IPFS": "",
+    "Backing up DLNA cache": "",
+    "Backing up VoIP settings": "",
+    "Unable to backup MariaDB settings": "",
+    "Unable to export database settings": "",
+    "Backing up some additional directories": "",
+    "WARNING: The backup directory $destination_dir is already used.": "",
+    "Choose a different destination name for backing up $backup_dir": "",
+    "WARNING: Directory $backup_dir does not exist": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-backup-remote.mo b/locale/fr_BE/freedombone-backup-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0a0e394590c99e385453a875f2066d1f1daeb3de
GIT binary patch
literal 2983
zcmb7``*RaF5XX<HOI!0p2Rbcu`e4h14s^zO@k&iY$BCU_@T;~1G;N{sootI-PS=y1
z5FURT!=J>z(64-(vkifOC(dVeTCH|ht3AJd_3}*a^{ba2KFj!ik1vKN+}QJe`(#3b
zxQg-D;6v~NXu&T*tbjzB^i3xHoJpr4oy?`{&Vgq!z6qWKJD{@@^7H55MT}t=()mns
zd#2BR%A`3+=RftlU%)a`gS<1O`BWDYuY%+(ojK`wm%wYFn|TOw{E&DrNX}F23W;Nd
z^h5USTSzBA^SrM>0yn{{U;}&(-UYE5lH23#=czxxg3iVe{4Uji^kXL7$|SeS`y!pY
z06M=)pwkGz0tow%e$S+fkWS}4@6-v;y8*h-`l*y<W`()I++^NnR+)F0cbPS2o!MYE
znJwlY%r>*b>@v5Q_n7yY514;4x0!!2|7QNfe8_yn{Ff=1J*LkLn3CCN4wyrxVm@Z>
zFhk}pGh%9H%>0j;FpcBfv!xdl2rGKRNb>b43@Fl;dXkLTlYzG;{2dhyXcSYq)+muL
z{GptFy4lzwqkSbpQjxJD424xXnpUZ{HagSenzV*0k)IsImW;F(8<=T@x(t*U=w7I1
z?9@kgqECID(A-w1(r%RMmFd;(N~!$DlTL>cDFT_i)5k8X9p%bBU2PpX(F^rpdRJd2
zR`r!HtelC(*HK>$sINk4-tDv86)Jqsd|yS!nHa<a+K~tEF%oJYr*w=bu}qAPpm&&!
zcRL*?+IN0`fU42El0*<FR~s-Ms6_f!Cu%lXCKkKG82lmL;~g+&cudIVAoA_d6>xeE
zqvWmXoTwa=nTetqibMu!CZ}t_4kbOPw~j6tHyMvm(>}SRIiEsh?DYD5*~_Ayd9HTU
zc#K<!Bc8pdeLac-ZyojR?h%QI#>GS;@rP<pPG)+z%Bca*U6~iTHIy&~8r~q;vGh^C
zh^jZT;}$Tsi~B+gdm>rb-``)Dd$zGvtF6_Vn~%!Pda2rAJFW$E(iZSh*6P*ucJpm>
zw@1CF3T@=$T)Vxswq32&N;9qz$80tAQEO3Pa&ymG?dF}zdN*}`wl2~m%}q7EDRoVC
zktk7KqZkFcuakiGg`okG9C^*2MH<}!Z0dnQw~4jk-QS$c>N<7KYfrk<2c%D0e_>pI
z3)UvayzsUn(F-LZL=N`Q%fo%9G~|<5CzfWq{@c^p`yjJ`>zZ31YK?aUjz#tRGLey`
zKpNEC_(oAAaKl|sc3!wVpw#9#LM+E&qW`&9i+qBr&)qMz8`Z{Uk;>c&4ra8KArZQk
zeLy24gZYVm7uSdbJ!~RaI^~HsZi1;w?u}y+BRfRXd5RZXE76b9f(q53a1SjHZK+6V
zX(f_RYyrJuFJG_LE0d|E`NjOYjx541bPr-#Bn!=jIK-*nBp(d{$yy!Reqm*zmx#z9
zRRz53bby=`X{D!Zz7?Vkg@p~B?3yA)@px!fmv2%ku3n1h7A;-Qx0>BTda-p>DC5mi
zq~*n>>xIRuh2@p*(v{-1E5*gD^UK$-Z$r1xmV3$t@?O;&+xeP^1|u<mwSMwwt-`;@
L(qCgA_CNnW`F|fd

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-blog.json b/locale/fr_BE/freedombone-blog.json
new file mode 100644
index 000000000..5bbec508d
--- /dev/null
+++ b/locale/fr_BE/freedombone-blog.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-blog -h [hostname] -a [avatar image file]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-blog.mo b/locale/fr_BE/freedombone-blog.mo
new file mode 100644
index 0000000000000000000000000000000000000000..29578211084082618b5ef58adbfdc964ba524bdb
GIT binary patch
literal 395
zcmaJ-O;5r=5M2$Ydh_gI4jwddum!=gSQEvXU_=_ycz_VIlx<m4cFA@@jq#@ueiDDd
z1x&a($;-@}d6W5Aua?K9^=e719a@}NTx^K7o1NSGhK&P@qXR-d{_?iXGV*fQ34d^u
zs|;`ggNZ7PWK%u_WH4Y0W|#&sWf_N5<a}5<{f>Iwr?3^1NUL|A7;KO6mFq$%NkMqN
z<evr;B^OSo-3j+4uk1Q4B@LGb<F6T~V65_TmNOxnkW82^xC!PaMSri;Ocp8E7|KMA
zh0G}UBVn8<pKF%mqterYf}Cw>5mcJ63xhKWx8R*SQ8&hx=FHgb@PQdSwc>hpbg!`D
q$6l4zs?@EO>y7Ka)nbn?#O9EHrH#Jx%w#sVKcSH7xBJi`#Q6mV&2TXQ

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-client.json b/locale/fr_BE/freedombone-client.json
new file mode 100644
index 000000000..adad53c57
--- /dev/null
+++ b/locale/fr_BE/freedombone-client.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-client": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-client.mo b/locale/fr_BE/freedombone-client.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6aca5433d855be08f46dde3baf968d7b4134aa04
GIT binary patch
literal 358
zcmaJ+O-sW-5M8CG_2$8ohdp>uaB4oRhSUf(MyMDYO7PH&uIVPO#7)?2iX#5B(x247
z;ItKbbKo&=W*%>5mW%m*XStXYj9tVb;&fGDTy4@iA0Q79dpm@rfBhHa<Z%#3KaiDD
zDAPImPR67AC`?JBt9OwZ7*63y=tfq`XVUhR_%x7JYDVK>9BoH-*P>yi44OdtRSTaP
zRG!r(m#WXQH?A9Dg4X2VZFQQfCKnnal~q%z3ZHqe($J)AH80_=(jSe_RJ|^n!0EFM
z4UQGNX7&k9Mk$0^aD&&uEjPH;vFr=5&cX3g+x2^{Z(Vk6*PWmi#$qN{kNhj`P3Qwx
PMav6x%k}e3L<yn4cLHI}

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-clientcert.json b/locale/fr_BE/freedombone-clientcert.json
new file mode 100644
index 000000000..3ebf699f6
--- /dev/null
+++ b/locale/fr_BE/freedombone-clientcert.json
@@ -0,0 +1,4 @@
+{
+    "${PROJECT_NAME}-clientcert -u [username]": "",
+    "User $USERNAME not found": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-clientcert.mo b/locale/fr_BE/freedombone-clientcert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2b10157ee73005e6df68b1493e427ee1f4f6a5b9
GIT binary patch
literal 424
zcmaJ-K~KUk7@d(*y?OHBp$86lC~jkzWdsw&nP8YKI6PpCsiVW1@s)HP(HMUk;V1DI
z{01c4e96oAUi-d&Z8z)HX>GG!S%_ogInt{PVz4XQ+CUv4&yY*x$&qF4+t8sxUtzBv
zZ=&#*rMVPfQlSlHC4DIip@GlEYpwnhkA@FnFR{kBM(g9Ja8$KWP=;ozgsBy4^(j)r
z`cw8SbRiW4R60J0FT+v=OA_^?@UZ1HZPHU<a2`v(7b2hrlb4H}OX$$_gX=<=ZfP>+
zA99*QkqOO0NYzxrETI0oG$hVT&2x6I^t=ctEVj1jx*fWc-3HKW>Rga`n6RD}+~Dol
z9XB}DwVf+wd(8C{rxmnYf$cXv&!1qHjl@z`5BV?JwkKr3VOH`Po|fsi+mPV5l0Vpi
Bch>*_

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-config.json b/locale/fr_BE/freedombone-config.json
new file mode 100644
index 000000000..40d7dee91
--- /dev/null
+++ b/locale/fr_BE/freedombone-config.json
@@ -0,0 +1,228 @@
+{
+    "<h1>Welcome to \\$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>": "",
+    "${PROJECT_NAME}-config -f [config filename] -m [min password length]": "",
+    "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
+    "Invalid FreeDNS Code": "",
+    "Encryption keys": "",
+    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
+    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
+    "GPG Keyring loaded to $HOME_DIR": "",
+    "ssh keys imported": "",
+    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
+    "Freedombone Configuration": "",
+    "GPG/PGP keys for your system:": "",
+    "Generate new keys (new user)": "",
+    "Import keys from USB drive/s": "",
+    "Retrieve keys from friends servers": "",
+    "Freedombone Control Panel": "",
+    "Main Repository (Mirrors)": "",
+    "If you don't know what this means then just select Ok.\\n\\nIf you don't wish to use the default repositories they can be obtained from mirrored repos on another ${PROJECT_NAME} system.\\n\\nThe repositories are for applications which are not yet packaged for Debian.": "",
+    "URL:": "",
+    "SSH Port:": "",
+    "Password:": "",
+    "Main Repository": "",
+    "Main repository set to $FRIENDS_MIRRORS_SERVER": "",
+    "Select your language:": "",
+    "Afrikaans": "",
+    "Albanian": "",
+    "Arabic": "",
+    "Basque": "",
+    "Belarusian": "",
+    "Bosnian": "",
+    "Bulgarian": "",
+    "Catalan": "",
+    "Croatian": "",
+    "Chinese (Simplified)": "",
+    "Chinese (Traditional)": "",
+    "Czech": "",
+    "Danish": "",
+    "Dutch": "",
+    "English": "",
+    "English (US)": "",
+    "Estonian": "",
+    "Farsi": "",
+    "Filipino": "",
+    "Finnish": "",
+    "French": "",
+    "French (Canada)": "",
+    "Gaelic": "",
+    "Gallego": "",
+    "Georgian": "",
+    "German": "",
+    "German (Personal)": "",
+    "Greek": "",
+    "Gujarati": "",
+    "Hebrew": "",
+    "Hindi": "",
+    "Hungarian": "",
+    "Icelandic": "",
+    "Indonesian": "",
+    "Italian": "",
+    "Japanese": "",
+    "Kannada": "",
+    "Khmer": "",
+    "Korean": "",
+    "Lao": "",
+    "Lithuanian": "",
+    "Latvian": "",
+    "Malayalam": "",
+    "Malaysian": "",
+    "Maori (Ngai Tahu)": "",
+    "Maori (Waikoto Uni)": "",
+    "Mongolian": "",
+    "Norwegian": "",
+    "Norwegian (Primary)": "",
+    "Nynorsk": "",
+    "Polish": "",
+    "Portuguese": "",
+    "Portuguese (Brazil)": "",
+    "Romanian": "",
+    "Russian": "",
+    "Samoan": "",
+    "Serbian": "",
+    "Slovak": "",
+    "Slovenian": "",
+    "Somali": "",
+    "Spanish (International)": "",
+    "Swedish": "",
+    "Tagalog": "",
+    "Tamil": "",
+    "Thai": "",
+    "Turkish": "",
+    "Ukrainian": "",
+    "Vietnamese": "",
+    "Select User": "",
+    "Select one of the following:": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
+    "Freedombone": "",
+    "Type of Installation:": "",
+    "Full": "",
+    "Writer": "",
+    "Cloud": "",
+    "Chat": "",
+    "Mailbox": "",
+    "Non-Mailbox": "",
+    "Social": "",
+    "Media": "",
+    "Developer": "",
+    "Mesh (router)": "",
+    "Mesh (user device)": "",
+    "Wireless Mesh ESSID\\n\\nIf you press enter the default will be '$WIFI_SSID'": "",
+    "Give your mesh peer a name": "",
+    "Wifi Channel (spaced to be non-overlapping):": "",
+    "Username": "",
+    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
+    "Don't use the default user account": "",
+    "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
+    "Install Target": "",
+    "\\nAre you installing onto a Beaglebone Black?": "",
+    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
+    "Social Key Management": "",
+    "Type of Random Number Generator:": "",
+    "OneRNG Device": "",
+    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
+    "Where to download Debian packages from:": "",
+    "Australia": "",
+    "Austria": "",
+    "Belarus": "",
+    "Belgium": "",
+    "Bosnia and Herzegovina": "",
+    "Brazil": "",
+    "Bulgaria": "",
+    "Canada": "",
+    "Chile": "",
+    "China": "",
+    "Croatia": "",
+    "Czech Republic": "",
+    "Denmark": "",
+    "El Salvador": "",
+    "Estonia": "",
+    "Finland": "",
+    "France 1": "",
+    "France 2": "",
+    "Germany 1": "",
+    "Germany 2": "",
+    "Greece": "",
+    "Hungary": "",
+    "Iceland": "",
+    "Iran": "",
+    "Ireland": "",
+    "Italy": "",
+    "Japan": "",
+    "Korea": "",
+    "Lithuania": "",
+    "Mexico": "",
+    "Netherlands": "",
+    "New Caledonia": "",
+    "New Zealand": "",
+    "Norway": "",
+    "Poland": "",
+    "Portugal": "",
+    "Romania": "",
+    "Russia": "",
+    "Slovakia": "",
+    "Slovenia": "",
+    "Spain": "",
+    "Sweden": "",
+    "Switzerland": "",
+    "Taiwan": "",
+    "Thailand": "",
+    "Turkey": "",
+    "Ukraine": "",
+    "United Kingdom": "",
+    "United States": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Choose Dynamic DNS provider:": "",
+    "Dynamic DNS provider username": "",
+    "Dynamic DNS provider password": "",
+    "Password quality check": "",
+    "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
+    "Static local IP address": "",
+    "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
+    "Local Network Configuration": "",
+    "\\nPlease enter the IP addresses:": "",
+    "This system:": "",
+    "Internet router:": "",
+    "Wiki Configuration": "",
+    "\\nPlease enter your wiki details:": "",
+    "Title:": "",
+    "Domain:": "",
+    "Code:": "",
+    "Domain name validation": "",
+    "Blog Configuration": "",
+    "\\nPlease enter your blog details:": "",
+    "Mediagoblin Configuration": "",
+    "\\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:": "",
+    "Hubzilla Configuration": "",
+    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Microblog Configuration": "",
+    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Welcome Message:": "",
+    "Background image URL:": "",
+    "Developer Configuration": "",
+    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
+    "Your main domain name": "",
+    "\\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?": "",
+    "Which domain name should your email/XMPP/IRC/VoIP be associated with?": "",
+    "Your email address": "",
+    "Configuration filename:": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-config.mo b/locale/fr_BE/freedombone-config.mo
new file mode 100644
index 0000000000000000000000000000000000000000..44fe5efd04f9b4298f516445f2e2e67d573617dd
GIT binary patch
literal 10560
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
ZZ+>y<(Im|#U_RTZ$p0?!|NZaMe*xDxAgBNU

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-controlpanel-user.json b/locale/fr_BE/freedombone-controlpanel-user.json
new file mode 100644
index 000000000..cc97ed07f
--- /dev/null
+++ b/locale/fr_BE/freedombone-controlpanel-user.json
@@ -0,0 +1,110 @@
+{
+    "Press any key to continue...": "",
+    "Exit back to user mainenance": "",
+    "Freedombone User Control Panel": "",
+    "Remove yourself from a mailing list": "",
+    "Select one of the following:": "",
+    "Remove yourself from mailing list": "",
+    "You have been removed from ${remove_list_name}": "",
+    "Subscribe to a mailing list": "",
+    "You can either enter a subject or an email address\\n": "",
+    "List folder name:": "",
+    "Name between [] on subject line:": "",
+    "List email address:": "",
+    "Public:": "",
+    "yes": "",
+    "Add mailing list": "",
+    "No mailing list name was given": "",
+    "No mailing list subject or address was given": "",
+    "Unrecognised email address": "",
+    "$LIST_NAME list was added": "",
+    "Create an email rule": "",
+    "When email arrives from address:": "",
+    "Move to folder:": "",
+    "no": "",
+    "No email address was given": "",
+    "No folder name was given": "",
+    "Email rule for $RULE_EMAIL was added": "",
+    "When email arrives with subject containing:": "",
+    "No subject text was given": "",
+    "Email rule for subject '$RULE_SUBJECT' was added": "",
+    "Block or unblock emails from a given address": "",
+    "Block it:": "",
+    "Block an email": "",
+    "Unblock an email": "",
+    "Block or unblock emails with text in the subject line": "",
+    "When email arrives with subject text:": "",
+    "No subject was given": "",
+    "Email with subject $BLOCK_SUBJECT is now blocked": "",
+    "Email with subject $BLOCK_SUBJECT is now unblocked": "",
+    "Your PGP/GPG Key": "",
+    "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
+    "Publish your PGP/GPG key": "",
+    "Your key has now been published": "",
+    "Add someone's PGP/GPG key": "",
+    "Enter their email address below": "",
+    "This doesn't look like an email address": "",
+    "Remove someone's PGP/GPG key": "",
+    "It's not a good idea to remove your own encryption key": "",
+    "Add an ssh key for logging in": "",
+    "This will allow you to log into ${PROJECT_NAME} if you have an ssh key on your system, and provides much stronger security than simply using a login password.\\n\\nWARNING: If you make any mistakes here then you may not be able to log in and will need to get the administrator to clear your ssh authorized_keys file.": "",
+    "New ssh key added": "",
+    "Your ssh key has now been added": "",
+    "ssh key already added": "",
+    "That ssh key has already been added": "",
+    "Unrecognised ssh public key": "",
+    "This doesn't look like an ssh key": "",
+    "Remove an ssh key for logging in": "",
+    "Enter the ssh public key which is to be removed. This can be just the address at the end.\\n\\nWARNING: If you make any mistakes here then you may not be able to log in and will need to get the administrator to clear your ssh authorized_keys file.": "",
+    "Remove an ssh public key": "",
+    "The ssh key has been removed": "",
+    "Freedombone Control Panel": "",
+    "SMTP Proxy for $USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
+    "Username:": "",
+    "Password:": "",
+    "# The ${PROJECT_NAME} syncthing ID is: $SYNCTHING_ID": "",
+    "Device ID for ${PROJECT_NAME}": "",
+    "In a desktop terminal press shift and select the ID below,\\nthen right click and copy.\\n\\nWithin Connectbot select Menu/Copy and then highlight the ID below\\n\\n$SYNCTHING_ID": "",
+    "Add a Syncthing device ID": "",
+    "Paste the device ID for your laptop/desktop/netbook/phone/tablet below": "",
+    "Device ID:": "",
+    "Description (optional):": "",
+    "That doesn't look like a device ID": "",
+    "That ID has already been added": "",
+    "The ID was added": "",
+    "Remove a Syncthing device ID": "",
+    "Paste the device ID which is to be removed below": "",
+    "That ID wasn't registered anyway": "",
+    "The ID was removed": "",
+    "Your Encryption Keys": "",
+    "Choose an operation:": "",
+    "Show your PGP/GPG key": "",
+    "Publish your PGP/GPG key so that others can find it": "",
+    "Back to main menu": "",
+    "Change Email Filtering Rules": "",
+    "Add yourself to a mailing list": "",
+    "Add an email rule for an address": "",
+    "Add an email rule for a subject": "",
+    "Block or unblock an email address": "",
+    "Block or unblock email with subject text": "",
+    "File Synchronization": "",
+    "Show device ID for ${PROJECT_NAME}": "",
+    "Add an ID for another machine or device": "",
+    "Remove an ID for another machine or device": "",
+    "Manually edit device IDs": "",
+    "User Control Panel": "",
+    "Use Email": "",
+    "Use Tox Chat": "",
+    "Use XMPP Chat": "",
+    "Use IRC": "",
+    "Browse the Web": "",
+    "Set an outgoing email proxy": "",
+    "Administrator controls": "",
+    "Exit to the command line": "",
+    "Log out": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-controlpanel-user.mo b/locale/fr_BE/freedombone-controlpanel-user.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9e62e7846152e09adb841676813940764a5e6727
GIT binary patch
literal 6155
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
QG5c#}{O{!d;-BeX0U~9TIRF3v

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-controlpanel.json b/locale/fr_BE/freedombone-controlpanel.json
new file mode 100644
index 000000000..ab859ac6f
--- /dev/null
+++ b/locale/fr_BE/freedombone-controlpanel.json
@@ -0,0 +1,229 @@
+{
+    "Press any key to continue...": "",
+    "Check for updates": "",
+    "Upgrade script was not found": "",
+    "Freedombone Control Panel": "",
+    "Main Repository (Mirrors)": "",
+    "If you do not wish to use the default repositories they can be obtained from mirrors on another ${PROJECT_NAME} server.": "",
+    "URL:": "",
+    "SSH Port:": "",
+    "Password:": "",
+    "Main Repository": "",
+    "Main repository set to $FRIENDS_MIRRORS_SERVER": "",
+    "Add new user": "",
+    "Username:": "",
+    "ssh public key (optional):": "",
+    "New username": "",
+    "No username was given": "",
+    "Invalid username": "",
+    "The username should not contain any spaces": "",
+    "ssh public key": "",
+    "This does not look like an ssh public key": "",
+    "Select User": "",
+    "Select one of the following:": "",
+    "SMTP Proxy for $ADMIN_USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
+    "Administrator user": "",
+    "You can't delete the administrator user": "",
+    "No Administrator user found. Check $COMPLETION_FILE": "",
+    "Username not found": "",
+    "Home directory not found": "",
+    "Change password": "",
+    "New password for user $SELECTED_USERNAME": "",
+    "The password should be ${MINIMUM_PASSWORD_LENGTH} or more characters": "",
+    "Password for $SELECTED_USERNAME was changed": "",
+    "IRC Password": "",
+    "Password for all IRC users, or press Enter for no password": "",
+    "The IRC password was changed": "",
+    "Change blog avatar": "",
+    "Enter a URL for an image. It should be approximately a square image.": "",
+    "Your blog avatar has been changed": "",
+    "Change ssh public key": "",
+    "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "",
+    "Change ssh public key for $SELECTED_USERNAME": "",
+    "Paste the ssh public key below": "",
+    "ssh public key was installed": "",
+    "Exit back to user mainenance": "",
+    "Remove a mailing list for $SELECTED_USERNAME": "",
+    "Remove user from mailing list": "",
+    "${SELECTED_USERNAME} has been removed from ${remove_list_name}": "",
+    "Subscribe $SELECTED_USERNAME to a mailing list": "",
+    "You can either enter a subject or an email address\\n": "",
+    "List folder name:": "",
+    "Name between [] on subject line:": "",
+    "List email address:": "",
+    "Public:": "",
+    "yes": "",
+    "Add mailing list": "",
+    "No mailing list name was given": "",
+    "No mailing list subject or address was given": "",
+    "Unrecognised email address": "",
+    "$LIST_NAME list was added": "",
+    "Email rule for user $SELECTED_USERNAME": "",
+    "When email arrives from address:": "",
+    "Move to folder:": "",
+    "no": "",
+    "Add email rule": "",
+    "No email address was given": "",
+    "No folder name was given": "",
+    "Email rule for $RULE_EMAIL was added": "",
+    "Block/Unblock email going to": "",
+    "Block it:": "",
+    "Block/Unblock an email": "",
+    "Block an email": "",
+    "Unblock an email": "",
+    "When email arrives with subject text:": "",
+    "No subject was given": "",
+    "USB Master Keydrive": "",
+    "Plug in a LUKS encrypted USB drive": "",
+    "USB Fragment Keydrive": "",
+    "Backup data to USB": "",
+    "Restore from USB backup": "",
+    "Choose an application to restore:": "",
+    "Everything": "",
+    "Return to the backup and restore menu": "",
+    "Configuration files": "",
+    "MariaDB settings": "",
+    "Let's Encrypt account": "",
+    "Mutt email client settings": "",
+    "GPG keys": "",
+    "Email processing rules": "",
+    "Spam filtering rules": "",
+    "Administrator's README file": "",
+    "IPFS": "",
+    "SSH keys": "",
+    "User configuration files": "",
+    "User local files": "",
+    "User fin files": "",
+    "SSL/TLS certificates": "",
+    "Personal settings": "",
+    "Mailing List": "",
+    "XMPP chat": "",
+    "GNU Social": "",
+    "Hubzilla": "",
+    "Syncthing": "",
+    "Gogs": "",
+    "Wiki": "",
+    "Blog": "",
+    "CJDNS": "",
+    "Email": "",
+    "DLNA": "",
+    "VoIP": "",
+    "RSS reader": "",
+    "Tox": "",
+    "Mediagoblin": "",
+    "Restore from ${remote_domain_name}": "",
+    "Restore data from USB": "",
+    "Plug in your backup USB drive": "",
+    "Restore data from remote server": "",
+    "Unknown admin user": "",
+    "Restore from remote server": "",
+    "Enter the domain name of the server from which you wish to restore": "",
+    "Remote server domain name": "",
+    "Invalid domain name": "",
+    "\\nDo you want to enable other systems to ping this machine?\\n\\nPing may be useful for diagnostic purposes, but for added security you may not want to enable it.": "",
+    "Enable Ping / ICMP": "",
+    "Logging": "",
+    "\\nDo you want to turn logging on?": "",
+    "Restore GPG key for user": "",
+    "Plug in your USB keydrive": "",
+    "Renew SSL certificate": "",
+    "\\nThis will renew a letsencrypt certificate. Select 'yes' to continue": "",
+    "Hubzilla install directory not found": "",
+    "Hubzilla certificate has been renewed": "",
+    "Hubzilla channel directory server": "",
+    "Hubzilla is not installed on this system": "",
+    "When you click on 'channel directory' this is where Hubzilla will obtain its list from": "",
+    "Invalid domain - include the https://": "",
+    "Domain channel directory server changed to $hubzilla_domain_server": "",
+    "Format a USB drive (LUKS encrypted)": "",
+    "Choose a drive:": "",
+    "sda (Beaglebone Black)": "",
+    "sdb": "",
+    "sdc": "",
+    "sdd": "",
+    "Back to Backup and Restore menu": "",
+    "Format USB drive": "",
+    "\\nPlease confirm that you wish to format drive\\n\\n    ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
+    "Remove backups from a USB drive": "",
+    "\\nPlease confirm that you wish to remove backups from this drive\\n\\n    ${drive}\\n\\nYou will not be able to recover them afterwards.": "",
+    "Power off the system": "",
+    "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "",
+    "Restart the system": "",
+    "\\nPlease confirm that you wish to restart the system.\\n\\nWARNING: If you are using full disk encryption then you will need physical access to the hardware to type in the password": "",
+    "Change the name of this system": "",
+    "New local network name": "",
+    "The name of this system on your local network was changed successfully": "",
+    "Set the TLS date/time source": "",
+    "Enter a domain name to use as a TLS time source.\\n\\nFactors to consider when choosing a source are whether you wish that site to know that your system is 'alive' and also what might happen if an adversary were to try to mess with the date/time from that domain (i.e. how much blowback would there be).": "",
+    "Don't include the 'https'": "",
+    "That doesn't look like a domain name": "",
+    "Set a static local IP address": "",
+    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be 192.168.1.x": "",
+    "Set the IP address of your internet router/modem": "",
+    "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
+    "Wifi Settings": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
+    "SSID:": "",
+    "Type (wpa2-psk/none):": "",
+    "Passphrase:": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
+    "Backup and Restore": "",
+    "Choose an operation:": "",
+    "Backup data to USB drive": "",
+    "Restore GPG key from USB keydrive": "",
+    "Restore data from USB drive": "",
+    "Configure remote backups": "",
+    "Restore from remote backup": "",
+    "Backup GPG key to USB (master keydrive)": "",
+    "Backup GPG key to USB (fragment keydrive)": "",
+    "Back to main menu": "",
+    "Email Filtering Rules": "",
+    "Add a user to a mailing list": "",
+    "Remove a user from a mailing list": "",
+    "Add an email rule": "",
+    "Block/Unblock an email address": "",
+    "Block/Unblock email with subject text": "",
+    "Manage Users": "",
+    "Add a user": "",
+    "Delete a user": "",
+    "Change user password": "",
+    "Change user ssh public key": "",
+    "Set channel directory server": "",
+    "Media Menu": "",
+    "Attach a drive containing playable media": "",
+    "Remove a drive containing playable media": "",
+    "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
+    "IRC Menu": "",
+    "No IRC server is installed": "",
+    "Set a password for all IRC users": "",
+    "Show current IRC login password": "",
+    "Control Panel": "",
+    "About this system": "",
+    "Reset Tripwire": "",
+    "Logging on/off": "",
+    "Ping enable/disable": "",
+    "Outgoing Email Proxy": "",
+    "Security Settings": "",
+    "Set the main repository (repo mirrors)": "",
+    "Media menu": "",
+    "IRC menu": "",
+    "Change your blog avatar": "",
+    "Wifi menu": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-controlpanel.mo b/locale/fr_BE/freedombone-controlpanel.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f68b5ca634080214f2983323f4fa72900673d4a9
GIT binary patch
literal 11854
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
H{yYDF7d`8C

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-dhparam.json b/locale/fr_BE/freedombone-dhparam.json
new file mode 100644
index 000000000..a671f3ea3
--- /dev/null
+++ b/locale/fr_BE/freedombone-dhparam.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
+    "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
+    "$0: openssl is not installed, exiting": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-dhparam.mo b/locale/fr_BE/freedombone-dhparam.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ac1ecfb91bc7eefc30fa753cc856c1db421a5215
GIT binary patch
literal 580
zcmaKp!A{#i5Qg0r_2Axm?qLotYO5~T2@ta=l_0o+ij*jddLTk*vDfjU&8)S%K}3Z|
zLp&0%&~Y5Wtt0*ZW@dlSdgSM)$B!G&Pmck`d(tP;SyNElw^;Er<qxDOskKKh*&E6t
zdb}fU5<if>HBE}Ww=H{Xrfcr6$s0y72UAOQPJ?oQ#)CrVh1Rn84)RWUg|p!I;V^q(
zMO6zc=D;eLR>pZ0b9o6&!&FP0`HJ3zYvmpFn3cKEIZT(*-J@wbrEvbG-iZE=#^=AX
z!6X>3oC__yEa3PAR(CikjfJRGG?{J*mH`b4M%LWO+_Tey{gKuwgB(<nqP+7gH+UNk
zPlws-QL+_>1A|_oXOm?uIe2nz*IFn%fV>jcN#9@ilBKUcE6|nFvJ7)m(C!>k+9@3A
zg%z6pG<NPdV7)3`zjFX>+W&&^1Cp=d=zPKkRtisF$Bt<!4xKpJWAP5_q?4q}ce_04
kZuR2b3-YqDyj9I2|F!lm!ZU%hg_zN_(q0{9Vf$;te<~ZDNdN!<

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-encrypt-mail.json b/locale/fr_BE/freedombone-encrypt-mail.json
new file mode 100644
index 000000000..ddf90a17c
--- /dev/null
+++ b/locale/fr_BE/freedombone-encrypt-mail.json
@@ -0,0 +1,8 @@
+{
+    "A GPG key for $EMAIL_ADDRESS could not be found!": "",
+    "Calling find": "",
+    "Not copying, no differences between /tmp/msg_$USERNAME and $line": "",
+    "Removing Dovecot indexes and uids": "",
+    "No messages found needing GPG encryption, not": "",
+    "removing Dovecot indexes and UIDs.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-encrypt-mail.mo b/locale/fr_BE/freedombone-encrypt-mail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3bdc600deccb6c7069686c299cb0689a99d29c63
GIT binary patch
literal 684
zcmbVK&1%~~5Z)F;LCvY>9wx<y7P7YG{2&xu>RM_r#ICWO9zvmPq>;L<v@3R3PJHT<
zg*;MTp|eSGZaH*dm~Upj`CIn>?)FXR{_d8Mydr%|y7msqzwi!y+M&S??d=dJwD*Fs
zeX=pxcVxeleNFm@)C+Zd`Cq7eu}YWo@hk<Qa_Cl4VP~!#WV+c(RUUxSkjtV#gDOJ{
zSLm)074%)*^lMwPagr?4)rtz*Dkruh3KY6k`F>{%XNxoVjav#B=%%yr^qfsZMN>*B
zq{`V`Lygvol3G6$fkMoE+E>y@vu&Kz%J1RW5^KHj$wY53qfyiXZ>ZGo-pbrE^Bm)1
zn%Ev&82t+~$EP{}hQ?C!7-SeJym36!Y7@++v-Bwy_6EU3D~HPQ^|rwn95MS%C8Roq
z?58jm-Kcd1kDho&C`(VqQ<Z6dO$^bMbitx(ji~q+ZE72XY93rW8lJ)<9KBcY5yB6_
z;_I4E3<`fbPlThX!$Ek$2S<Dut;56k_%IHSd&B7HlDK?{8|e>umU?m-oC{U9^wu#H
N=EvtWc>FOe_zSAU$e{oL

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-format.json b/locale/fr_BE/freedombone-format.json
new file mode 100644
index 000000000..18a586735
--- /dev/null
+++ b/locale/fr_BE/freedombone-format.json
@@ -0,0 +1,5 @@
+{
+    "Formatting $USB_DRIVE as LUKS": "",
+    "Failed to format $USB_DRIVE as LUKS": "",
+    "Failed to open LUKS formatted drive $USB_DRIVE": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-format.mo b/locale/fr_BE/freedombone-format.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5331932efd7208ff1142e9bb340b095450a3b0a6
GIT binary patch
literal 494
zcmaKp%}&BV5XUj$wB9^xGKn7aut*CwwTK6xB#jUWUk9QwYrDlYb+_3rL?4duNW6m6
zHi`%0B>(Ju{B~wGyW4I~s=Mu`f>uSHqVDnl?WsJ9vxfdN>Ks+#XTRR@(N7Ljc@^V>
zUT+-C{c4|yghyZ$sFX_>%pN8XEB(QY!E~g>n#09x(y0_Uu&hA-Tr1&&OxZ@rWmz3*
z_0B^>gNV+#&V-U42+NiH)6h`KH5mp&e_yg{b<$PRaB1lDE9D*-B(Kwi3E6`1jp>Y=
z_R7T6-E*4BEasZ}GE@;x_P~7=hK!PxW(n=%MwtgPEyApAx1e;}mlE#5x+0^;DeY>`
z3~onz%-~eJZaK8xq_#V?8s1IAvz*$kV=s`UW4;#oL;gjZ3o>AGxnfJ~7VDRePx22T
E-%J9G#sB~S

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-ignore.json b/locale/fr_BE/freedombone-ignore.json
new file mode 100644
index 000000000..1bc3d94c6
--- /dev/null
+++ b/locale/fr_BE/freedombone-ignore.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-ignore -u [username] -e [mail address] -t [text in subject line]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-ignore.mo b/locale/fr_BE/freedombone-ignore.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f4f4898aa06739ec3e207548e223e058dda33798
GIT binary patch
literal 420
zcmaJ+O-sW-5RKAPym|I82M-EPP0}hMHG<X%6>CEY9$JcQlWkl{CuMh26!E8({-pi|
zH?7c{1CM!c_RYs`)~n;jX1%gZ92%S$T-3tE%`R<oY<OsJbYNM3cB2e4+IqR`M?WZX
zDkTT3U|cCKiOu;0ki&S+L;)<zBv;B*G>kR>)F22{HT~eJhC&dZG)}+c;ovFiCRQxV
zx{kdJU%6DGqyU8LlWD`Wq@~^O^`rfh+jQ)1Nt%<!<ZHnLs25x=3MQxn={u8(>#))@
z^!Gl=NX@v!h|)3>ln3BXg|_3OlB~eTQqENXwAe}&dL7u&@QmOV+;ck~B-oXlX>%Pu
zFm1Maj(d$x8$Ca9TftQ;aQ$Z6bw<XEL%tOCNB*^XBm0?AUa{Ovo5{EP$hIu|7w4{e
AhyVZp

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-image-customise.json b/locale/fr_BE/freedombone-image-customise.json
new file mode 100644
index 000000000..ea79f8432
--- /dev/null
+++ b/locale/fr_BE/freedombone-image-customise.json
@@ -0,0 +1,11 @@
+{
+    "info: Adding apt config to call dpkg via eatmydata": "",
+    "error: unable to find /usr/bin/eatmydata after installing the eatmydata package": "",
+    "info: Removing apt config to call dpkg via eatmydata": "",
+    "warning: missing $rootdir$override": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Initial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n    sudo su\n    ${PROJECT_NAME} menuconfig\n\n": "",
+    "Using ssh public key:": "",
+    "Install failed. Press x to continue...": "",
+    "warning: creating initial user $username with well known password!": "",
+    "info: killing leftover processes in chroot": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-image-customise.mo b/locale/fr_BE/freedombone-image-customise.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ff296cb42bf22c358babfdd9e43a3c274e6c29c3
GIT binary patch
literal 1340
zcmb7EQEL-H5I(iOoG&7XFIA^Cm{#0tlU5B^Dzr61inXCcL0@E(+e_Bm?H;>(NrM%C
zS?N#eUvTEKZJ-6gAvfRb%r~=hvwOL`IDfQsd2t?~g!nAulhFdjyRWU6*A_<ZT*V*H
zy?2A)_}Xfs_2ga<Y$F~bzC!$ixIbs0wR&wmz)BC7aEY>fe~wQ*KJ)n8BY0f#xa#qR
z#~NWrS;w;sQZ6%*M9?+DS~vx#VW5?hsuWQa1)ukh+P@(eszh%phhexBLc|!0;FjEQ
zMIoHs;#7_s?lUA}MJgMi!ZKG1iDXiMVrN(W%2UPs9#nBHVs)=@bp~sw*D+B2h_Jr!
z5I2N6I_C-)=6Y2JhGv}tL_mvT-c!XeH>A{?(oxb$o<W~m0dhXzF#M)V19oPe$U$0A
z+QCe?t2oWRM>EfhOgI5<B%m;QK&N3!Me8utS*E8_4T+X>mDtzhS0I!V24=KDA{?Hi
zjpm)%GSOhms>|B1?#c0C`=A$mu~fs_5fo)VlLHuwSsVysw27fqyr1Fz8d9ke*eI>p
z=u5RBxXWh=cN}<1yZQH`O4REjT=2n|4@DqVs$<wo5~A?J(S5?3Q{61OaY->A!bI{#
zs!ur)xt{!Q(pY90<zymtdV>A=;R%bK!eC^ycEOYzg`^k;2Kyzt^hZ@%OsSDpJQpyP
zZUj?-U5=HWDk!+MQ*Dx!MTuP6YK%3ioJdonU5!jc&^7v}7&z8R*jHh!)G7wqXen{(
z7|vi49(9h|i%=ul3=i;A!$V}fSs`L@$lNG0F4Ycp&W#mrw{$6MEqI12n+n6)YM^Pr
zF|_*9h25+)JYyfV$!!d(sFrrOxdU@^cTK^2Xsn0b;~qPxhM*Puz#Z<|+-$sMo7=3}
t>NU3FH(PNNJ8QoCj$C#kCX!y{pVZd(@Do?V5)VIy)cn|Q(|@Fw@Gr2LY4ZR8

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-image-hardware-setup.json b/locale/fr_BE/freedombone-image-hardware-setup.json
new file mode 100644
index 000000000..4b8671a7b
--- /dev/null
+++ b/locale/fr_BE/freedombone-image-hardware-setup.json
@@ -0,0 +1,3 @@
+{
+    "Adding a getty on the serial port": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-image-hardware-setup.mo b/locale/fr_BE/freedombone-image-hardware-setup.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6f796fcebaa8906cf2bd4d540b6360a9528b7fe0
GIT binary patch
literal 369
zcmaJ+O-sW-5M9O7dh_gIyeYUfNk0gw5wun)SS(UJ^itMjldi_uu$h$h$Cdu1{slL!
z(3=B~d2i-1AG_`5;%v9wFc+r|mkzg$aB+V~`+Vhi>~Ma<*!-{l?Kpc(Q;j)D$Q98V
z3<50_RLW{uKxr(oi8Ws;Au&qDhq9G67=iXfR4WpR!6hG$#=~RFZ+U!RkQ9=bu1ggG
zIp<wjNR53+7SdLV;+irM9(`6~l_@KRn3(3C2*OWId{Wd_7UIR&pDF?@_p*wEJ{)L#
zjqm{e4WGPC#lR{_?mF=-$!!fhzbCwo2*Rn~j=JqA2wJ^vd*;02T`hI<$iLRkjK50E
PYni)gnVmlkIb-}6o+@VP

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-image-make.json b/locale/fr_BE/freedombone-image-make.json
new file mode 100644
index 000000000..3efb85001
--- /dev/null
+++ b/locale/fr_BE/freedombone-image-make.json
@@ -0,0 +1,4 @@
+{
+    "error: Missing MIRROR and SUITE settings inherited from Makefile.": "",
+    "starting $VMDEBOOTSTRAP": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-image-make.mo b/locale/fr_BE/freedombone-image-make.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d23c3f221d894cd6b5b9f7b764156fd5b88f40b2
GIT binary patch
literal 450
zcmaKozfQw25XOsO3L6Ux!wn2DxNVXGQK};KPmm%tN|c5UU64tf){xqj?N;z`RUfIZ
zz@-%`6DNJT?|eU<&))C0R~P%;wt;bux<Pg70%LqkhulXWp{`L!{POJA)fk>({l_t-
zr1Bx+T5~anC`{8h1u6=dyoOl-ni+!)4O}dk;)WGaD!GJ+ezKBRtl7|psv3dYX*3E3
zahy%Ew4XE*B|lhhNLY|5Q<_WR1GhcFz6{Bw*jP~*1*ewXY+FMq3=@WA-z(;WL9(@~
zC>LGG7gXUYy|pQccj6Qkx@3w3B9{g3;Dh(hjg?euMJw_m)l&N)R)<peoGu(~?@quo
z*!NZvXJn`tHMkuaQG>TSZTpe5JH+ua+w~t@-*KCs`!qwAq-?|Mhy06rGiyx6d`;&#
NtyFJ=z{3BwegL4`g6jYP

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-image-mesh.json b/locale/fr_BE/freedombone-image-mesh.json
new file mode 100644
index 000000000..d7fd53ef9
--- /dev/null
+++ b/locale/fr_BE/freedombone-image-mesh.json
@@ -0,0 +1,18 @@
+{
+    "Regenerating ssh host keys": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-image-mesh.mo b/locale/fr_BE/freedombone-image-mesh.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5c8a261497c08d45b75760b064fb6852eb9554c6
GIT binary patch
literal 1355
zcmb`H-EP`26vx>{Z?dcHYMOT8Rc%+cnh<C^mWoMGLWf2QN@=BWgA6g?Hnovs(7Jc4
z`bd3+oe%@fM%gsYQt~^;`TKk&aDR9EGJSt{n}YQMt~YRL7p%P}aMOGX#NclNo50AI
zzzh&hfK^*qCtz(njdxt289zx_c(Jz)*5<QRY6tiQ82JKNh!qLz^<wWiWPFtd7uMEB
z%x%pb&3Br+ni<XanjbXxG_ht@)6~pqTAF#yLd0^l>N#g;>9X%j8iqE4wbgOF=Bd-}
zRvOKd^@>{4J9pPh+;Y9KP}GE+TqE)z*)m%));TA=fFdQ(fN>v%Oi|=BN&8C38ylHo
ztjr%&3Qm>j6GhC`RsVaK|5Z++{|;1qN)@UEV))1y5<{QsUBZG#^t1S1op0%Qwqwbr
z1ZH(bVM>dc%$n)8y!u7C?W7`gYtjo?{})-5`_HPs3>FoZ2sUqK*8J)^e=A^qW;TG;
zXA*flI;5ORq8J~dFdU(g2vyW&m}*IJ37-$H`}l&&kO^)hW)(U8u5e%Qso~aLXZgs=
z=8R*(73B)IZ^qO{3Y6wJAdDZO{)otss?tOaaB-=VgogtvvBUeqhZ1a5>@j7uf{7#n
zhBtH#KQTU@xnU`PgkrO_%h6|KWsFv{jgKXT@&(6Lc#k&9=d44V+sFB0+bY-x1v`I`
m-M2n=K#M&(Wl<w*rJp)RgYe;m3?bS;b}Nn%|KU8i8$SVoGGGw^

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-image.json b/locale/fr_BE/freedombone-image.json
new file mode 100644
index 000000000..a4fd155c1
--- /dev/null
+++ b/locale/fr_BE/freedombone-image.json
@@ -0,0 +1,10 @@
+{
+    "Config file $CONFIG_FILENAME not found": "",
+    "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
+    "\nImage was created.\n\nYou will be able to log into it with:\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
+    "Username: $USERNAME\nPassword: $PASSWORD": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-image.mo b/locale/fr_BE/freedombone-image.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fb5eaf224fb147d5635e9822b969607786cbffe1
GIT binary patch
literal 843
zcma))(Qeu>6o#{nn|XKJ?Jmwmw6)UA2&EK)n93lu(FjBkHmx_v5C>8P8^uo9H0{x<
zK2l#{Cy>F-H1$Z<_uKwu{l_|w5BIN2j}P|-)=OM(afSH?t2jQW)<K;f)CW{=o*Bk-
z<R$VQvWxtJyhXZ5d<WHgRJrXH>XY1#ReQ1LdBJ+Yi-L`U&4PBpR!-us*^<MSDOjYO
zX&#md`7Sfq#z_Km4s4!q&=L~4gjk@6HQwo!O$;(sJQZxsZ7`=3XFTk94)K{%TbYJ<
z=65EOZ=-RK7=ZO;vuPQ9ci`l&fsh&^nTfE}l_H9l5XBhB?2d+g_sT%iRdD?q7Auyr
zh32U$Ve}L>MFzZ(SrWoR3e92xOhdw%(qR7b+@b4Dz1iQ4hCdny<e%wFd3vQ*$0je$
zp40D42f?g2@;dHtw#!O4U`{62#uFPg{8ZlZg{E#uzhd-Q3L9dpA@~nXG4UPoT+caP
zS>+1BPtaUw8vNYgr)zY6+$7jpYxf0;>vpCi+Bo`BCRD^z>WGC5W3jZMF^@IzlPqNk
z?aOqnY!I8>R<)}w*vs~bfKOnZ5`PrXZax>7j`naoY^YYOI<3@bwGmin_W7A@HOuwd
j#SMDtnBT>DBmcEFZ^(d&WrlNSLzK=wJ7hn=`8fUoI;`Gb

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-keydrive.json b/locale/fr_BE/freedombone-keydrive.json
new file mode 100644
index 000000000..eb6c94efb
--- /dev/null
+++ b/locale/fr_BE/freedombone-keydrive.json
@@ -0,0 +1,17 @@
+{
+    "${PROJECT_NAME}-keydrive -u [username] -d [device, eg. sdb] --master [yes/no] -n [no of fragments] --format [yes/no]": "",
+    "Home directory for $MY_USERNAME not found. This user may not exist on the system": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "No .gnupg directory was found for $MY_USERNAME": "",
+    "GPG Keyring copied to $USB_DRIVE. You may now remove the drive.": "",
+    "Unable to copy gpg keyring to $USB_DRIVE": "",
+    "Made directory $FRAGMENTS_DIR": "",
+    "There was a problem making the directory $FRAGMENTS_DIR": "",
+    "A key fragment already exists on the drive for the user $MY_USERNAME": "",
+    "Not enough key fragments available ${no_of_local_shares}": "",
+    "Number of fragments on the drive: ${no_of_usb_shares}": "",
+    "Too many key fragments exist in $FRAGMENTS_DIR": "",
+    "There was a problem copying the key fragment to $USB_DRIVE": "",
+    "Files found: ${no_of_usb_shares}": "",
+    "Key fragment copied to $USB_DRIVE. You may now remove the drive.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-keydrive.mo b/locale/fr_BE/freedombone-keydrive.mo
new file mode 100644
index 0000000000000000000000000000000000000000..cf6384ab47ca1a8150824fab486f9027bc84f81b
GIT binary patch
literal 1496
zcmd5+O;6iE5KUXRhxAhQ+9J&%2P$<92_KD&XbZ%lX`2uQ2MMAIZQ`}#V(&(~>wt^+
zX^5Z1U+CBlP9h<CttI=-dgslX*%|x(?)I&5e|KBL>kZ!T@t!Ty)iZp|a0PJ%*Pjq~
z5KTmdXdxm4t<}Q%g4V0&rP5c#CSpC`K}#1_1FfwWd7M9p-FycvD6EwC&Okpz2k|wk
zpcY!`h1Sde%xbiHMw_|}+(5FC7BYcKv$uEHwmZ&oDcyC(OftBn3MfpZ7=|o@h+YKT
z2R(j@Cj|QO1TI(to}_-nxK_Zf0;M6~OESIIiT$Y1NKBFkrNua)1yuUS`=v%k?Q@EG
zr7u$g_!B=>l^Ju<(S%bGV^#@paS4(|Vv4M^3K>k9X&iPB;m3@Kkpku}3;m0a+@jPp
zmBj$<qkhMEw8%)rTt8HaMdjHP%ALKoeM7LGEJ+|S3}VG3rxE)F#D#&&roo7P1m>Hd
z+#$Xs5mlN=7$i)sae;3*47dQ{73rze%@Z=Bx^Ocp*WKRHcl*F8^^fgdDs1d6^$%z$
z8FiDqjS2*xA0J?}Y?WpQmG<d8NJoI_^BCJQAG36#JgnT!c#H1X9G!2O;EV$WS-`w&
zdNx2aVU=K=k?~DLi<6ipk_J>`Dw(=5nnB2BVir`cxi}Zzd8~$oLk9&J7qLHHsuo9n
zN`o+)tp{2tMl_rg<7kM*E}rYsnJmk7rTC2>8ELuXgh>?$Zb4A3b9SZ4NbqU7-D=zO
zt*W_RJ`h~vcSD?H!Yt6}xi$%Dz;|GT#VMwDW9^ap+)q-jJSK_FN5aLSvY<W;bh#VG
zl7^&-4ObTMNw!qGwH?UK-Bk{sq57fRJ#xqa_E=+fq(L>R*4C@rWPOv=>P~gT+S;&c
n+h%=p`wV?a4`(ke<Vn~1S@|dBeoTFg=E?JYyPW?9=g;zAF}uJu

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-mesh-install.json b/locale/fr_BE/freedombone-mesh-install.json
new file mode 100644
index 000000000..633b692dc
--- /dev/null
+++ b/locale/fr_BE/freedombone-mesh-install.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-mesh-install -f [function] -r [rootdir]": "",
+    "File not found /usr/local/bin/tox-bootstrapd": "",
+    "Account to run Tox's DHT bootstrap daemon": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-mesh-install.mo b/locale/fr_BE/freedombone-mesh-install.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8a39880884f15f8ccf1939bdbf0999fa4b973b99
GIT binary patch
literal 723
zcmbVKU279T6kR3wu=?b)5BH&<1t*(LO<lJ{h{+ZsNgCtgLqjQ(+1X^u=1!QI4H4~6
zEB#6R3*PNQ3IzqdaOR%NoclG*-R;fG#@+3WNA`^HiZH4IvR}2k_lLx<32zCt{QaIy
zh`o5?d0)xT$v-EMhR(`}J^csP6GE5hz-cfgLaKMKEet-Vu+Z9BXZQv(F4r2pQ&mVn
z?I5Rw41&^{pwNOB!9ro+^p5RQGH=owC)aE(?TRV1ju!>69Oik6!YPdxzzoa{waApY
zXdL{U&d$Ch{nV>_J*w6e8uP}Z{s+U!x3o7JT@Hq`N-wmLfp#ltg8dwSC}*YFDk1-?
z;?(FXDI6PS?7K9Uc8NiS5z3uoH0IVH568*FRoHC#eT`0{W9g5LjKPsI*c4ph35XRp
zR=RHKauz-43`d(w!x9uaQ@D&FS}5mFi_-9doochTG2rGtwB7az)U^8s;Uk2H{`4$m
zeIt4G(rmyTb#1r8W7c}d+EE%F#hs(L{h`_E9G{bx&E!^9i~Lm@o%<t>%aSjtT5c{s
JC4T+O{NDgp+>`(S

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-mesh.json b/locale/fr_BE/freedombone-mesh.json
new file mode 100644
index 000000000..af1b22bbf
--- /dev/null
+++ b/locale/fr_BE/freedombone-mesh.json
@@ -0,0 +1,11 @@
+{
+    "File not found /usr/local/bin/tox-bootstrapd": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
+    "File not found ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
+    "Couldn't install toxid": "",
+    "Select a user on $AVAHI_DOMAIN:": "",
+    "Tox ID for $AVAHI_DOMAIN was not found": "",
+    "    Label:    $AVAHI_DOMAIN": "",
+    "    Address:  $AVAHI_DOMAIN": "",
+    "    Username: $USER": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-mesh.mo b/locale/fr_BE/freedombone-mesh.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8c9f54bfe8de467956b0957292b3ad845d64dd90
GIT binary patch
literal 858
zcmaKr-)_?|6vhMOD%^p@4M?1eY77ZCZ3?K$)Um98AX3{^ZMTcvOm5<IMy_4iPANCM
z*|bO6D{w+XODl~dS-*4q9e+8Nm52Mg7w*ITorB@wdV@<81xC5O&0cP^SKI9MUgkb=
zoFm);<Xhxd<Ok#&Iox#aWzVq+o}z$p`fS55CC^GmCC^K?OLj_jOZEx^#-(9e(gh2l
zayjXaowmwFD&JY)(pV}4SheP<)43Q#@z5<!L}{v-F(E)Dx{AKV|7v|YV*-@}4SrAq
zQd!7UE>m}^))05F(EAplJ7Iz)7AWL67AW~w?{UF)2H@vL`$8pD_%kkj9FfeFvc_t<
zOr4ang*x1=CQ4@RflnnKPNq@6f76M_g-fC|^Oe12+TZ#;Vu$msc)|`HfB7j}F`<@^
z+KsgOj&~$+O0JkTT*(l4y(!t+5}a}64dOv}C)KMpudSqI(vs=VCBBozPJbyVmnV?i
zQf-)R<u)VDU7x1XWK5H;OjOF{JcQ<qTW=(CO$F&Gy};*_%Ri-Q1t+jcTgMVkq5j?*
zT}(+^Giq@<(xDc=8r15aN$n#En$vnC{L~18X0;L2uCbSl*@_nz`EP4*?e(dg=X8#4
NnZ7yi7JpC~-fwk@>hu5r

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-meshweb.json b/locale/fr_BE/freedombone-meshweb.json
new file mode 100644
index 000000000..166d9b1f8
--- /dev/null
+++ b/locale/fr_BE/freedombone-meshweb.json
@@ -0,0 +1,27 @@
+{
+    "Blogging on the Mesh": "",
+    "A decentralized discussion group": "",
+    "Mail for the Mesh": "",
+    "IPFS could not be initialised": "",
+    "${MY_USERNAME}'s Blog": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS": "",
+    "Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "${MY_USERNAME}'s Mail": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
+    "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-meshweb.mo b/locale/fr_BE/freedombone-meshweb.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f53a4f1086af76625d66dfde1e3b5f76d36fbe81
GIT binary patch
literal 1875
zcmd^AQE$^Q5Drjy2)uyc1%YH>Y>dfkyRxmyRHSxIr;4Sm(yr3_GP#M{88W+aoQe(c
z)298T{RJ)wO_wPxj8`nB_vQTg{N4HDUSC~4%UxexYA{~H^9r8duQ9p@CP64cZxZwt
zkal0wLeD#}YhX>V>tN5oHo!teKnDp5eX9>NZ6oA>#qkWFe1e`Q=ry1xxtRSCY{>3|
zeIGLbttM#hD<!^dKpPJ=E%XquPvaRtFEY?$$Qbm(Y&ZZt`VUbRxzwRtN#d~!>LQo<
zPT>1Ya5R=8m}u2{-8Q@3T-9|Y^?d`uSQ(ghyJhxHYKQHE<%~w#KC+fmtZMTxVbnY^
zM&!m`3pQ&A8JsO3ruRJJWav?(1R62!BA+P=SxV|CA<vC@_<GaMyF`(Ec6R?B=1y|*
zVxsaFR0>YjEjg(=4S>?33Z?6nEq%tlRkMVg7C2*Dgn0`J94QHR9y2~h&?@SbB8&Q`
zTC>yWB1Z(Ci?~o|ND<>qF=#HIy4n}>I2Q??NH!&K4&Ug_69~KMq+>Vx)t(t~W5L<v
zNOX$b35FhX{uDEl^_RiIyi;4wYIT>SW^3-2+-y~JD%llDsf&0cA?HVP)HUr^)iQss
z`BB&8R(@E=+D&h`CiZru_zE8gZo0TnWq2DHh!xA6eplELe5zYb%bZUYHw*f{;0o>$
z+&iC811VtUCmvyZ4>_kq`czc{HNxdNPZI8rsKh3BgbRISpz@F@z2gON7h$N*8C*7e
z621DBtvwXO$_I`<qvE>WY4`BHq(p%_T!(Hl&{m<igA1SVR=HO!8QUeJRM_0z-5CHE
g+jPppM3z#^1O1TjaX`ipZ6r@>rXK$%Wc}*D0DIaE`Tzg`

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-mirrors.json b/locale/fr_BE/freedombone-mirrors.json
new file mode 100644
index 000000000..bcebe53c3
--- /dev/null
+++ b/locale/fr_BE/freedombone-mirrors.json
@@ -0,0 +1,8 @@
+{
+    "${PROJECT_NAME}-mirrors --sync [domain/url] -p [password]": "",
+    "  -p|--password [password]    Friend's mirrors user password": "",
+    "  -m|--mypassword [password]  Local mirrors user password": "",
+    "     --port [number]          Friend's server ssh port number": "",
+    "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "WARNING: failed to mirror repo ${repo_url}": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-mirrors.mo b/locale/fr_BE/freedombone-mirrors.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5056b1d20685686b9964620324d75f3009d423d6
GIT binary patch
literal 794
zcmbVKQBT`25YDDfNZH$-dAJ88wn>Jj1ysU1sdQl~qNS>$O`<}`ByMYz*wNW3s~A5G
z@ss!qToPK~VLa@l^L_Sx-{-UBhx@xvwTJsVhhmL#oiZ#o6i>%1)Lx<e75YZ#!#l_6
zP(7sj)FJe>;t={sNnW%TLFoN|At-{eOrwRd%F|1M=jB<s9HA5{-ZWqY&IN)oGbpJQ
z(;;d4m$7t_abvDE#xPzYayiivPau_u8V%&+0n2Wo%t*Q1ztRD$?)|6Okk~9#1mjqz
zT&g#Qt_WZ?l!9w%XU?G04{q7g{k7G0j>$QV_hP2n#?5eadK`2^hnlyw-<{E*H~8tp
zgv&(4g?HrzC^8KjH$`!VsINq1SubY41RAN857KKX@yD`AtGV0n^@Hb@w^et$T3Mki
z3m2L2!4h*jOXztA5Y0FmVcWT#u+}pVxiS-hEKre-rJDNCx|G%(COPti9cfIB4=O9S
zrrkJz3bsEh_zvC|cX%4IE(&gGI`)HGy0uaF_E>#~HCmz9^mm(nv$5sv@0<~rjl^6Q
a4|$Wid*+^SHO={y+$MN&7`WBnblgX;E$^8C

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-pin-cert.json b/locale/fr_BE/freedombone-pin-cert.json
new file mode 100644
index 000000000..dc2fd0c16
--- /dev/null
+++ b/locale/fr_BE/freedombone-pin-cert.json
@@ -0,0 +1,3 @@
+{
+    "No certificate found for $DOMAIN_NAME": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-pin-cert.mo b/locale/fr_BE/freedombone-pin-cert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ffd7178b513dfeb741c3cd404f86ef2d801ff074
GIT binary patch
literal 373
zcmaJ+O-lnY5RKAPym|JJgMxyo`(b5CU7@xs6x?l*;-MFb*=&u}Ny%o5{<zYg)W6`g
z6?${v&3iNR7-lx>)oE+9UJ;CA#2MmxTVUMpX~!3+Q^d&;A?mMhQIn#VXRX3ArJXmG
zQPOKx*#=6?j-3xid2d*dv9q6Ac|I)pt9G@qAeadg(BGab3rm_0^XxDR+X3xc@ESay
z{4BI!9-TLfxirva>O;C(`?T>DPYymOp{}&!87NyCm<g7=8&Ajc#>qK<vhJ%E3>Lex
zPNOc{%k&c10}HR{cr@XCr=`d1_yGS9EDFLq9^CRMnS`<E#3GK{ohY25m%r$x**@~G
VHJ;LE3A0Ada9icx9y3Y^{RJ2|XBq$i

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-recoverkey.json b/locale/fr_BE/freedombone-recoverkey.json
new file mode 100644
index 000000000..c48d48527
--- /dev/null
+++ b/locale/fr_BE/freedombone-recoverkey.json
@@ -0,0 +1,11 @@
+{
+    "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "",
+    "User $MY_USERNAME does not exist on the system": "",
+    "Encryption keys": "",
+    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
+    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
+    "GPG Keyring loaded to $HOME_DIR": "",
+    "ssh keys imported": "",
+    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
+    "Starting key retrieval from $REMOTE_SERVER...": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-recoverkey.mo b/locale/fr_BE/freedombone-recoverkey.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4da6218058ceaec148209ecdadce9fe6608229b5
GIT binary patch
literal 960
zcmcIj-EPw`6gJSSaDm_&#JT7NAe^l&gD#^;Yzw16)~ZV<v1wFZbJ~U_c4Rx<D#W8r
zd!)Sr$64uwgt+5K*7@x7|JlC2x_nf-zPe;29<9f;GPfaF9<R{T6?(8jZ&#>A=*1nz
z1nF<2`Hh8;zd|vgCwCcpNLrJ=Pgbfz$O)l){{iiG2erNa9(=}yPURFbB@#@)DyV<#
zMIj62ST72jDhX$}Ff8f~_v2bTLyd4Q3<xN+I?XVLT$R$g6n2I%JlKXrr*o__QGpSi
zu>JQ@_>*fKt2t^)2fT#i(x8?i#}nWQ99Kanwfc|#p!X@<iP^q72aP#J{F&H?uB1p?
zol3m0%X(uatw^P7M7Wk=qQx{vX<vfUU@*h6h2EL#YeH^j#ty>4VL0%8zjk1Su10Wi
z8m&%oE;7oXa;Oi&s27K9NbYV9NE8~7$^u@b#sU%K1~&_1F|Q4&HK<2l+3)J6V#~Qt
zh^NFc2uVs*Sfv+GUoteR=w0)tvMi>q-@h7|F|+D6Ak7P<Ehen5)pyFpy9qx;ZRolJ
zNE>a(3nxbAUet}kTT{bd_jZUVqJ_tc0t2w*xmIMv+!l;yLL0Q5(oT5$)=vv*Ca5_*
z36&7P0klt3>-Dozi;RCzIyV8xqS~5Ha|>=@=b40e(0K0kdokb9DBNS>yTVe{=6d5b
yUw_4$?YPkjHd;Yz!*90U9FZ>{;5>DM{L^*w$onGXv=mdyHqoQ)(EZb;c)tK7ogbzE

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-remote.json b/locale/fr_BE/freedombone-remote.json
new file mode 100644
index 000000000..c1c0d95e1
--- /dev/null
+++ b/locale/fr_BE/freedombone-remote.json
@@ -0,0 +1,6 @@
+{
+    "${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]": "",
+    "The user /home/$MY_USERNAME does not exist on the system": "",
+    "No remote backups list found: $FRIENDS_SERVERS_LIST": "",
+    "Remote backups list: $FRIENDS_SERVERS_LIST": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-remote.mo b/locale/fr_BE/freedombone-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3bfe477559d02ff543405bc95673f5eca9edb147
GIT binary patch
literal 630
zcmaJ<O>5gg5LJtNQExf-Fb5yn!p4@J235g@##X=~c8sj1G{%IDG`2U9cE#>0AB6t2
zke`&l(2*sYLqi81?+x?jV_~149(P*LPmd18JHiLTs7ffZnzr00ofAG2YWvT>$|u!+
z<2dgLOF|XmZOvB=UpJgpd@`QLt*HWyxv~hCJh?6l1DP-uR;rX~0PUk_98O2`i+LEG
zh0(n3iT-VP#X9{y34gO@I4faM8q|{KxCEBLqF&c*6B#y@92U8dP;g^zl}>>QYr9#t
z+7Gkn^f(;G&JVh!nhmK!15#PQyXs^m!EO-Dy|I|LVv^ND=xkJuo%ZCHGt=q{6U)Xa
zJ40=Rk^u<Mmw0DcqU4P`8BfBOlDFG+he}$Mmc{o424KnADKakP0VEr)4cb9zSImF$
zX)etQH49~;QX$s?_?N=Ev#iuSV@FEoCIDG%Q#0rtKrII!C42+#lRG<&*-#_5bR8RU
zOIv$gZ=ZGdSkI5We(<Fq^!IoDuiiO%S%f#DddPpRy>s`3%XP`uG;O6X4nueQE8IWJ
CoU)Su

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-renew-cert.json b/locale/fr_BE/freedombone-renew-cert.json
new file mode 100644
index 000000000..05340eeda
--- /dev/null
+++ b/locale/fr_BE/freedombone-renew-cert.json
@@ -0,0 +1,11 @@
+{
+    "${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]": "",
+    "Adding Let's Encrypt certificate": "",
+    "Renewing Let's Encrypt certificate": "",
+    "Unable to add Let's encrypt certificate": "",
+    "Save the requested public key to /etc/ssl/certs/$HOSTNAME.new.crt": "",
+    "/etc/ssl/certs/$HOSTNAME.new.crt then run this command again.": "",
+    "$0: openssl is not installed, exiting": "",
+    "/etc/nginx/sites-available/$HOSTNAME does not exist": "",
+    "$PROVIDER is not currently supported": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-renew-cert.mo b/locale/fr_BE/freedombone-renew-cert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e3484ec7adec3c47eecf33e7669c6ab4339a1a10
GIT binary patch
literal 903
zcmaKr&2AGh5XTqj0WCMq97ZUpAmMC2Xd7(_Qb>acYDkoZ9$HnEyE{ot9eZng(*(q$
zRehws0^?>$E+`{ezrXF7@yx9D;r{OB&cpp(Ko-(^MN9e(S#i8pZ`P``R&`R(p9DdZ
z_>l<2U&MVP#glryR;{(#C3WyL2wu?rCDGgUvlV5*SwU4$7t9LY6f^~`XQ>i{&QMt^
zL0C}Qfl$_QDKUKyxDZaLNl+RL`={Nb&hVd4k{g4{$tBo4%d~Nr1`)a>QWK#TkrfUt
z<8v+~zmgc0zV=T>-&?&7q#9SRP-^Q|G4ytnpmBENS5|miPK*OLMFl2TB&fVZ&t_bu
zz$aX&a?nasst%6P?ON!l#4IxhK9d-WggXrUlYbahinq+41DnG6R9mO`3@?CXaGn`G
z7b%*HozidW@>{1p3Wh#ld*%~9M_(Kmyvfm0|B&TZQY3JVOK=(<r?I88;D_>~@vb~g
ziyrVlJq(QgiHT#~l%1lnLaP`=wV`m~SfbTD>~(vc%~iEr3ENsZ`Z{d1%rFK=o>3-g
zVuz4Sxv}V)xf`>_#?NqN$7mSMQ2UX_(6|yV9LU^o$-ZbavoWabaci5kLs-e?TLqt>
z`Ys&wN33m-JF1Qy(d1*ORjT`}@`2SFqiQ|gtH<?5xmMphBVRVex$uo_bv-x>kGY!U
Rd_vjA=JIpL|89kae*t?Y19|`e

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-repair-database.json b/locale/fr_BE/freedombone-repair-database.json
new file mode 100644
index 000000000..51649c710
--- /dev/null
+++ b/locale/fr_BE/freedombone-repair-database.json
@@ -0,0 +1,4 @@
+{
+    "$DATABASE database corruption could not be repaired. Restored from backup.": "",
+    "${PROJECT_NAME} database maintenance": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-repair-database.mo b/locale/fr_BE/freedombone-repair-database.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2dd9433c9978a9b0c661a2869db8edd2942b8ad
GIT binary patch
literal 472
zcmaJ;!A`<J5XH!;-aLDl0|z~9rGQdPFey+I2$cpK4_wT)-D0)uHoIG*F@751llTRv
z5Q8Ttd71ZiU*2SPciYW*eYf4zuuc&dh)yN2riZrg6XZUkfjHRDPJUTs!!y)>SYzad
z?!bNWAfcK@R56H!lx3ka!I74E0$gZ_7)VyoOtQp;Ia697gH(zYL^OUc3$ym<`rh|3
zW<@iu8K*pE^~P5)pG~}BSPP_hW3eXVggi5;aEJq$WpnnSNi6u<@W;M)yt2%uF%(sf
zCgEqn9MI^zE^-X-LHtUkV!B`Il-Ng~q+F#;5|76s$@tO%JIb^X<fWuJc@T1?9N@)X
zs(z~n2im{na1Yj%5zIm|l#EtSKt@#K)K=5FCCv_L*`d{TZrV=!&g|OV1$xPxt+Q&8
Xf35bym{Pth=@QdY`7-bf`~~9&sVs{Y

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-restore-local.json b/locale/fr_BE/freedombone-restore-local.json
new file mode 100644
index 000000000..7941ffcc1
--- /dev/null
+++ b/locale/fr_BE/freedombone-restore-local.json
@@ -0,0 +1,55 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Setting permissions": "",
+    "Unmount encrypted USB": "",
+    "No backup directory found on the USB drive.": "",
+    "Checking that admin user exists": "",
+    "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "Restoring configuration files": "",
+    "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
+    "Restoring mysql settings": "",
+    "Get the MariaDB password from the backup": "",
+    "MariaDB password file not found": "",
+    "Restore the MariaDB user table": "",
+    "Try again using the password obtained from backup": "",
+    "Restarting database": "",
+    "Change the MariaDB password to the backup version": "",
+    "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
+    "Restoring Mutt settings for $USERNAME": "",
+    "Restoring gnupg settings for $USERNAME": "",
+    "Restoring procmail settings for $USERNAME": "",
+    "Restoring spamassassin settings for $USERNAME": "",
+    "Restoring admin user README": "",
+    "Restoring IPFS": "",
+    "Restoring ssh keys for $USERNAME": "",
+    "Restoring config files for $USERNAME": "",
+    "Restoring fin files for $USERNAME": "",
+    "Restoring local files for $USERNAME": "",
+    "Restoring certificates": "",
+    "Restoring personal settings for $USERNAME": "",
+    "Restoring public mailing list": "",
+    "Restoring XMPP settings": "",
+    "Restoring syncthing configuration": "",
+    "Restoring syncthing shared files": "",
+    "Restoring syncthing files for $USERNAME": "",
+    "Restoring Gogs settings": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restoring Wiki installation ${WIKI_DOMAIN_NAME}": "",
+    "Restoring blog installation": "",
+    "No content directory found after restoring blog": "",
+    "Restoring cjdns installation": "",
+    "Restoring emails for $USERNAME": "",
+    "Restoring DLNA cache": "",
+    "Restoring VoIP settings": "",
+    "Restoring Tox node settings": "",
+    "Restore $RESTORE_APP": "",
+    "Restore from USB drive is complete. You can now unplug it.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-restore-local.mo b/locale/fr_BE/freedombone-restore-local.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f9b4fcf4c2e0326e55783e4666e543d34b19215e
GIT binary patch
literal 3303
zcmd5;ZEqVz5I#hBb14!OXc2FVFwhFwjoVTzS1C#p6B+8nI8IAbXjtE^?QQOEue*D3
z+&1vbs{W+@1)jZ|oG&zK5ub<>J#(|OGqW?h&*a(DC+{shd-}w~&sF?=f<Jt|;=Voa
z@vC!uAL0SN8$eh<`n-_NACXQkcwQ5lt3YR?fERNMNWT=)w~*d_Eniy#euVD`cqX@i
z)GDOU3h8VieGKXJ>z?N_yFhpy=qxsY?*Mm!E{BJ}uYkxL(ualQeB?Uvi&ZC`dc*VF
z+Lwes0Nt*;KvyFTtOBtY(x-()c|!L^q5B%rnK$7J*aDsd-UD6$P6^=$68V8t!&<Im
zkj}o9`)dNf!S^=M>0tqh>II2<0|_g|I`ygId8@e&(g%>vo$@@FZyk6F9q$6&&z-k(
z+$OwB_#5Hxg!c${2>&4DghN7~Fd!6!Bf>G^gisRRC)_0r2_wRoP!T4C4+u4(A+&@k
z;U3|XaG!8S_>k}s;bX!B!aoWBB1FyqAJTHKx6l{HDlJ&G-`*T-^xNLbgvVpS>_o6G
z*OIT^U<o&7s&v4t%Jf6-@1_ac6WT}>V~6l}Wjw|jw~Pmoj9F@gW@29&YrGYe%-r%?
zZ;kDWnPDTXqOu*_YNf2VChYNXvkfkzJhIo_*jgVf3?>4JPq|^7C0Y$b5wS?6vCVT4
zY-{rd3$)zBX%wsC%X{ubBN+-7E6YaM7<lW;-Sz?1#Cf?bcO{dtu{;d9#bH_X(e2L9
zot@Q<?s8{6w`WsnCrDhH?AS4nM15fk1#l9pF0Xbw>pNSU?Y{Fq4_0S=L9XGo*WdW5
zy)y9D6&;cVQVSowndP}L1a~DU4pn!yzKX4g?Q_O_WYGYfHP;<v7^<<?3k5fVacj9h
zLD33Vp1TEHXN3#6<wKZdI(IX&;uoe2r}R~ngu;qCyQ5O(^B9MkvNTS@bj+l!7hB7h
zD7z7G9UgjiX;mLJ4%j~;7W#7C$)#Icy}7=Op#G%nXibd`j+-b`vdol5Sa+_nzSH}0
zvt)KtSi{<}uV;y6$C!6hJJ+Kb+TEqRn<Xy;=#SYvQ2VG(AdXwRr8>Ri^uKm{$LdQ@
ztKY`8YL~*h1|PYpr8QrmwIk_sE6Qc??+39tagT~ea?ITOz=J*E%(#6pN_GA;GTTyE
z5pfxwym<tgc(MC&oF?O<KqqDqDxZfhaTU$XgRpQ_N-_b7sTlhYdv{_OP>k<R^e-&a
zVJLm(jNOF|!GfiTCgBkX6~8FJOQRYyA<{gd2WA%g;2y*|(v5P!!s5l{o_jJAu0@cS
z)Z5G-5JRORiKJC*ya8B=k9kJ)F0^~-#gtG(ixs!u@jOxX;frysUE=<XA}645KN~x=
zr`qecZ|!8nnNjyq3azsN1_sTo85n3PL)U+8EQ<x=g6$89l|wU~)9X$~@XXAN#jwbD
z8|)=xX(g^e>3zAp0#?eSAaHLhb|mJ49OiJ8#pdg2oQ<QbI@ugT=59(vg5%+3)6x}=
z#%UmfY&c-j?jlIORphjUT-^9_)3Y?4GJfN!ohU6Iiook>bsr<6)(L92^4Z*CveAsi
zzOCVM>{Ys*ZhOAes4rGl^7&C4%o5RJ7M2&25Z$}x8lrJKmr^^bHRpC3sgH!NfiG2n
z*0)%5C~c(|f(63bk4i_T#oQ#or&+pmjpgFf`Iud2jSH3D#-O&MMaCGlRWMSEU0Q5h
ztu0=uU1|;*ms{UmZe3ZdH=EyY!?xBJd(vIG7n(M=D>v~^OUlRaHqtvc+W61)zx-7G
E2EwhS`Tzg`

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-restore-remote.json b/locale/fr_BE/freedombone-restore-remote.json
new file mode 100644
index 000000000..153baafb0
--- /dev/null
+++ b/locale/fr_BE/freedombone-restore-remote.json
@@ -0,0 +1,41 @@
+{
+    "No friends list found at $BACKUP_LIST": "",
+    "Server not found within the friends list": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "Restoring configuration files": "",
+    "Restoring MariaDB settings": "",
+    "Get the MariaDB password from the backup": "",
+    "MariaDB password file not found": "",
+    "Restore the MariaDB user table": "",
+    "Try again using the password obtained from backup": "",
+    "Restarting database": "",
+    "Change the MariaDB password to the backup version": "",
+    "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
+    "Restoring Mutt settings for $USERNAME": "",
+    "Restoring gnupg settings for $USERNAME": "",
+    "Restoring procmail settings for $USERNAME": "",
+    "Restoring spamassassin settings for $USERNAME": "",
+    "Restoring README": "",
+    "Restoring IPFS": "",
+    "Restoring ssh keys for $USERNAME": "",
+    "Restoring config files for $USERNAME": "",
+    "Restoring fin files for $USERNAME": "",
+    "Restoring local files for $USERNAME": "",
+    "Restoring certificates": "",
+    "Restoring personal settings for $USERNAME": "",
+    "Restoring public mailing list": "",
+    "Restoring XMPP settings": "",
+    "Restoring syncthing configuration": "",
+    "Restoring syncthing shared files": "",
+    "Restoring syncthing files for $USERNAME": "",
+    "Restoring Mediagoblin installation": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restoring Wiki installation $WIKI_DOMAIN_NAME": "",
+    "Restoring blog installation $FULLBLOG_DOMAIN_NAME": "",
+    "No content directory found after restoring blog": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-restore-remote.mo b/locale/fr_BE/freedombone-restore-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..98b52b1e6beb149636d186daba5aa02f15d727bb
GIT binary patch
literal 2425
zcmeHIYi}Dx6rHwi0aqXdh$5a-Fnu6x8oMC`S3!y$$FgcCR^m`p0o8bSydJWiS<TF*
z7=-v`Rew_d0%vwN>rIH0N_-`Xea_yw@11-7>g9{~Dz9F?Ao#n7&!_nOe8oKx0`b){
zs~0k-nVl}!*O1-5M#vYyF3<ypz}yP#L1qQ^e!)HmyICRR7VsP3C%_i)1K_W~cYp@y
zydoml#|8VcU@mrc`Yzaw>x6s=yajZASMui_U=7c|06zo50_=9d?iB2+g53vu`vxHn
zzXLiu26WZ^4WvN$0n7b>-7RG9^rJVj&VCPcy%+=YYQS9mum`(|u4fD)$KG`KKl`se
zAaA8@Bv*30n&Y(`D>+_w*q$;Oa%!iX4wx2fyG3JW%yXp!YE>#9Gyf=w=`q(vC`sBX
zo(mb$?yyUb_}tKmRx`?inUFLwTst$ZlqFqm&-a@exQLl&((fIND!U4f1ebxKkua7{
zR3Zb)EUmS++K&&1<X`DcM8v67xhmP+8gwfA+*qYudQZfWph6nUqKH`}PHRtkk9*Iy
z_Xb<N-Lu-`NQGy#cMkjgR)4QsSSac%X}PpC5SsglGe604Vo|p)VmoidrNXpzxdhCz
zF*7`sDSf)#S<l!wIyrV0wLj~Boi!`u<*IU*?yRdqgCt^QO2Xc7=b-f1=ho1U^z}Tp
z)Nt$4E32P0`Me_@2o|bwg!jB8gF#{!UeOy(YljD&efMTcIqY|~woeI0P&_B#PlMs`
zJh{)&)rs(#<>l1zawa0A?pEMVE{UBfB|5tisctE=2}--zK9oru7D+7)6DglXm$-^C
zPf9}Vr1YiUVy*lc6R)G0;Pv>_DZ3lt2B}n@iP;RZjepd6X;fpT`Ft<wrI}0LPF<W+
zT`dPJG%oJy!jqXY&4a9S<bZ1|oyCaL=fcHHmr8k8kP#-4g$zdtN()nkVvDJ<#ffw3
z_Ef%d4y7BobXBEO%g;=lTWqCel8zQj>=e7@4<3-AR=;5bc)h^;F<XmGD(V}O|86}r
z<G4EL4LXaX`pRmxo$U^9G>>_cT4+9qBP8~S`luOiV>7W6Z)2gSnKTowJxr?#P*sy|
zjD@WZBi!D|+fjOEnpDQ=quFdcq8Z)1C+QEge!n{08+mQb)0^&XV_2HBv07jER@c17
y#;E?V`R&8zT4SZLzV;Nl-abDTZoglsy8g7<$L~eLLU^0#XRS^(`>nbByZR5|8OF^3

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-rmemail.json b/locale/fr_BE/freedombone-rmemail.json
new file mode 100644
index 000000000..d67f055dd
--- /dev/null
+++ b/locale/fr_BE/freedombone-rmemail.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmemail -u [username] -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-rmemail.mo b/locale/fr_BE/freedombone-rmemail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..345eda5f0a2ab7ffab115ca62364df185aba7e27
GIT binary patch
literal 394
zcmaJ+O;5r=5M2$Y_2${b9z1B`AcbOTu_l5w!H6`Z@c<!aZ3kS_ZkydL(HMUk;V1DI
zT)>2zlf2BlnKxhS)$+KuUM-2WLyHrOiw&`MvvXVT**LH`Iv`~6m$z+}k>|TX_ya1(
zoQsS>#U_<TC3%ih2FND6JWo@FT2E`I-_dCJ81`Zksp10@1N{_UP-#&}p9#m4_-P<1
z<bn?RgK%GR>J8c}q(NyQ{wmRD#wst%j0@Re$vamXO;DK`czd1VQqNF9D3c-;a_%$l
zO&A(wmEsvZ6e`y~ljWA`pxI%&FgTO!mO1A%8phC5$c?=Y?zypBn+@j*8ZI=w*lGFg
lmhZOe?zKC%S{UI%Y##Yn+8)y<F6R}W+i5fP+6^fo^cVD)a47%)

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-rmlist.json b/locale/fr_BE/freedombone-rmlist.json
new file mode 100644
index 000000000..d6bc87564
--- /dev/null
+++ b/locale/fr_BE/freedombone-rmlist.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmlist -u [username] -l [mailing list name] -e [list email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-rmlist.mo b/locale/fr_BE/freedombone-rmlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..af88edc4b3cbbdc3c0667d0b91a8771ffb30c7be
GIT binary patch
literal 423
zcmaJ+!A`<J5Uqw&y?OR92M?M!NCB}HYob^aj7Wox2M951yWpC3OLn(JWBfG2C-Dmo
zg@l`vyv%#^UUp|z%f(@3wOm+K`-CIH*;-ItZ(7-3i2H<tJ<Hn0Nf9G$J>T|%UsPEt
zv;iz&RA{aw%lH^Dg;B;tD&!POdpqVZDkWc=z>-99t;dz)pK#EB3_6h&s{E732D=Hq
za-~HsJrIs7`Io^smvg(<?FBo_sn+aHE)ACkqwg8_z)<phmNFsR5PvYGx$z4#L3fu^
zOzH_&7|1wJXhRR&cVX->Efh=fAy=99K+a03{dyZV)IX7M1J0=(_9N^l&J1mb_sr0*
y^_tVdS`+JT<TSjChSzLXuP$3d%Hn{}#rlwcqwdgtVscurDZMsPZ+C%hS@s{mU3=vK

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-rmsipuser.json b/locale/fr_BE/freedombone-rmsipuser.json
new file mode 100644
index 000000000..52e3578e5
--- /dev/null
+++ b/locale/fr_BE/freedombone-rmsipuser.json
@@ -0,0 +1,6 @@
+{
+    "${PROJECT_NAME}-rmsipuser [username]": "",
+    "SIP configuration file not found": "",
+    "User $MY_USERNAME not found": "",
+    "SIP user $MY_USERNAME removed": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-rmsipuser.mo b/locale/fr_BE/freedombone-rmsipuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..97113cccd899fedecf1da51edc6474af3e209476
GIT binary patch
literal 530
zcmah`!AiqG5Umg|@#a;9J@lZ5tx0Q3NU5N0go?4DO$93=G1<hGWH)R!MG-%(^ppAv
z&ZgMhbYOPg%zM0H*v)!%sBPA(2E;z(G2}=!5b3s5wFx+bM37tg(GH#L(81m>3nQh2
z{vULI<vQP3WChL3f(Z1aUKV8JS!;fI)5)zf^c%CWheFO`nv^1tlrt35lpw|>ih0SR
z#(d^Xl~X;^=E|+<KGvKd8DEk}Q*PBR#d?CjlThMugdd0~z}rUDv>5r27*;NIckDVf
zWws1`$eAQeV*fKIHj<z`&(naiJ__FgQ4l#OWsI#_CjwT)L|})7JfbYIk@ZTY?xk=|
zif=evZzGmhZ82!~(H0I)8M;K~neI(|JQSq59FGDCTib@&!^Q<}TfW(`yB+(Y*Xmlv
f0<?HamQ)?`r_@~NcL7VvAOW{nyj(ka^;P;0v1FL<

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-rmuser.json b/locale/fr_BE/freedombone-rmuser.json
new file mode 100644
index 000000000..77abc3006
--- /dev/null
+++ b/locale/fr_BE/freedombone-rmuser.json
@@ -0,0 +1,10 @@
+{
+    "Home directory does not exist for $MY_USERNAME": "",
+    "$COMPLETION_FILE not found": "",
+    "No admin user specified in $COMPLETION_FILE": "",
+    "No admin username specified in $COMPLETION_FILE": "",
+    "The administrator user cannot be removed": "",
+    "Do you really wish to remove the user '$MY_USERNAME' (y/n) ?": "",
+    "User $MY_USERNAME was not removed": "",
+    "User $MY_USERNAME was removed": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-rmuser.mo b/locale/fr_BE/freedombone-rmuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..36e062f89d83bec00473864a32f40c4d199932cb
GIT binary patch
literal 800
zcmaKqVQbqk5QaVGZH>E6`#3hZL7*u^Nu0DLxXs3vx-1YUp>qf8m!aBnqTxtElG7UY
z*Ghj<|H96(aR=Kfke<`&<-I%O`@7p$_Wj+hg{y)44eq$O;HuJf^uCTdb@Upe#uLkG
zA)ClHGC;mV{zAS*q7OzVb+n7OGKVSa+0){*tmhS9RNSf9sOVJOt@yIw*?8jHQwcO)
zaRHfT3iO&qJmD+`%rr-{U_SA~@of4Jt)MIRxE_QwkjPBL_McYal9eU7Hi{al%F+=P
zh5m|xVk@~}v32p)Kc9XIeEW;UQZZL7LUj(YWP0n(ZqNcNC};-XYdKug^11S{FN(?j
zQvCOI4_bLg?88U<R6;H@?1!dl4%b{S!N{sTFgV8co9z|Wb0vRbdt@AwZ%k<}g$LXn
z2zFygB*n%F#)1Fv<hHxcND9M*Az{8|9vD=1)+y!U7@{Rrnweo{5;AzuDJpcr6!AqQ
zV=fjR46e9w=4qyAO3tKOX%EDDd)33<F_hu3CEx?N`_6n8k`WGLusd=}4OZ=S-6PUH
wAiY88_PxWtcQ9!8-2NqM$vNBbVvt9rhnLQTibX~j=$5D-pM7WhLl%eg8+ioS;{X5v

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-rmxmpp.json b/locale/fr_BE/freedombone-rmxmpp.json
new file mode 100644
index 000000000..12011469d
--- /dev/null
+++ b/locale/fr_BE/freedombone-rmxmpp.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmxmpp -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-rmxmpp.mo b/locale/fr_BE/freedombone-rmxmpp.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fd9ace6f758c5452f8413503e8f60dda5dcb0b87
GIT binary patch
literal 377
zcmaJ+O-sW-5M8CG_2${b9z0lZYSXkOZjGQZLdDupf`^L8nr!1rvI)DJQW1Yz=}+ok
zaN7#KIq;bGW*+mgUM-Is>(vt3IJ7viINt~xSG%;$P0M|YqXUGpzq+;@J>87LA5g`j
zs44=SyzqjFoUk-iT<h1y>31|4KZHSyB2|9!#K16xXRfp;B_+b~BwrXvN;$`);V9g<
zoK_nLr8Ha`h`%aMiLuU$DrZ6tNb<py=Ekqh47|NhF{x)<K`4_l6*8m5dlv>rd97Fu
z_oXT{C9>K|?RN%bNBuKNu8Gsc(Kv=cac1mwaL0_@+G#s|Xm_FG#g0pRF6~~n`i?ub
dUYPK?*gW#DwKv6&OlCF9?6jGByA3fy_!l|%Xw?7!

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-sec.json b/locale/fr_BE/freedombone-sec.json
new file mode 100644
index 000000000..a95e9be50
--- /dev/null
+++ b/locale/fr_BE/freedombone-sec.json
@@ -0,0 +1,29 @@
+{
+    "Freedombone Security Configuration": "",
+    "\\nWeb/IMAP Ciphers:": "",
+    "Protocols:": "",
+    "Ciphers:": "",
+    "\\nSecure Shell Ciphers:": "",
+    "MACs:": "",
+    "KEX:": "",
+    "Host key algorithms:": "",
+    "SSH Passwords": "",
+    "\\nAllow SSH login using passwords?": "",
+    "\\nXMPP Ciphers:": "",
+    "ECC Curve:": "",
+    "Final Confirmation": "",
+    "\\nPlease confirm that you wish your security settings to be changed?\\n\\nWARNING: any mistakes made in the security settings could compromise your system, so be extra careful when answering 'yes'.": "",
+    "Renew a StartSSL certificate": "",
+    "Freedombone Security Settings": "",
+    "Enter the domain name": "",
+    "Don't include the https://": "",
+    "An existing certificate for $renew_domain was not found": "",
+    "Invalid domain name: $renew_domain": "",
+    "Renew a Let's Encrypt certificate": "",
+    "Create a new Let's Encrypt certificate": "",
+    "Invalid domain name: $new_domain": "",
+    "Update ciphersuite": "",
+    "The ciphersuite has been updated to recommended versions": "",
+    "Import file $IMPORT_FILE not found": "",
+    "Security settings exported to $EXPORT_FILE": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-sec.mo b/locale/fr_BE/freedombone-sec.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6212166b5a7c610793598f249b3ea24ef579b373
GIT binary patch
literal 1694
zcmaKsfo>Z`5QYzM5pq=_6(|w{X+RMvh)d!Gigi_}jO$Q~IJIIIq7W$SyRmPZyWL}V
z&#oV?>Lc|P_|La-42Ya;fB){z?##{1`pxTCcN=eBzY6et>c4)75!74N%9VO=t-f5V
zPoVC+9RyAAKKK!M0DcYj!7o4u-UV@<pQ+Vn>$wltssR<e69l(_TVQqWZSZsO9#}=$
z2Je8+z&03z{(Pv)BhH7y?^=IcD;)p9TD`wkv{rsM?7qj`J%n)^IXJ1p!E^p@&EGsP
zJb(B6!}Gc4pPs^V;u(7;p6ogGoO!06(({GqrDx`udn!-uS$O{CX*{i`tJsxA%Em@P
z*RXI*f)p?4nBBIeo{G(~a1^s~aw=o22amPdb|h7tl?jtenNsHp8}04}y>6GfrI~XS
z^ps<>T1|8=q#`A94vzZAy~c>+(nz-?%g#wPv&1h8Z5$`$G;Q_HhEGq&D^pV1(Nvcz
zY4r2Tgr+iM+UgH#6RAW-U9G0l<ibg<f+NEWhZC)s)_ztNv(nsPGV-AWPqcM($x9O1
zOe4xPM`nKRokhW*(}f%w?R2a&$WyKoC2mO7mBq*j<3^+7f8=pAdO|~C?LwQx24mzg
zt}9VWR3R0XCd`V;B0<(ysWBYuJZF_)I7i9w!ZvueTHo9oT&PZ#=>=6DGCf1`ON%^H
zapmn1OokZ?3!ioNP$}VPsY_Z&n^wZ0JpZl}$}_>1RHzvzk1o`O`n7X<(m(krBB7R)
zOY6iXTgnAG18%G4`0pvPF0%xV^TKFsVef5e9p~SWUHRab&IpQy;c1!CB1IyEvI{oV
zdu%V+Ztvh7Rux8}Q_j!_SAC4Ac(U6cbcUOAXM^F!xNgcuU(H1(6WZv}h_+DH;6?*e
zRo<J>0+qV%(~d$nBM()a8@C2sY-p?AhZcIlu?zc2_)A^Ih-9m+@XjI1F>em~gWmO0
zYiF;C4tA_uI9?VUk%Q%Kk>OT7tcqc9j}A*W4cpgt2HBdj32}jSf><JIPo!%OGu(nK
zJkkbjO{!Q8?cx4Is^#H*ML$sMtLE_OI9&Z7pvS_;Xuyc}_gW9ay>G+)_PBKreTPqL
nr*-h)9Jb*p&t=t)H=4H3o5$#!Qp|AL)I9&OSN*&H@6-GnmIKZ@

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-splitkey.json b/locale/fr_BE/freedombone-splitkey.json
new file mode 100644
index 000000000..5f1aeaf4e
--- /dev/null
+++ b/locale/fr_BE/freedombone-splitkey.json
@@ -0,0 +1,12 @@
+{
+    "${PROJECT_NAME}-splitkey -u [username] -n [number of fragments] -e [email address] --fullname [Full name]": "",
+    "User $MY_USERNAME does not exist on the system": "",
+    "gpg key for $MY_EMAIL_ADDRESS was not found": "",
+    "gpg backup key for '$MY_NAME' was not found": "",
+    "Unable to extract public key for $KEYID": "",
+    "Unable to extract private key for $KEYID": "",
+    "Unable to extract backup public key for $MY_BACKUP_KEY_ID": "",
+    "Unable to extract backup private key for $MY_BACKUP_KEY_ID": "",
+    "Unable to split the gpg key": "",
+    "$KEY_SHARES key shares created": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-splitkey.mo b/locale/fr_BE/freedombone-splitkey.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d0c1689f7462d43c11f95c13d9322639a16b7de0
GIT binary patch
literal 1020
zcmcIjU2oGc6b+E4?2T6tx)PN-gk0LLLnTv@x;7JKE35i}v{k5b6DRYQIFap?RTDpL
z+E3bF;5sdx*v8(llAL4TbM1SNmD`)^m-g+=wS{8~-`DtRGr_T5-mv!@=5E+0WQ}K*
zWnu!6uOi6aAhVxaRt51b;x^(Cv5a_y_zDqEK(>YI6~iUNUKsputljMnz0nAMQUxN_
z5T>~Z>?n)if-P|-q0~Q_dHr_p$m(_NiJ<eCflh&4YDs+!bLwB@8Dx?#sAhj<?YBFJ
zlfmrJJ9#=apU2$)SLU~N-zz^--um1>RhF?#%V>WQmBn0}b&|t0S4;|;updAKOhul|
znS?ZiP|_%2LMsd~n6iZO7-$ekrpyuv^EftnFg-v9#TItyYA`(h>UGA}=t~=ID{59}
z6qCT04Eqo4l4*A`@`k1u2vQ6gU)d#B8d3rJjDcDz%@TWpwHbS@hps-b6L;-(9~0g)
z@4l`uqd0VZr`ABG=giln7m)8vDxL}#c&#b$LW!S>h12i#y}MAYQgu41(C8HzFEi$X
zM&*Yrrd;fSkIgHlTe%KN^G+wJP$84V6Mh<S5xLNubL|Y`T+)~vq%u)1h^&~ZR(%gv
zw6!hZGt}NWgX1yj7(=l-(nVigs8?$rNwq=h&2eqV-NmO~sqZvSQA>tw!A&DiN_S74
VBPybtMz~ujXZxPB`m>6!^Bct7Ee8Mq

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-unignore.json b/locale/fr_BE/freedombone-unignore.json
new file mode 100644
index 000000000..135e92444
--- /dev/null
+++ b/locale/fr_BE/freedombone-unignore.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-unignore -u [username] -e [mail address] -t [text in subject line]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-unignore.mo b/locale/fr_BE/freedombone-unignore.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3224b5e42f8a8fd66cc3c0fe24ef7017c9ad42d9
GIT binary patch
literal 422
zcmaJ+!A`<J5Uqw&y?OR92M?OKNKvsAYofI#7?FlF9w5Xl?NHa0DcRi;jq%e6pTsY?
z1ru&g=4IZSeLJ(eUM&x6>($aSv2So>a8?NuH`}tQ1H*lTgFVaovm0fY(bmgdFZ^L8
ziHr(~z)BdE3MKIwj)5VJW?baJ(^R5TrlVn`@l%5!Q03$U6Aif_9M_J&qe1^E3}P#i
zMb&5Bl)a)<q96~1<C3|?l7bd?uiFcEM^3$A2L)*)&El^)dQdGmpXXdq2a<O#6>7iK
zQ|9h`l9QUEWFaL*Dk$^7od|75c`13$9t$~B9?*OvmEY{Zmii|Ix8R)GQ9ovZM6S*2
z*aO#QYqR0BSmTm4-PpPCuBxoJ+SfzlWdmG@>LdSJ+e7=AQ&#fKOq<HL`_Q&5`xiZD
BdyN19

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-update-date.json b/locale/fr_BE/freedombone-update-date.json
new file mode 100644
index 000000000..948bd604f
--- /dev/null
+++ b/locale/fr_BE/freedombone-update-date.json
@@ -0,0 +1,5 @@
+{
+    "Date went backwards between tlsdate updates. ": "",
+    "tlsdate anomaly": "",
+    "Incorrect date: $DATE_BEFORE -> $DATE_AFTER": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-update-date.mo b/locale/fr_BE/freedombone-update-date.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4ff1cd95f1342ffb3e31131618f4d3736eacfe14
GIT binary patch
literal 487
zcmaJ;QES355bnUI?qRU!J>0_{Hbz|QR7#zK(+Y)&B4rP<F=88Cx0;kB)%oMZpX6WI
z#o~M!3;DSF?!M&ilKpObS=sNl7Oo273h`(NuGi8W>>c`V2!bf(7r);5*)fJ8lSTfg
z*BwN`q!RL2NXcRi3DwMp>wY&1-k*ZOXc7SFl-%lL4%Uoon9=xaO=Y5B#`Kyo4mwlj
zC=|IdstVRILb+JdY-5e3_{0h%Ovnq9Diz#^)b%*~)+82uWe>w)a7wvV$L<NPu^fpu
zIX0zHd7o!A<t>Oms8me13q2>^Nhc{+b0$fE^CT%>_~6Y_ZI81;(u@p*Tq+-UexRyd
zYeDI@Z#Z<oy|u@qi1Z|*8oMKATpwzV+ayk%)V#=j@Ef=rRj1yZqLxh9Dm8=rEA^)K
SGv$kdF7URw#8<V=PuM?(@{ErF

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-wifi.json b/locale/fr_BE/freedombone-wifi.json
new file mode 100644
index 000000000..73b09f04c
--- /dev/null
+++ b/locale/fr_BE/freedombone-wifi.json
@@ -0,0 +1,9 @@
+{
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
+    "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-wifi.mo b/locale/fr_BE/freedombone-wifi.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b9885e2a302b67567f9b32f7766b2a4e70139a34
GIT binary patch
literal 782
zcmbu7OKTf35XaTxLfM?!ODXg)ha3{9T-$kIHaL(vPI0Mg6Pp&|gd*?G+Dg~bBF)+j
zAs;Q|Bjqb}WC!QgONZ6!r+G+!JsuzK-&P(U?giUxZXdW^h5_4?dqeLx^kqX^8+ygG
z^+Jfyzu|se{f_CWjw!_1&;MXdFaMLy9Aawc6KfFK)?|8GIz`$V@%^ONxsywsX^<Mm
z+7P--C3pprU`#hfAP-~jb;?x0xKQ2~Gp9UWRkm*j=l!pp_DBpi-dGHW-P2f%xHcA-
zrklZyEn%ts49G(1k(rlMCWV<=ASej(U}!U1Du<BRdBNf)IfqhJuprpMX%$XrhR*t3
zVChUiGi7)xhbdri7$o+g0Suc62q}`%xrYhncKH!(NMj)g*QF=$m}5fF{~e2j++F2o
zkTpaiZKfW!Z-Y!RaQ2$BWH*&R(0M+y7<9d9@DItvnnl#>_Bzj@dbJku2@`9Os}lg?
z%uhwGv^j!grkqD=m6XZmbDmSiXXs?dBsS&6V`xq^MT4AgDVJx~&3z1}SPgxvaRh5@
z?HD+Q`ffDnk7V27>PF?MB8;I?s~^hRzHBr{^}YCjzr*U@!Tts3%5z-ku#tbJ9$rM>
Vl$n-l%Clwe*XK^OeuP3qe*wi3?KA)Y

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-xmpp-pass.json b/locale/fr_BE/freedombone-xmpp-pass.json
new file mode 100644
index 000000000..a416ce8ea
--- /dev/null
+++ b/locale/fr_BE/freedombone-xmpp-pass.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-xmpp-pass -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-xmpp-pass.mo b/locale/fr_BE/freedombone-xmpp-pass.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0bc90e3da34b45f295fb679808f1ca3b6cc10488
GIT binary patch
literal 380
zcmaJ+%SyvQ6dk3jap&5_EL<pfYm!zCsSz|rs2Ceca8VH%lWCliOv210RK!m!{iOba
z(^lxt%RQX?INZl-xj5{smJ4KT-{8pLY@Hap-qMEGHQ(T1524v#y)`j<zKy~kn3r`8
zHC2iLBd@HaydX5oBvb0GbNn5TM~`8UpjcKjmTDMg@WQ0xmGB6+UBTuW(n_>A8b;x+
zWp^zcR6;YMA^EDAN3>C%*9GNbK+;bt71MsBr{L~%k_t6t5<-zy85g-n+z+mCTr`pv
z@KDK8c|_EkRQb+;Y(xJ<kQ-v3;&_xmAQ{!>I=H9WY;`RA60ANrZesVm3*%SazGF{}
d7RIdQ>qq{T_9pm=ioBt@nKqU0cOgay{{oqeY1;q*

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone-zram.json b/locale/fr_BE/freedombone-zram.json
new file mode 100644
index 000000000..de1f963de
--- /dev/null
+++ b/locale/fr_BE/freedombone-zram.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-zram [on|off]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-zram.mo b/locale/fr_BE/freedombone-zram.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3d8c714915cd5d5a2a2f191733986fc709344b4b
GIT binary patch
literal 365
zcmaJ+O-sW-5M8CG_2yY&4;~bp+Qcd$HG<X%6>CEY9$G}!bQ2@#Y}jmzpFgeiC-pBl
zZH3+(<}q((9`mu7&vt8z`HYcm6ZQzl%Y^J=9aeFlctF_MVr=+V&xo^!t8VxMpGJ<w
zP~*2w)2G_OSJdy_h3%L{M!%`VLT3bz%2c^VU*wL5>fJ)3amu@$Zn$YV^#*Tiv<fZ6
zAEokzCFMz3$Q)ZDd6lM8HkjBHyp7ICtWsql#6*vB%zWX!<d#Rp#K;0}wHa5wz;cyV
zf!h*m8XTgy6wVQkdNH((l9sN68)<2)+i=dI(FE6vom2me+^c&{XFyu$t7*P`<X@>f
T;P(=<iOgtPYM!q{&KUm%)%|3k

literal 0
HcmV?d00001

diff --git a/locale/fr_BE/freedombone.json b/locale/fr_BE/freedombone.json
new file mode 100644
index 000000000..91cd0528b
--- /dev/null
+++ b/locale/fr_BE/freedombone.json
@@ -0,0 +1,146 @@
+{
+    "Search engine login": "",
+    "${PROJECT_NAME} -c [configuration file]": "",
+    "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD',": "",
+    "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA', '$VARIANT_WRITER', '$VARIANT_DEVELOPER'": "",
+    "or '$VARIANT_MESH'.": "",
+    "If you wish to install everything except email then use the '$VARIANT_NONMAILBOX' variaint.": "",
+    "The command ${PROJECT_NAME}-remote was not found": "",
+    "  ${PROJECT_NAME}-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes": "",
+    "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
+    "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
+    "The command ${PROJECT_NAME}-config was not found": "",
+    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
+    "Encrypted backup to other servers": "",
+    "${PROJECT_NAME} Configuration": "",
+    "\\nDo you wish to configure some remote backup locations?": "",
+    "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
+    "'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant.": "",
+    "The configuration file $CONFIGURATION_FILE was not found": "",
+    "Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
+    "No Tor installation found. ${onion_service_name} onion site cannot be configured.": "",
+    "${onion_service_name} onion site hostname not found": "",
+    "Private certificate for $CHECK_HOSTNAME was not created": "",
+    "Public certificate for $CHECK_HOSTNAME was not created": "",
+    "Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
+    "Lets Encrypt failed for $SITE_DOMAIN_NAME, so try making a self-signed cert": "",
+    "Lets Encrypt failed for $SITE_DOMAIN_NAME": "",
+    "Mesh Networking (cjdns)": "",
+    "cjdns IPv6 address: $CJDNS_IPV6": "",
+    "cjdns public key: $CJDNS_PUBLIC_KEY": "",
+    "cjdns private key: $CJDNS_PRIVATE_KEY": "",
+    "cjdns password: $CJDNS_PASSWORD": "",
+    "cjdns port: $CJDNS_PORT": "",
+    "Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "ZeroNet Mail address": "",
+    "ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
+    "${MY_USERNAME}'s Forum": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "ZeroNet Forum address": "",
+    "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
+    "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "OneRNG package could not be downloaded": "",
+    "OneRNG package: $ONERNG_PACKAGE": "",
+    "Hash does not match. This could indicate that the package has been tampered with.": "",
+    "OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
+    "OneRNG actual hash: $hash": "",
+    "OneRNG Device": "",
+    "Please plug in the OneRNG device": "",
+    "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
+    "Added onion site for ${onion_service_name}": "",
+    "# Tripwire reports which have no violations don't need to be logged": "",
+    "ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE": "",
+    "Unknown subkey usage: $GPG_KEY_USAGE": "",
+    "Public key:  $MY_GPG_PUBLIC_KEY": "",
+    "Private key: $MY_GPG_PRIVATE_KEY": "",
+    "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
+    "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
+    "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
+    "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
+    "Change your GPG password": "",
+    "It's very important to add a password to your GPG key so that": "",
+    "if anyone does get access to your email they still won't be able": "",
+    "Publish your GPG public key": "",
+    "If you have imported legacy email which is not encrypted": "",
+    "ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE": "",
+    "Creating the $PUBLIC_MAILING_LIST mailing list": "",
+    "$PUBLIC_MAILING_LIST mailing list": "",
+    "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
+    "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
+    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "Email import directory $IMPORT_MAILDIR not found": "",
+    "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
+    "Your MariaDB password is: $MARIADB_PASSWORD": "",
+    "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
+    "Unable to clone repo $GOPATH/src/github.com/gogits/gogs": "",
+    "Gogs admin user password": "",
+    "Database password: $MARIADB_PASSWORD": "",
+    "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
+    "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "Note that there's a usability/security trade-off made here.": "",
+    "In order to allow git clone via http we don't redirect everything": "",
+    "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
+    "Your Tox node public key is": "",
+    "tox onion domain: ${TOX_ONION_HOSTNAME}": "",
+    "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
+    "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
+    "XMPP onion domain: ${XMPP_ONION_HOSTNAME}": "",
+    "Your XMPP password is: $XMPP_PASSWORD": "",
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
+    "IRC onion domain": "",
+    "IRC Server": "",
+    "Wiki password": "",
+    "Wiki onion domain: ${WIKI_ONION_HOSTNAME}": "",
+    "Wiki username: $MY_USERNAME": "",
+    "Wiki password: $WIKI_ADMIN_PASSWORD": "",
+    "Your blog username: $MY_USERNAME": "",
+    "Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
+    "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
+    "Blog onion domain: ${FULLBLOG_ONION_HOSTNAME}": "",
+    "Log into your blog at https://${FULLBLOG_ONION_HOSTNAME}/login": "",
+    "RSS Reader": "",
+    "RSS reader domain: ${RSS_READER_DOMAIN_NAME}": "",
+    "RSS reader onion domain: ${RSS_READER_ONION_HOSTNAME}": "",
+    "RSS reader admin username: admin": "",
+    "RSS reader admin password: ${RSS_READER_ADMIN_PASSWORD}": "",
+    "GNU Social": "",
+    "Microblog administrator": "",
+    "Microblog administrator nickname: $MY_USERNAME": "",
+    "Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
+    "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
+    "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
+    "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
+    "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
+    "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
+    "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
+    "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
+    "VoIP onion domain": "",
+    "VoIP Server": "",
+    "VoIP onion domain:$VOIP_ONION_HOSTNAME": "",
+    "VoIP server password: $VOIP_SERVER_PASSWORD": "",
+    "SIP onion domain": "",
+    "SIP Server": "",
+    "SIP onion_domain: $SIP_ONION_HOSTNAME": "",
+    "SIP server username: $MY_USERNAME": "",
+    "SIP server extension: 201": "",
+    "SIP server password: $SIP_SERVER_PASSWORD": "",
+    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "See /home/$MY_USERNAME/README for post-installation instructions.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone.mo b/locale/fr_BE/freedombone.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ed7eb24e96b462f0d559723d087295d96d7e3df3
GIT binary patch
literal 10918
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

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-addcert.json b/locale/fr_CH/freedombone-addcert.json
new file mode 100644
index 000000000..1b3ca325a
--- /dev/null
+++ b/locale/fr_CH/freedombone-addcert.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-addcert -h [hostname] -c [country code] -a [area] -l [location]": "",
+    "$0: openssl is not installed, exiting": "",
+    "Failed to install letsencrypt for domain $LETSENCRYPT_HOSTNAME": "",
+    "Certificate for $LETSENCRYPT_HOSTNAME could not be pinned": "",
+    "Certificate for $CERTFILE could not be pinned": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-addcert.mo b/locale/fr_CH/freedombone-addcert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6fe13ebd7534e3508f98a8d837c4573d66035fae
GIT binary patch
literal 704
zcmb7C!D`z;5LJumLA{iodzga@Ep$`MsasXSfuhR9!H$I^3XKV6BaQ40@~qfhhnOUv
z7V=5?g^p~R6j}-$c$&A`H*aTFy1%=9*}A{G^*Ej}UNJ_^g5!FdHu*L48-`$P<@*op
zGqV>@Ja5AJkn?i}Yxvm&v#0;T+MNh=jbv>F$^vNzima1Wg~dC-OXU>Jy%>#CrOKs4
zD7ArhoJ_O9aFjr<S5>hoJ42`y5f<LT<TyL}GEQ0psn`ab{^bc3I*XK>b?r7rg<eWU
z&>kh(adH$-zo*$l`QN--e{}MDWpn6_kVTPmzaSPcTWIS@F7XsZ4l{0+oLRGR(Y%o`
zlLjTT3TBn&>6E6^R{JWQP7aee^HQVFF?V8Eh;L{t??#}4knqxpT+@X=9*&d8tzf6)
z$C@0H6WO}P2plWl*A<Vr2l+x8i>|+Nr3fE&Mv^Vjh=jN+zUv6WGv)lWS{Yf1fi_DU
z0o9wO?RWQJOZ#sK_91xdr;|*?JVn#H_{twBf^H}HC^{cRH_U?FsMn2pyE|dfJ7KMu
d;)QAk`KR>Li9eDwU&%SUmF7o$;BS8^|0iTY&v^g<

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-addemail.json b/locale/fr_CH/freedombone-addemail.json
new file mode 100644
index 000000000..8787e7dd7
--- /dev/null
+++ b/locale/fr_CH/freedombone-addemail.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-addemail -u [username] -e [email address] -s [subject text] -g [group name] --public [yes|no]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-addemail.mo b/locale/fr_CH/freedombone-addemail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5805ba4f8e30ec95581c5ef5d217dcc1c2cdcc5f
GIT binary patch
literal 449
zcmaJ+%SyvQ6phkV+_`o!3l|DbO`<I^HG;&56>CEYE*gqVlW81DXTm&+Mg6qWPwFpt
z`+)AeaJc8(IrlNE<>I)pS}rVzL%<2(Vl5zUw`r57z(c^%fo1LNpn!q4UhjMHFD6An
zr-W4q8<ZJEB_~rlLYSg#TL*)rN<m4XOquZ~%{9{WOGBkZSt*67(XI*CW?ZoxWpk>2
zxEM7~zmq}#IgU~*kz(D6y9IuuQZc~;#9W`lAe;+6vwPiMynk|=jvWcEDc3li*EHCy
zysRt2cn9SlL@KI7qbJzk`y}CNLM4uQE(*rW0QqC4?W8i2RQOTIsR|IUH&TUO2W@G1
z#?c*e&+Vk2;z&}W;X3?4G;H-8w~d`^?D?sC6|}sd)oMC7?IC#afX>+ZBmY|cq5VR5
QX-EmvCh|RcvMtO00|3*71ONa4

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-addlist.json b/locale/fr_CH/freedombone-addlist.json
new file mode 100644
index 000000000..6c145e703
--- /dev/null
+++ b/locale/fr_CH/freedombone-addlist.json
@@ -0,0 +1,4 @@
+{
+    "${PROJECT_NAME}-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address] --public [yes|no]": "",
+    "Mailing list $MAILINGLIST was already added": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-addlist.mo b/locale/fr_CH/freedombone-addlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6d8b7cec78f69a4c600bbd45a2caaaa4a32f3dc3
GIT binary patch
literal 522
zcmaJ;O;5r=5Ur6@y?OR92M!vuNC8Pxf(b#?8VUp(4>ZIq?SgB{mh5gpqW(0(PvS2)
zEhKnyl9zci`{wP}Zo4@z?6w;N;}mg$sAUC4cc1cnjod@55NpKQiD4YZutJ7)76;~0
z9&<5+m@5rMujO{#-ecE&@nJ<3&{#4Wt${`ni;P~&>--SpxtOF7q>4#F=WGllhG72J
z>(EvZsC4qdLJgYEP{$z1$62P%j3rYF`(%+$Vje=UX6joc<3jOkFzi2f+P*Q6NoGLY
zh`chXcp@C&mMz$)CSf9$rssN{<C0Y>o9#qsCN%Na3+8}E<;^0dTr?njr&2N9O!bu5
zN1dcXO_?Me5hf8nhy(V7YjY5%lE&mAk#psMSmdQ@RvNIU%}W7yU|pGmzE9ftSQ<}9
z?y1IID`l%r$~984eXHu+R-D^<samd$P)mkv$+L_6E3J>rE)}zs&d_Zt-`Y<mew_IW
DX|9@r

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-addsipuser.json b/locale/fr_CH/freedombone-addsipuser.json
new file mode 100644
index 000000000..09080aa69
--- /dev/null
+++ b/locale/fr_CH/freedombone-addsipuser.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-addsipuser -u [username] -e [extension] -p [password]": "",
+    "SIP configuration file not found": "",
+    "User $MY_USERNAME not found": "",
+    "SIP user $MY_USERNAME amended": "",
+    "SIP user $MY_USERNAME added": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-addsipuser.mo b/locale/fr_CH/freedombone-addsipuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..dbf5a814195963e55d32d4db1dd6ad3c19c8a481
GIT binary patch
literal 596
zcmaJ;O-sW-5RFni#G6+?n1csBtTt)Y5UC(FYKzrSTR}^awb|5_b~o&9{6PI_(x2pC
zaJDJxMF$@5&Cc7MndEcwu~hn;d^i{jh!w<{O)%aHnsS8t9RY~KzWl9LQ8{ytV^7wQ
z7ZD-C#_@c?Co?{sabw0!%jbu!=$+6c(LBpFQ$TX)St00{^?@+xv1h}C=2BpqK`*0P
zKS`DJOY5(3`=S}uJI-YzhJh3*ALfc0v_i^941_e0%3LH)_cChRR)C#YQnLPOxAoTb
zuiBW2zpLMmmAZCLdoxz@fej34B;<-IJ7Ngj3j|I~aGXcC)o4XOC2y<j)}_F04C%aN
zEChqj?QBH3*oVPARhpSvZc-Bb_!Jd7Wr{>%AQLWzAq02axbX-#9g$<H#ySL%O;cU-
z_o0xr4FLz>ZMyMAhtw6Deid>=4R-a*-YzLui63;lO1R^PJ9}F})xSY6X|qRe7x~v(
WxpB{^80K_{uchj?e(Dy#+Wi98@}M;U

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-adduser.json b/locale/fr_CH/freedombone-adduser.json
new file mode 100644
index 000000000..179e11c3a
--- /dev/null
+++ b/locale/fr_CH/freedombone-adduser.json
@@ -0,0 +1,15 @@
+{
+    "The user $MY_USERNAME already exists": "",
+    "$COMPLETION_FILE not found": "",
+    "It's very important to add a password to your GPG key so that": "",
+    "if anyone does get access to your email they still won't be able": "",
+    "Adding an XMPP account for $MY_USERNAME": "",
+    "XMPP account not created": "",
+    "Adding XMPP client setup": "",
+    "Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs": "",
+    "New user $MY_USERNAME was created": "",
+    "Their SIP phone extension is $SIP_EXTENSION": "",
+    "Their login password is $NEW_USER_PASSWORD": "",
+    "They can download their GPG keys with:": "",
+    "They should also run ${PROJECT_NAME}-client on their system to ensure": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-adduser.mo b/locale/fr_CH/freedombone-adduser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..21d3660eb89a34c03aeac3e6505f8ab1ea9dea40
GIT binary patch
literal 1151
zcmaJ=U2oGc6b;a)f_UHoA;iN)su&;2x^`@oOht5ER*IT7YCHA;qqvFN8dAHmorVhW
z)298T{ROUD(+Px#l$;a$<ocd_Z>}yc?&Yp7FC4t?;{6D3`}z;|V7>MN+5H=i^AK?#
zv5I((7_Jn^{55-ytbEgPo)`_{#%c#yVa*<|nLPt{-{RVxTaI%ZqXmfOI?b){%;HCj
zpDdnR{A_Vx@ry-bacD8J7+a(UYjMo@7*2vPgeYN@Yfx0DGsi#a`|Vz{)6VrLlu76{
zLzqnjr$E1J$`unFn1TYXJBQ7d4_s&%iIm5=LcJ4&Ex(T+J59ZzU{2)%*mNeOCU}4r
zK;jq(%!pE%kg-`=h*Ux&Y`{0V03|?Ah<4hwz%Nd8EFzUV;$)amBONgwL!*5JJrOaI
z0OLxNBq7@5L^KrVL>99wD;9!gz1!JubsB?%PEc#MmjQpe)+nm=(wkZ+O{XR_8cQWL
zmNAKmNE1vm!E9v8q3|Q@cHaB-z7y7Zz2i>zz?LQvW5%z|n5wk><H1qS?>fs!5#bPv
zj3<Ji*X5Dcse+8@iRT!tF`Kjfzz>!!AyI@SHHDQ>2u{~J%t}%cFR&R*X=M_DRMEdg
z8Bq|SPSZHorrEXPkJzShR^_k}5WX;7js;aPrW!B>s?@qgbV^uaOkjaDOA^Qg-_S6m
zVA|t^QhcS6cAK&Lfl4za9<Wk{<IuQ~;PZUY4E*b@(&kpaE;tU9cKeGN^+2PtI7<lQ
zdk{^C#A&RidgNBFb&_y3qSEzwB+T@BP#H3v50g}q#61*psyyJc<*TZe_h3b<PdU7S
z(zATn>AQ7P7R=5)!0LEV-YV_7TQA*mrC-|icFNw)>&@-$-80m>T{>sR$bY4;&hjn7
U$0-?Ow2>Ut-{n_-@9$^+7Xp|-$N&HU

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-addxmpp.json b/locale/fr_CH/freedombone-addxmpp.json
new file mode 100644
index 000000000..505bc43eb
--- /dev/null
+++ b/locale/fr_CH/freedombone-addxmpp.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-addxmpp -e [email address] -p [password]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-addxmpp.mo b/locale/fr_CH/freedombone-addxmpp.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1e0f654ef8f4328ba0337703770bf2e86d61e56f
GIT binary patch
literal 394
zcmaJ+O-}+b5UqyOdh_g|2M?M!*agLPaZSj&MvTaYY&<}Ssk;ShmbPgNVvIkH@RRrp
z7BJ!FBrh{>=FQh?xj3w>mJ8%;-{HvNY)zcqY~98OE{+@y_7Ix=<z1U&=(*KNet;Im
ze4-Qvh6ijyd5K*{Gh>Dr6dovQ%%{}FuyXvJ_PUQroS{_950+bK7x2Qg;ZlT{`+;C{
z3%L|CuhZ@%yOLieUMz)W!b0|?Sct7to~x2_(Zu;X)rQ$<YDW<4beak?Vj2>W%Yut>
zh=Vt7y|kQaTEe~56BA;gHq=D5Cf<h8iNLqmKlRdX2C-(;y6fPMTDP@E{05K<s0Eo{
p4=?K>A=RtvM&D_n$7X!}$UoA6kiPds#du1`ZrVt{#t$As-Y*Bxa4!G=

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-backup-local.json b/locale/fr_CH/freedombone-backup-local.json
new file mode 100644
index 000000000..82a2f7b72
--- /dev/null
+++ b/locale/fr_CH/freedombone-backup-local.json
@@ -0,0 +1,35 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Unmount encrypted USB": "",
+    "Backup to USB drive is complete. You can now unplug it.": "",
+    "No MariaDB password was given": "",
+    "Obtaining ${1} database backup": "",
+    "${1} database could not be saved": "",
+    "WARNING: directory does not exist: ${1}": "",
+    "Backup key could not be found": "",
+    "There was a problem making the directory $USB_MOUNT/backup.": "",
+    "Less than 5% of space remaining on backup drive": "",
+    "Backing up gpg keys for $USERNAME": "",
+    "Backing up personal settings for $USERNAME": "",
+    "Backing up ssh keys for $USERNAME": "",
+    "Backing up fin files for $USERNAME": "",
+    "Backing up syncthing files for $USERNAME": "",
+    "Backing up config files for $USERNAME": "",
+    "Backing up local files for $USERNAME": "",
+    "Backing up Mutt settings for $USERNAME": "",
+    "Creating an email archive for $USERNAME": "",
+    "Backing up emails for $USERNAME": "",
+    "Backing up spamassassin settings for $USERNAME": "",
+    "Backing up procmail settings for $USERNAME": "",
+    "Backing up $source_directory to $dest_directory": "",
+    "Backing up ${PROJECT_NAME} configuration files": "",
+    "Backing up README": "",
+    "Backing up VoIP settings": "",
+    "Unable to backup mysql settings": "",
+    "Backing up some additional directories": "",
+    "WARNING: The backup directory $destination_dir is already used.": "",
+    "Choose a different destination name for backing up $backup_dir": "",
+    "WARNING: Directory $backup_dir does not exist": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-backup-local.mo b/locale/fr_CH/freedombone-backup-local.mo
new file mode 100644
index 0000000000000000000000000000000000000000..70ecea6a15d2ecc2af3f984926a5a3554ef31406
GIT binary patch
literal 2324
zcmeHIZEqVz5MICqWcUC`NL1ows9Y$Bb7F^p<&dDnHV{-hmg}^lAKI?(_IyXqyT|Tc
zQWN#3RsBi*3p{)0o^1(iB)($Bd7jJ8%+Aa+b9wpV`3IGkFP<}eZsGeezTdp&o*4V#
z^(7MMA)dbgJ_5cEgd5mLCA(d+&q{WyWS@iGe1owX@BsKV@W}!Z3CzVVSiNM<>)i@t
zcYt-^C%^~5?|~WcOCWr}c1qR)yKw`z0FQt!+Mht@3tO;HOLntlE@$>8V_g6NKLiS(
zyWtvm1cW!3SF#_$-g~RKdkB07or4XS`+&XuKl{%;s9iUnQNS&qa3jc9SrU*`mL`G>
zzZ3yG;r>M|r<A4C&#WaQti`jTP-&{2-|LMA$Nk=_*{FBiUH{8{bvi5^S518-!+1(z
zoQMqp#f-<vhVw9%+d@p!DP4&9h9HUZd9p1`Dzs4&cH6s<YUR7U|AnbhGeJBEVjJhd
zgIEjSDjf^6+ANdu88-$$sCRn;#zb36HgoCQ$cg(;0zh<hZG9|4mC0f(aB3Bu-#ei|
z$CrX)1It;O2rKIJo65-N62o*wnM{*xO0li8juza_58)`+mALjJ=e<5pcZD%zBUtU<
zCKVEj_XTO^BAvUEG{Iydh5T;TKRX|cE8|FLL08-mCkQY}#EfRhH^0$FVkKE*j_Exq
z9CwOX^}i3m^96A3uaub=zHaiLp=LM4nMPg6DsN?FWov5J!_nEVz0Q~o6!p1|dG~};
zsCcDxkmou@`I4PY?4q{yoh(vg!$i0Z<<@dPLV0D|*}3E>)Jd`E$ZT%@SkB$bc_#B_
zpsy&!Nmi$E1l4AO%e>n*KU#zd;^I|+JTDNWa23+m^VEvKCBPmWj|QiMpW7>q2^3b@
zy+Op&*w{9?Vi@{X=|oDo0$>}4kV#q!gn=?e-z3KpxEXM_JB1-_ZBaYiX+3VGyt%tr
z7D%#UjiPvhQ48jj84=W%_85^@eOgg-B@>ryzJBvH6^+U?CeV$IGk#oJv7uJK!@)ZZ
zy!&`RU<le2H(F9WwH{{Uvf4lG_m)SE`fjzOq(uX~@jMl6vasAq6R3Yce#A9)`!KVi
z*IL?X2!y72J?X0e-Dy*665Hx9!Pq6<PfE{Bo7|S+(Hu4psGx^;Bpp%XtLpG<>=mo0
zq}SyZw>Ebh-+8;=dd=3jvDe<;YwtGed;86Yu=PgbGIoV*G~Ihxz02h^<5NTn_2bSj
M)#4xWrr*`S0NI49l>h($

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-backup-remote.json b/locale/fr_CH/freedombone-backup-remote.json
new file mode 100644
index 000000000..854e5216c
--- /dev/null
+++ b/locale/fr_CH/freedombone-backup-remote.json
@@ -0,0 +1,51 @@
+{
+    "Creating backup key": "",
+    "Backup key could not be found": "",
+    "No MariaDB password was given": "",
+    "${1} database could not be saved": "",
+    "Unable to export ${1} database": "",
+    "${PROJECT_NAME} backup to friends": "",
+    "Backing up ${PROJECT_NAME} configuration files": "",
+    "Backing up personal settings for $USERNAME": "",
+    "Backing up gpg keys for $USERNAME": "",
+    "Backing up ssh keys for $USERNAME": "",
+    "Backing up syncthing files for $USERNAME": "",
+    "Backing up config files for $USERNAME": "",
+    "Backing up fin files for $USERNAME": "",
+    "Backing up local files for $USERNAME": "",
+    "Backing up Mutt settings for $USERNAME": "",
+    "Backing up procmail settings for $USERNAME": "",
+    "Backing up spamassassin settings for $USERNAME": "",
+    "Creating an email archive": "",
+    "Backing up emails for $USERNAME": "",
+    "Backing up Lets Encrypt settings": "",
+    "Backing up Tor settings": "",
+    "Backing up RSS reader installation": "",
+    "RSS reader domain specified but not found in /etc/share/ttrss}": "",
+    "Backing up GNU social installation": "",
+    "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
+    "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
+    "Backing up syncthing configuration": "",
+    "Backing up syncthing shared files": "",
+    "Backing up Mediagoblin": "",
+    "Obtaining Gogs settings backup": "",
+    "Obtaining Gogs repos backup": "",
+    "Obtaining Gogs authorized_keys backup": "",
+    "Backing up wiki": "",
+    "Backing up blog": "",
+    "Blog domain specified but not found in /var/www/${FULLBLOG_DOMAIN_NAME}": "",
+    "Backing up certificates": "",
+    "Backing up the public mailing list": "",
+    "Backing up the XMPP settings": "",
+    "Backing up web settings": "",
+    "Backing up README": "",
+    "Backing up IPFS": "",
+    "Backing up DLNA cache": "",
+    "Backing up VoIP settings": "",
+    "Unable to backup MariaDB settings": "",
+    "Unable to export database settings": "",
+    "Backing up some additional directories": "",
+    "WARNING: The backup directory $destination_dir is already used.": "",
+    "Choose a different destination name for backing up $backup_dir": "",
+    "WARNING: Directory $backup_dir does not exist": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-backup-remote.mo b/locale/fr_CH/freedombone-backup-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..156580ac8e941aa4e86515e8f1914f8ab7508c7f
GIT binary patch
literal 2983
zcmb7``*RaF5XX<HOI!0p2Rbcu`aoq&2Rd_kLK>Wgj$=EC!LQm5(6mh|-^sSf<#avC
z3E}alG5ksV3;oKsIoly5;ED5DomQ*e)oRag-@Lw(dHd$IgU<rK-{Xtn1v_?}-#!_W
zL0rZ7Yj6j=0UGd25Gx?DRQe{Beom#!kS=DDb=SbF7_WfWz&2>@1oZqRcoSpTg>*fY
z?4HT9pHe9Y>H4RR^9xuaDv)-DG?VB;qE(Qrr7IU5=N5Puv@<&(#Se-0f@D3#u8=5J
zNI#^{zJ+x0GspP~WZ(vP2dslH!G|DLL$Z5Z{XFsK9%yY0!0!?bNI$01{Zz86oG+5O
z8=&>809p+nbV1mM^m{7ZgmgLUIF~Ls&aa^T6fY$#5zEAN;s$Y(SRp<jJ|tF&HDaCE
zAU27A5L?7Hu|wP<J|aFQJ|X@|+$R1-{G0d>afi4|{FlgyU7|<yiGtW8_K5?cBt9kX
z5d-2rF(fKtMEs8!6SZaT#r!MgbHlq_3+Aa|;ImK}))h?i1K~Ss+}o33pA92cs@4n4
z<K93_KHaEqF|9nw113Xlco1+SRXC|qX|A^?$5ml8D~Dcu6d9(4G1x#)D%6B8d0%w{
zIc29dG-G|%Q!&eJwacw~p;n$;-6|JKC!Vz1EEe1s@q2yjz}ji9JW`eBsT18m^(S}r
zL~LYFdfbSqSUeT>WS{k9AoTlv7W-TVXUz9xc%F%V)MtC*=nNx)@^DJ$coK<Ns}Op}
z*?7OxQLH@c_XntIwJ#X=eQ9e0#(fzJ&!|{VCrd|spKFaj#CyI2S`W?%Ss#U-8Q20&
z&S4n8Q=Ma#b22kl)B_$1Kgr}|4VZyoPioE63&u`HL)5g#Y|^Yxfz)Pl{h{clQBOUW
zdvY|!EyNK|-_xENhQ3ooecOA)c*sV@#CYrt<bfE^ba9mv1CG5iuQF>WVdg7%gJeg-
zL-``A?$C@{z{oD{3!6RQ@$BK@;cV{3`c}2NR&8wTmKwD}rA~Hi3uq@T;G?Y7D#cdg
zU2~hm?sJJY@^P+hZmn%ss@1}jYm8zxiuF)yp|3N!7tL1VLAlsToS&|X<VZ6UO>aV7
zu^NvhFRif%1$wArpB-||`bcu<G`a?9v<I-E`WoFPQkr%@IhWRT;+)eOcc%|XpD^C+
zsQzY+iM4*^Y=yiV2!;?T*kdn`_nFWT&mt8YHr4gtolf5esRdluOmUzT-Vrz!+3Sf|
zgogP-qvl38iiI3E-1cPah0Oy>Ek_YzISv#3&%Rp3GgN)%aiLYO)Hm|1M4jMhN?U5i
z1KYBX*iZ|9W~|@AHKIU|n+TRpc;bwjV4{*aaV&gj2536Z@nUPn>M2@~Tk+jTXnAN$
zc_!zVL-EYG=oJUqTBTMVPtDKFWs52_2;1!(MIz4(G-sm#r@q2GGz27Tb!d9-@>nnC
zp+>4)yz7*YoaEVZSDI`yKpP6&brtXHJPV`IP_HhmutZ$F6|(zm{&u$6=(x$nR-s$M
zn<dW{=H{2&xjXK{a%X-qe|IrIw>YzO@9s8q-Ih3zHjpz_m$tK29`=X44{N=6x422a
M$C6)TAND`{KmGL|M*si-

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-blog.json b/locale/fr_CH/freedombone-blog.json
new file mode 100644
index 000000000..5bbec508d
--- /dev/null
+++ b/locale/fr_CH/freedombone-blog.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-blog -h [hostname] -a [avatar image file]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-blog.mo b/locale/fr_CH/freedombone-blog.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ea173619b281662e8ad9ffd4bb44d17e582727cc
GIT binary patch
literal 395
zcmaJ-O-sW-5RKB)dh_gI4jvSonxr43sSzYbtXLaL@X%6Zn{LvTbhm7_RS|z$=}+ok
zaN7#KIq;ZyGjEuW&3biO*{oNVv15ZXgR3nucC&Xo-!gGvaB^f>AAfn%W|;MI*NuK~
zT*w@73d5-^wV*RL0;DjcORA{?KBGB<j2CQFIscCPy{9NltXRo+mTK%w@Rg~OOW^}|
zJi$ISrcx|Px6_RdC8uhWPzue2#^h_xe9%UDJufI1ZAhn7l}rZ<ouPNoDJsg0DU3ua
zCtTz{cw??fTr3nV@Ik6s>4TW>Xc@R|*oVP|fLm}bN!&{?RE%n~9o|!Irn<J%M7xfz
qmpC=QQS<Fa)os-WMvHy6<l963l{N?DnTmX2e&R!>-oi&>S>zW4ad0O9

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-client.json b/locale/fr_CH/freedombone-client.json
new file mode 100644
index 000000000..adad53c57
--- /dev/null
+++ b/locale/fr_CH/freedombone-client.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-client": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-client.mo b/locale/fr_CH/freedombone-client.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c904d9287ec4b8b171e96d1aec3b04c1d4a290cf
GIT binary patch
literal 358
zcmaJ+!AiqG5M8CG_2$8ohdp>uaB7m)5K|*aj94)?l;EKkUDHimiJP$56h-{B(ogCy
zIBkXA9C*x|na7)%<zl|ySuW-TV;6CVI9(MOmz%WC2gn1&-VPz@U;hO;dAyFJAIM56
zl<6FOC*#q56s9E6)w{?H45#oUbR#R}GiiHDd>Y6qHKXw`j<zGaYtgV$22CLSs)f%C
zD$nYYOEqBG8`q66L2GjGwmQvKlM4-z%BrbUh0nZKX=qZmnwM}}>5s-|s$Q2(;0)M?
z2FHqBG5drjqZC3dxWVh-h8x`KShfpR9~>{Wd;WRPx7@CK;Y?5qV=<GfNB))eC-i}<
PqU8m;<@!0iqlD03dOl&}

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-clientcert.json b/locale/fr_CH/freedombone-clientcert.json
new file mode 100644
index 000000000..3ebf699f6
--- /dev/null
+++ b/locale/fr_CH/freedombone-clientcert.json
@@ -0,0 +1,4 @@
+{
+    "${PROJECT_NAME}-clientcert -u [username]": "",
+    "User $USERNAME not found": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-clientcert.mo b/locale/fr_CH/freedombone-clientcert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ff8c876189c4653f50ef4e138a0a61a33d2b1129
GIT binary patch
literal 424
zcmaJ-K~KUk7@d(*y?OHBp$86lC~gDHGJ=VjGh&!5I6PpCsiVW1@s)HP(HMUk;V1DI
z{01c4e96oAUi-d&Z8z)HX>GG!S%_ogIkH_D#9&vpwShW9o*|dWlOxO8x1mFYzQSHT
z-bCRqOLHl}q(U3YO8Qb3LIa<R*INB29t|JDAhE`{M(g9Ja8$KWP=;ozgsBy4^(j)r
z`cw8SbRiY^R5~7rFT+v=OA_^?@UZ1HZ4xLjIFBXY3*l3P$;(B~C3I=}!F3@_uQVC+
z4mr)C$b@Dgq-rW*=2P!o8WQKF<~h4ldS3Vx7F%2N+%Db8UIXYgbuLIeOjw`=H+VaC
z%MDI-ZRd*FZRUE3)ABnl-}ahz$DUx8jl@z`5BWFhPRM}6tmHF1Ez@toJ;84!f7OR~
A&Hw-a

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-config.json b/locale/fr_CH/freedombone-config.json
new file mode 100644
index 000000000..40d7dee91
--- /dev/null
+++ b/locale/fr_CH/freedombone-config.json
@@ -0,0 +1,228 @@
+{
+    "<h1>Welcome to \\$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>": "",
+    "${PROJECT_NAME}-config -f [config filename] -m [min password length]": "",
+    "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
+    "Invalid FreeDNS Code": "",
+    "Encryption keys": "",
+    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
+    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
+    "GPG Keyring loaded to $HOME_DIR": "",
+    "ssh keys imported": "",
+    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
+    "Freedombone Configuration": "",
+    "GPG/PGP keys for your system:": "",
+    "Generate new keys (new user)": "",
+    "Import keys from USB drive/s": "",
+    "Retrieve keys from friends servers": "",
+    "Freedombone Control Panel": "",
+    "Main Repository (Mirrors)": "",
+    "If you don't know what this means then just select Ok.\\n\\nIf you don't wish to use the default repositories they can be obtained from mirrored repos on another ${PROJECT_NAME} system.\\n\\nThe repositories are for applications which are not yet packaged for Debian.": "",
+    "URL:": "",
+    "SSH Port:": "",
+    "Password:": "",
+    "Main Repository": "",
+    "Main repository set to $FRIENDS_MIRRORS_SERVER": "",
+    "Select your language:": "",
+    "Afrikaans": "",
+    "Albanian": "",
+    "Arabic": "",
+    "Basque": "",
+    "Belarusian": "",
+    "Bosnian": "",
+    "Bulgarian": "",
+    "Catalan": "",
+    "Croatian": "",
+    "Chinese (Simplified)": "",
+    "Chinese (Traditional)": "",
+    "Czech": "",
+    "Danish": "",
+    "Dutch": "",
+    "English": "",
+    "English (US)": "",
+    "Estonian": "",
+    "Farsi": "",
+    "Filipino": "",
+    "Finnish": "",
+    "French": "",
+    "French (Canada)": "",
+    "Gaelic": "",
+    "Gallego": "",
+    "Georgian": "",
+    "German": "",
+    "German (Personal)": "",
+    "Greek": "",
+    "Gujarati": "",
+    "Hebrew": "",
+    "Hindi": "",
+    "Hungarian": "",
+    "Icelandic": "",
+    "Indonesian": "",
+    "Italian": "",
+    "Japanese": "",
+    "Kannada": "",
+    "Khmer": "",
+    "Korean": "",
+    "Lao": "",
+    "Lithuanian": "",
+    "Latvian": "",
+    "Malayalam": "",
+    "Malaysian": "",
+    "Maori (Ngai Tahu)": "",
+    "Maori (Waikoto Uni)": "",
+    "Mongolian": "",
+    "Norwegian": "",
+    "Norwegian (Primary)": "",
+    "Nynorsk": "",
+    "Polish": "",
+    "Portuguese": "",
+    "Portuguese (Brazil)": "",
+    "Romanian": "",
+    "Russian": "",
+    "Samoan": "",
+    "Serbian": "",
+    "Slovak": "",
+    "Slovenian": "",
+    "Somali": "",
+    "Spanish (International)": "",
+    "Swedish": "",
+    "Tagalog": "",
+    "Tamil": "",
+    "Thai": "",
+    "Turkish": "",
+    "Ukrainian": "",
+    "Vietnamese": "",
+    "Select User": "",
+    "Select one of the following:": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
+    "Freedombone": "",
+    "Type of Installation:": "",
+    "Full": "",
+    "Writer": "",
+    "Cloud": "",
+    "Chat": "",
+    "Mailbox": "",
+    "Non-Mailbox": "",
+    "Social": "",
+    "Media": "",
+    "Developer": "",
+    "Mesh (router)": "",
+    "Mesh (user device)": "",
+    "Wireless Mesh ESSID\\n\\nIf you press enter the default will be '$WIFI_SSID'": "",
+    "Give your mesh peer a name": "",
+    "Wifi Channel (spaced to be non-overlapping):": "",
+    "Username": "",
+    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
+    "Don't use the default user account": "",
+    "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
+    "Install Target": "",
+    "\\nAre you installing onto a Beaglebone Black?": "",
+    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
+    "Social Key Management": "",
+    "Type of Random Number Generator:": "",
+    "OneRNG Device": "",
+    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
+    "Where to download Debian packages from:": "",
+    "Australia": "",
+    "Austria": "",
+    "Belarus": "",
+    "Belgium": "",
+    "Bosnia and Herzegovina": "",
+    "Brazil": "",
+    "Bulgaria": "",
+    "Canada": "",
+    "Chile": "",
+    "China": "",
+    "Croatia": "",
+    "Czech Republic": "",
+    "Denmark": "",
+    "El Salvador": "",
+    "Estonia": "",
+    "Finland": "",
+    "France 1": "",
+    "France 2": "",
+    "Germany 1": "",
+    "Germany 2": "",
+    "Greece": "",
+    "Hungary": "",
+    "Iceland": "",
+    "Iran": "",
+    "Ireland": "",
+    "Italy": "",
+    "Japan": "",
+    "Korea": "",
+    "Lithuania": "",
+    "Mexico": "",
+    "Netherlands": "",
+    "New Caledonia": "",
+    "New Zealand": "",
+    "Norway": "",
+    "Poland": "",
+    "Portugal": "",
+    "Romania": "",
+    "Russia": "",
+    "Slovakia": "",
+    "Slovenia": "",
+    "Spain": "",
+    "Sweden": "",
+    "Switzerland": "",
+    "Taiwan": "",
+    "Thailand": "",
+    "Turkey": "",
+    "Ukraine": "",
+    "United Kingdom": "",
+    "United States": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Choose Dynamic DNS provider:": "",
+    "Dynamic DNS provider username": "",
+    "Dynamic DNS provider password": "",
+    "Password quality check": "",
+    "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
+    "Static local IP address": "",
+    "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
+    "Local Network Configuration": "",
+    "\\nPlease enter the IP addresses:": "",
+    "This system:": "",
+    "Internet router:": "",
+    "Wiki Configuration": "",
+    "\\nPlease enter your wiki details:": "",
+    "Title:": "",
+    "Domain:": "",
+    "Code:": "",
+    "Domain name validation": "",
+    "Blog Configuration": "",
+    "\\nPlease enter your blog details:": "",
+    "Mediagoblin Configuration": "",
+    "\\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:": "",
+    "Hubzilla Configuration": "",
+    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Microblog Configuration": "",
+    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Welcome Message:": "",
+    "Background image URL:": "",
+    "Developer Configuration": "",
+    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
+    "Your main domain name": "",
+    "\\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?": "",
+    "Which domain name should your email/XMPP/IRC/VoIP be associated with?": "",
+    "Your email address": "",
+    "Configuration filename:": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-config.mo b/locale/fr_CH/freedombone-config.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d889105e8b1c7618259d216ddb15d7bb3e38e93b
GIT binary patch
literal 10560
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
Y<cmv>CTTVS^V#OE{O=O~-~TTC7uY8tssI20

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-controlpanel-user.json b/locale/fr_CH/freedombone-controlpanel-user.json
new file mode 100644
index 000000000..cc97ed07f
--- /dev/null
+++ b/locale/fr_CH/freedombone-controlpanel-user.json
@@ -0,0 +1,110 @@
+{
+    "Press any key to continue...": "",
+    "Exit back to user mainenance": "",
+    "Freedombone User Control Panel": "",
+    "Remove yourself from a mailing list": "",
+    "Select one of the following:": "",
+    "Remove yourself from mailing list": "",
+    "You have been removed from ${remove_list_name}": "",
+    "Subscribe to a mailing list": "",
+    "You can either enter a subject or an email address\\n": "",
+    "List folder name:": "",
+    "Name between [] on subject line:": "",
+    "List email address:": "",
+    "Public:": "",
+    "yes": "",
+    "Add mailing list": "",
+    "No mailing list name was given": "",
+    "No mailing list subject or address was given": "",
+    "Unrecognised email address": "",
+    "$LIST_NAME list was added": "",
+    "Create an email rule": "",
+    "When email arrives from address:": "",
+    "Move to folder:": "",
+    "no": "",
+    "No email address was given": "",
+    "No folder name was given": "",
+    "Email rule for $RULE_EMAIL was added": "",
+    "When email arrives with subject containing:": "",
+    "No subject text was given": "",
+    "Email rule for subject '$RULE_SUBJECT' was added": "",
+    "Block or unblock emails from a given address": "",
+    "Block it:": "",
+    "Block an email": "",
+    "Unblock an email": "",
+    "Block or unblock emails with text in the subject line": "",
+    "When email arrives with subject text:": "",
+    "No subject was given": "",
+    "Email with subject $BLOCK_SUBJECT is now blocked": "",
+    "Email with subject $BLOCK_SUBJECT is now unblocked": "",
+    "Your PGP/GPG Key": "",
+    "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
+    "Publish your PGP/GPG key": "",
+    "Your key has now been published": "",
+    "Add someone's PGP/GPG key": "",
+    "Enter their email address below": "",
+    "This doesn't look like an email address": "",
+    "Remove someone's PGP/GPG key": "",
+    "It's not a good idea to remove your own encryption key": "",
+    "Add an ssh key for logging in": "",
+    "This will allow you to log into ${PROJECT_NAME} if you have an ssh key on your system, and provides much stronger security than simply using a login password.\\n\\nWARNING: If you make any mistakes here then you may not be able to log in and will need to get the administrator to clear your ssh authorized_keys file.": "",
+    "New ssh key added": "",
+    "Your ssh key has now been added": "",
+    "ssh key already added": "",
+    "That ssh key has already been added": "",
+    "Unrecognised ssh public key": "",
+    "This doesn't look like an ssh key": "",
+    "Remove an ssh key for logging in": "",
+    "Enter the ssh public key which is to be removed. This can be just the address at the end.\\n\\nWARNING: If you make any mistakes here then you may not be able to log in and will need to get the administrator to clear your ssh authorized_keys file.": "",
+    "Remove an ssh public key": "",
+    "The ssh key has been removed": "",
+    "Freedombone Control Panel": "",
+    "SMTP Proxy for $USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
+    "Username:": "",
+    "Password:": "",
+    "# The ${PROJECT_NAME} syncthing ID is: $SYNCTHING_ID": "",
+    "Device ID for ${PROJECT_NAME}": "",
+    "In a desktop terminal press shift and select the ID below,\\nthen right click and copy.\\n\\nWithin Connectbot select Menu/Copy and then highlight the ID below\\n\\n$SYNCTHING_ID": "",
+    "Add a Syncthing device ID": "",
+    "Paste the device ID for your laptop/desktop/netbook/phone/tablet below": "",
+    "Device ID:": "",
+    "Description (optional):": "",
+    "That doesn't look like a device ID": "",
+    "That ID has already been added": "",
+    "The ID was added": "",
+    "Remove a Syncthing device ID": "",
+    "Paste the device ID which is to be removed below": "",
+    "That ID wasn't registered anyway": "",
+    "The ID was removed": "",
+    "Your Encryption Keys": "",
+    "Choose an operation:": "",
+    "Show your PGP/GPG key": "",
+    "Publish your PGP/GPG key so that others can find it": "",
+    "Back to main menu": "",
+    "Change Email Filtering Rules": "",
+    "Add yourself to a mailing list": "",
+    "Add an email rule for an address": "",
+    "Add an email rule for a subject": "",
+    "Block or unblock an email address": "",
+    "Block or unblock email with subject text": "",
+    "File Synchronization": "",
+    "Show device ID for ${PROJECT_NAME}": "",
+    "Add an ID for another machine or device": "",
+    "Remove an ID for another machine or device": "",
+    "Manually edit device IDs": "",
+    "User Control Panel": "",
+    "Use Email": "",
+    "Use Tox Chat": "",
+    "Use XMPP Chat": "",
+    "Use IRC": "",
+    "Browse the Web": "",
+    "Set an outgoing email proxy": "",
+    "Administrator controls": "",
+    "Exit to the command line": "",
+    "Log out": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-controlpanel-user.mo b/locale/fr_CH/freedombone-controlpanel-user.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b0f9b068da574cfb1b25746f611beee2d0d563ee
GIT binary patch
literal 6155
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
QnEj0>_}|I@#Xr;k1|+qVJ^%m!

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-controlpanel.json b/locale/fr_CH/freedombone-controlpanel.json
new file mode 100644
index 000000000..ab859ac6f
--- /dev/null
+++ b/locale/fr_CH/freedombone-controlpanel.json
@@ -0,0 +1,229 @@
+{
+    "Press any key to continue...": "",
+    "Check for updates": "",
+    "Upgrade script was not found": "",
+    "Freedombone Control Panel": "",
+    "Main Repository (Mirrors)": "",
+    "If you do not wish to use the default repositories they can be obtained from mirrors on another ${PROJECT_NAME} server.": "",
+    "URL:": "",
+    "SSH Port:": "",
+    "Password:": "",
+    "Main Repository": "",
+    "Main repository set to $FRIENDS_MIRRORS_SERVER": "",
+    "Add new user": "",
+    "Username:": "",
+    "ssh public key (optional):": "",
+    "New username": "",
+    "No username was given": "",
+    "Invalid username": "",
+    "The username should not contain any spaces": "",
+    "ssh public key": "",
+    "This does not look like an ssh public key": "",
+    "Select User": "",
+    "Select one of the following:": "",
+    "SMTP Proxy for $ADMIN_USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
+    "Administrator user": "",
+    "You can't delete the administrator user": "",
+    "No Administrator user found. Check $COMPLETION_FILE": "",
+    "Username not found": "",
+    "Home directory not found": "",
+    "Change password": "",
+    "New password for user $SELECTED_USERNAME": "",
+    "The password should be ${MINIMUM_PASSWORD_LENGTH} or more characters": "",
+    "Password for $SELECTED_USERNAME was changed": "",
+    "IRC Password": "",
+    "Password for all IRC users, or press Enter for no password": "",
+    "The IRC password was changed": "",
+    "Change blog avatar": "",
+    "Enter a URL for an image. It should be approximately a square image.": "",
+    "Your blog avatar has been changed": "",
+    "Change ssh public key": "",
+    "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "",
+    "Change ssh public key for $SELECTED_USERNAME": "",
+    "Paste the ssh public key below": "",
+    "ssh public key was installed": "",
+    "Exit back to user mainenance": "",
+    "Remove a mailing list for $SELECTED_USERNAME": "",
+    "Remove user from mailing list": "",
+    "${SELECTED_USERNAME} has been removed from ${remove_list_name}": "",
+    "Subscribe $SELECTED_USERNAME to a mailing list": "",
+    "You can either enter a subject or an email address\\n": "",
+    "List folder name:": "",
+    "Name between [] on subject line:": "",
+    "List email address:": "",
+    "Public:": "",
+    "yes": "",
+    "Add mailing list": "",
+    "No mailing list name was given": "",
+    "No mailing list subject or address was given": "",
+    "Unrecognised email address": "",
+    "$LIST_NAME list was added": "",
+    "Email rule for user $SELECTED_USERNAME": "",
+    "When email arrives from address:": "",
+    "Move to folder:": "",
+    "no": "",
+    "Add email rule": "",
+    "No email address was given": "",
+    "No folder name was given": "",
+    "Email rule for $RULE_EMAIL was added": "",
+    "Block/Unblock email going to": "",
+    "Block it:": "",
+    "Block/Unblock an email": "",
+    "Block an email": "",
+    "Unblock an email": "",
+    "When email arrives with subject text:": "",
+    "No subject was given": "",
+    "USB Master Keydrive": "",
+    "Plug in a LUKS encrypted USB drive": "",
+    "USB Fragment Keydrive": "",
+    "Backup data to USB": "",
+    "Restore from USB backup": "",
+    "Choose an application to restore:": "",
+    "Everything": "",
+    "Return to the backup and restore menu": "",
+    "Configuration files": "",
+    "MariaDB settings": "",
+    "Let's Encrypt account": "",
+    "Mutt email client settings": "",
+    "GPG keys": "",
+    "Email processing rules": "",
+    "Spam filtering rules": "",
+    "Administrator's README file": "",
+    "IPFS": "",
+    "SSH keys": "",
+    "User configuration files": "",
+    "User local files": "",
+    "User fin files": "",
+    "SSL/TLS certificates": "",
+    "Personal settings": "",
+    "Mailing List": "",
+    "XMPP chat": "",
+    "GNU Social": "",
+    "Hubzilla": "",
+    "Syncthing": "",
+    "Gogs": "",
+    "Wiki": "",
+    "Blog": "",
+    "CJDNS": "",
+    "Email": "",
+    "DLNA": "",
+    "VoIP": "",
+    "RSS reader": "",
+    "Tox": "",
+    "Mediagoblin": "",
+    "Restore from ${remote_domain_name}": "",
+    "Restore data from USB": "",
+    "Plug in your backup USB drive": "",
+    "Restore data from remote server": "",
+    "Unknown admin user": "",
+    "Restore from remote server": "",
+    "Enter the domain name of the server from which you wish to restore": "",
+    "Remote server domain name": "",
+    "Invalid domain name": "",
+    "\\nDo you want to enable other systems to ping this machine?\\n\\nPing may be useful for diagnostic purposes, but for added security you may not want to enable it.": "",
+    "Enable Ping / ICMP": "",
+    "Logging": "",
+    "\\nDo you want to turn logging on?": "",
+    "Restore GPG key for user": "",
+    "Plug in your USB keydrive": "",
+    "Renew SSL certificate": "",
+    "\\nThis will renew a letsencrypt certificate. Select 'yes' to continue": "",
+    "Hubzilla install directory not found": "",
+    "Hubzilla certificate has been renewed": "",
+    "Hubzilla channel directory server": "",
+    "Hubzilla is not installed on this system": "",
+    "When you click on 'channel directory' this is where Hubzilla will obtain its list from": "",
+    "Invalid domain - include the https://": "",
+    "Domain channel directory server changed to $hubzilla_domain_server": "",
+    "Format a USB drive (LUKS encrypted)": "",
+    "Choose a drive:": "",
+    "sda (Beaglebone Black)": "",
+    "sdb": "",
+    "sdc": "",
+    "sdd": "",
+    "Back to Backup and Restore menu": "",
+    "Format USB drive": "",
+    "\\nPlease confirm that you wish to format drive\\n\\n    ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
+    "Remove backups from a USB drive": "",
+    "\\nPlease confirm that you wish to remove backups from this drive\\n\\n    ${drive}\\n\\nYou will not be able to recover them afterwards.": "",
+    "Power off the system": "",
+    "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "",
+    "Restart the system": "",
+    "\\nPlease confirm that you wish to restart the system.\\n\\nWARNING: If you are using full disk encryption then you will need physical access to the hardware to type in the password": "",
+    "Change the name of this system": "",
+    "New local network name": "",
+    "The name of this system on your local network was changed successfully": "",
+    "Set the TLS date/time source": "",
+    "Enter a domain name to use as a TLS time source.\\n\\nFactors to consider when choosing a source are whether you wish that site to know that your system is 'alive' and also what might happen if an adversary were to try to mess with the date/time from that domain (i.e. how much blowback would there be).": "",
+    "Don't include the 'https'": "",
+    "That doesn't look like a domain name": "",
+    "Set a static local IP address": "",
+    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be 192.168.1.x": "",
+    "Set the IP address of your internet router/modem": "",
+    "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
+    "Wifi Settings": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
+    "SSID:": "",
+    "Type (wpa2-psk/none):": "",
+    "Passphrase:": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
+    "Backup and Restore": "",
+    "Choose an operation:": "",
+    "Backup data to USB drive": "",
+    "Restore GPG key from USB keydrive": "",
+    "Restore data from USB drive": "",
+    "Configure remote backups": "",
+    "Restore from remote backup": "",
+    "Backup GPG key to USB (master keydrive)": "",
+    "Backup GPG key to USB (fragment keydrive)": "",
+    "Back to main menu": "",
+    "Email Filtering Rules": "",
+    "Add a user to a mailing list": "",
+    "Remove a user from a mailing list": "",
+    "Add an email rule": "",
+    "Block/Unblock an email address": "",
+    "Block/Unblock email with subject text": "",
+    "Manage Users": "",
+    "Add a user": "",
+    "Delete a user": "",
+    "Change user password": "",
+    "Change user ssh public key": "",
+    "Set channel directory server": "",
+    "Media Menu": "",
+    "Attach a drive containing playable media": "",
+    "Remove a drive containing playable media": "",
+    "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
+    "IRC Menu": "",
+    "No IRC server is installed": "",
+    "Set a password for all IRC users": "",
+    "Show current IRC login password": "",
+    "Control Panel": "",
+    "About this system": "",
+    "Reset Tripwire": "",
+    "Logging on/off": "",
+    "Ping enable/disable": "",
+    "Outgoing Email Proxy": "",
+    "Security Settings": "",
+    "Set the main repository (repo mirrors)": "",
+    "Media menu": "",
+    "IRC menu": "",
+    "Change your blog avatar": "",
+    "Wifi menu": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-controlpanel.mo b/locale/fr_CH/freedombone-controlpanel.mo
new file mode 100644
index 0000000000000000000000000000000000000000..235ea2827c6245c546821abb35456e70b2eeb734
GIT binary patch
literal 11854
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
I*?$-R4=io#ivR!s

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-dhparam.json b/locale/fr_CH/freedombone-dhparam.json
new file mode 100644
index 000000000..a671f3ea3
--- /dev/null
+++ b/locale/fr_CH/freedombone-dhparam.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
+    "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
+    "$0: openssl is not installed, exiting": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-dhparam.mo b/locale/fr_CH/freedombone-dhparam.mo
new file mode 100644
index 0000000000000000000000000000000000000000..14173a894969f3dc6ccabaa6e8ab3653c873e06f
GIT binary patch
literal 580
zcmaKp!EVz)5QYs@9L$X~hdCGoh%I(PgV`!bC=F^+L!&6-&<LT$9><F|v)1mWYDD{J
zRUfIZz&MWD8zcSxW@dlSdgQy?o9BCXw>J^TQ`QUCX<Kkyb=dMH=hv(StFtHf*(1&p
zemr5mVm@QNZJQi}#~nZJnD6*$N7*t-CD;bZdjr}7*#Me+P{v^S4)9V3P0Q%}m&y2A
zly#$=T7jrxQClBKt?(xZ0}F$+3^l(Azjg536AlYy3RrB=Uy*G)mGa@f-b?;YXJ_BW
zqj@yjI@d-8EaB)Fws&}_tb?S|JehBaHW3esrq2GsB8Zbx{6OcmB?&sq2`_^vEM3Ht
zlgaquDBDltk)?nX#C+4Bguu@CjZvBop{SMf7>4UmiTuIm6!{9B7*k<O-d#e@JH=D8
zcFKsa)~&n*YPO{x_70&-hp!1fL-r<~p3TL`p$hzU;)s`$&`Yy{NI!^PKF|8{pf9uj
le(xYZXRnyyg>D!5pLLL)$ES*xYqjKQmHRb1j=NtQ{{t#&ok{=z

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-encrypt-mail.json b/locale/fr_CH/freedombone-encrypt-mail.json
new file mode 100644
index 000000000..ddf90a17c
--- /dev/null
+++ b/locale/fr_CH/freedombone-encrypt-mail.json
@@ -0,0 +1,8 @@
+{
+    "A GPG key for $EMAIL_ADDRESS could not be found!": "",
+    "Calling find": "",
+    "Not copying, no differences between /tmp/msg_$USERNAME and $line": "",
+    "Removing Dovecot indexes and uids": "",
+    "No messages found needing GPG encryption, not": "",
+    "removing Dovecot indexes and UIDs.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-encrypt-mail.mo b/locale/fr_CH/freedombone-encrypt-mail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..eecd2edefacf898cbe99f4fa7696bd9c3713b07a
GIT binary patch
literal 684
zcmbVK&2G~`5MEFuB-0aT4pWo^NNi%K0W4QRM6oH6nh+%^hYAU8?Qz&*?^?U-(42U(
zs*luHV75i+tp`RL%{MdO{H^x(=K4kF_U4+AJR^Ncy7msqzwjP?+M{rf4)%x>I(Wj^
zA=!lNE3)6oJ}3P{>V-N!{V&u#TV>1nc$R@s1#~N^urt>Va^38t+Pnp&p^#;X233w0
zF3|l(RM2;I)35D@jnj0QtyWafRt2#gQJ~bVDh@kiI9Z&)FWgbUKsTF>r>ATpDw?u^
zQmTT@HPmRW*ih@cB2b8hPy0$5X?Bg1TKPR3TVk!ZKAGw*<}`|0;1!kn-CJ2$W*%dl
zO;g)r3!^VFcYIp#Z)hwvPe4Yo!Yjvft+v5zI?EnXQ7;T8S~*mXuXhb5;E368Dk0S|
z<UfV6=tiw8dHldLLRoq;o~c~>YZ8brqze{RYedCAYg5|<RCDLr(cl>F;pnx3j}W~H
z7GKwVVo><gc`6)D9fZ+)9uD~+UPnjCyQ3r;_Tq4OPF%jkt@MXHO8syioC>vR>8%qe
N&5y~K;Qq(3;4i7=$e;iK

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-format.json b/locale/fr_CH/freedombone-format.json
new file mode 100644
index 000000000..18a586735
--- /dev/null
+++ b/locale/fr_CH/freedombone-format.json
@@ -0,0 +1,5 @@
+{
+    "Formatting $USB_DRIVE as LUKS": "",
+    "Failed to format $USB_DRIVE as LUKS": "",
+    "Failed to open LUKS formatted drive $USB_DRIVE": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-format.mo b/locale/fr_CH/freedombone-format.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5f5e917f30f3618465629aa4727a9fdce5e2d5b4
GIT binary patch
literal 494
zcmaKpOHaZ;5XUj$wB9^xGKn7aut3Yhricf5L?T22g#*!;wcX;Hy4!5GL_ZwiBk>iS
zwoyC~C;4aR@!Of%>~6a`DetzM5?UE`in_@Hw5Q_8&kFj_sB=_-pZ$8rM?X1CWmSw1
zdcEmz(Jv2}h<E@-fr`0=(fnZsq0%4B7)%FRtT|lFXLqF>2bSc>pKAqtkSW>-xhkp?
zt=_qB=rEuQt`ni83&L_F|1{KBa!tm=aerU3DmBto(r{_0_Z4#&43gD2VnVjTe`7k~
zrjweGI(tqtnS@-^zVuaqlU;CLg&~tD)hwa|+$eED#(9`@>^2l`=TgEgSXX57=+Um`
z%;0vk#|%!jYgUWa8q{_?tL`@IuGOkE?B)_#I^}DTJ>*~XdPzo1u2QzbZlQkZ-jnP@
F$TvyhjJ^N>

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-ignore.json b/locale/fr_CH/freedombone-ignore.json
new file mode 100644
index 000000000..1bc3d94c6
--- /dev/null
+++ b/locale/fr_CH/freedombone-ignore.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-ignore -u [username] -e [mail address] -t [text in subject line]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-ignore.mo b/locale/fr_CH/freedombone-ignore.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c1c32cba247d79893516d9dc46d83fa7e9c3c8c2
GIT binary patch
literal 420
zcmaJ+O-sW-5RKAPym|I82M-EvZCb4{HG;&56>CEY9$JcQlWAN@CuMh26!E8({-pi|
zH?7c{1CM!c_RYtxSIfiNdbPAn>>C^zoK?ca%{FavWVml|uxD9+cB2e4+IqR`g+EMW
zR7eC?!l+aziO+Bh3}H0mA_tzP5|uI)4I_=88U%qVCm)z-$OYlJcKjU;`cGjHTahfP
zI_swF6{Qjdc_18@OdCrITG+jAFWfyj^@bf3q>(g>zvk#cwcvc7b3q+Q-nmq${Zdbv
zyYop-YKoGDloY9;%ma5Kv>oN8<T-mN<V<-$^Nmz~vjbb|pAg)Fb81KZm<1BKHrKIx
zuFckF!)dd|1#7yo)ABA`o^w^dZaYKcWdmG@>LdSJTSNPqQ&#fKOq<HL;L)}$`xom!
BdY}LR

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-image-customise.json b/locale/fr_CH/freedombone-image-customise.json
new file mode 100644
index 000000000..ea79f8432
--- /dev/null
+++ b/locale/fr_CH/freedombone-image-customise.json
@@ -0,0 +1,11 @@
+{
+    "info: Adding apt config to call dpkg via eatmydata": "",
+    "error: unable to find /usr/bin/eatmydata after installing the eatmydata package": "",
+    "info: Removing apt config to call dpkg via eatmydata": "",
+    "warning: missing $rootdir$override": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Initial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n    sudo su\n    ${PROJECT_NAME} menuconfig\n\n": "",
+    "Using ssh public key:": "",
+    "Install failed. Press x to continue...": "",
+    "warning: creating initial user $username with well known password!": "",
+    "info: killing leftover processes in chroot": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-image-customise.mo b/locale/fr_CH/freedombone-image-customise.mo
new file mode 100644
index 0000000000000000000000000000000000000000..477e4af4de05d7eadf757e1a452b0e31262d14b9
GIT binary patch
literal 1340
zcmb7EUr!T35I+@P&KF~1eDTkKjev2Fwt&_nm|(>S5ot&@kr%V=?Ul86yO-U)mPU-9
zjPQ~83eH@&G=ap#NpF6$GryUgo89Z>#rcDU%Zu{>CB)}3J{c`gy!*;}ab;oT)-3*T
z>b)HVhgVh;tw(o)U;}X<@g?FP#P?GMT1!{fJ*;$p0hcI`?@sZF$EO~jc?6G(9+x~m
z_gEv`Q`Ye;gOtlmBoTCsuoh0iY3OU^q$))eMZuSygWcbd3ss^wm4h%`2q9vOMQ}r|
zxuOuxZg48cHTM}3u_Bd?P+^&wLL!+IpxD{WUwNvS--9ZyL~PkBT%ExR>QxL>KO(Ho
zJ;V)R8J$xF40F9&28QM`1&Dwa#k{AAVQxsN*JV#hCwT@vZUxBcfWz>+E)Cd;bs`68
zL1_mQ;bw7~eV1mQ7nyJZ+=+m~=sul>DHW~5RA-qUOEn-`&Q)SxkzavOP8gWb28nQZ
zk~W%lX3Io_EvqhTzdA>U`@8LK@YPZcYfqpkdztLRP)y=L7^6)LrQ*E|_t%h0mB3nQ
z&00^YHNjmzNx0*{Q`*hH7geHO=i!3)hkPIcsZt%oPLdFX7mn@|-kj=Y(Tz)r;Q&UG
z&r^NMk;wJvf0KqX%P1!ksna9u&ks*n>=gPZMr#+0xlu@pp>MEXqDy~NrNxvQX~lB^
zW9d#{EU?R=(qjb$w|1;evN$i1OIwYxMwJt3YP747i3mDI{}g@4_7e6@7%R1kK{i@S
zoH~Xx7=;IW2fOo7BdUjO{M7IeS$9&17#uR!ii}IOg`IO_h1)J&%35=t;mW4MuwB*H
zG~gIoJ?X+uRvMnMkJ{um231r`yWQM^skyzP;2ktp!_HxswW}d$#XfL{yEf~M*Q~z5
wnyqeQJ>Fc8oAqe(&D&$-vLi8)^dkSFw(7^>XRZb%9)1j|`O*GF|B+t8zqCYZ1ONa4

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-image-hardware-setup.json b/locale/fr_CH/freedombone-image-hardware-setup.json
new file mode 100644
index 000000000..4b8671a7b
--- /dev/null
+++ b/locale/fr_CH/freedombone-image-hardware-setup.json
@@ -0,0 +1,3 @@
+{
+    "Adding a getty on the serial port": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-image-hardware-setup.mo b/locale/fr_CH/freedombone-image-hardware-setup.mo
new file mode 100644
index 0000000000000000000000000000000000000000..570486f3b6f647370cf645bcb925aab9265d404f
GIT binary patch
literal 369
zcmaJ+O-sW-5M9O7dh_gIyeYUfN&N_^5hSfxuvnyc=%uXbCS8rQVRu^Wk1PF2{R?hd
zp*IH}^WMy3J~r#s$<b!LVm=N%PCYIg;p2Xnw)xES)Z_SovB_Wk%X9WPooXyWLaB(B
zU=V1gz$vR`1+}rnhSq$loJ4;r-j#LQU;;XfQT>p}4KDbgKj`gSVJqO7K~hL!w5(ME
z<egV_B{g;+pGoT!rE@Aoy!Tm&u25F=FgMLT3B(_o_^_H=S&1iOzg+@YZ>3A44(w=p
zj_?5C1s}eSL}ryFf1T(`@>`=IycNN<h~iP$PHx&s6t$wec<jC6O)Yfu$bZ&281om2
Q<y@A2T45*IGiQwd0-lLx>i_@%

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-image-make.json b/locale/fr_CH/freedombone-image-make.json
new file mode 100644
index 000000000..3efb85001
--- /dev/null
+++ b/locale/fr_CH/freedombone-image-make.json
@@ -0,0 +1,4 @@
+{
+    "error: Missing MIRROR and SUITE settings inherited from Makefile.": "",
+    "starting $VMDEBOOTSTRAP": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-image-make.mo b/locale/fr_CH/freedombone-image-make.mo
new file mode 100644
index 0000000000000000000000000000000000000000..80814705beda40ad59cdd4b1bca21bbaff0eee01
GIT binary patch
literal 450
zcmaKozfQw25XOsO3L6Ux!wn2Dxa3cZqEtmHZ4i+fB}zkwF32QKYY28_yA?cK)ko?p
zaA}3g#7Up-JKs;|vv=Fg#o2DVX<?kAu27w(z!)FWJ`d2xs7urVKR@|(4Tfh}|8Yzy
zsRD?()?CaXj<PJtfQk|(FHs(XX2xJc0~ZUXxM3w!N`692KUl?U)^2G-RfE9wG#-VI
zNs>?UY>>86CEr<LNK}$3Q<_T=0C#-Bz6>d(SX*%vhsT!FwymKQh6zLR?<EVsAbGc}
zDHlB`7F6LX{gtVRf8-Pux?+liqL3x-5P<*2jg{6bMQidT)u#?XEcd1EyFEDA{*8bK
zaBi(M$;nVLYH&L;q6TkuZReiY9pd`A;{{zWaJ_cdc4o+ujIDX|kbhBcW{s(sujm}7
MRqA#4Y~g=fKb*~i*Z=?k

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-image-mesh.json b/locale/fr_CH/freedombone-image-mesh.json
new file mode 100644
index 000000000..d7fd53ef9
--- /dev/null
+++ b/locale/fr_CH/freedombone-image-mesh.json
@@ -0,0 +1,18 @@
+{
+    "Regenerating ssh host keys": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-image-mesh.mo b/locale/fr_CH/freedombone-image-mesh.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e3d3b8c3cb50a9b06a62e1656622ff16fa808af2
GIT binary patch
literal 1355
zcmb`H-EP`26vx>{Z?dcHYMOT8Rc%+cnh<C^nu<vjLW@QUN@=BWgA6g?Ewzzj(7Jc4
z`bd3+oe%@fM%gsYQt~^;`TKk&aDR9EGJSt{n}YQMt~YRL7p%P}aMOGX#NclNo50AI
zzzh&hfK^*qr(kV7jdxt289zx_c(Jz)*5<QRY6o}*jC=ts#EOLVda?H$GQLWK3u|j5
z=C<aJ<~z+@&5Y)I%@3M;npiWdX=>&)EzP`UA!4~&^_+`~blLYM4MQ8j+Uhu7^W157
zPa4hB^@>{4yL8t}+;Y9KP}GE+TqE)z*)m%))+HysfFdQ(fN>v%Oi|=BN&8C38ylHo
ztjr%&3Qm>j6GhC`RsVaK|5Z++{|;1qP8B){#PE?ZB!)iMyMzUg=x6aiJ73cAY{!yK
z3C!vng()p&GHa&W^6FRRwv&p~tw}Fn{a<8J?mw&kGFVhtBG|l{S@Wyw{H=ibnb`nV
zpGoBL=#X+MiDG<+!f=E}B2-bAVX7s?SNMEz-N#o{hD>l9F{{YwcZK_cPYt*3I?G2^
zHfK}>SClK<z8O;+DNvf@fG~cH`XeGks!9_zz{RCb5*`ky#18KZA4;%MvB#9r3MP^S
z7~aq|{KWWp=7y#GF^bL7E=Qk`l`&e)Hm*nt<qM9h@E&cH&sm2!w~zD1wpFkX3U+=!
ndvtiz0WJ3EltqoKlYX>1MuYI-gbX3tKz1u<M*N5K;BNc`g;Zc7

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-image.json b/locale/fr_CH/freedombone-image.json
new file mode 100644
index 000000000..a4fd155c1
--- /dev/null
+++ b/locale/fr_CH/freedombone-image.json
@@ -0,0 +1,10 @@
+{
+    "Config file $CONFIG_FILENAME not found": "",
+    "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
+    "\nImage was created.\n\nYou will be able to log into it with:\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
+    "Username: $USERNAME\nPassword: $PASSWORD": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-image.mo b/locale/fr_CH/freedombone-image.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2c24e59a3a684e53317222c552072e71b3f8808e
GIT binary patch
literal 843
zcma))(Qeu>6o#{nn|XKJ?Jmwmw6)UA2n9xin2I2jXaph%o7Nj-hy$sDjU1<Jn)YZ_
zAE~df6Ug9ZntCMb`)&WS{$riThx^y1$A^0Z>m{zYxWascRU98x>!{9;>I14b&kW-^
z@(TG5*+qUq-XdKjzJuyLs@(Pp^;vGms=YX{Ua(Q{Q^97z%Yt^nR!-t>*owoBrLa_-
zX&#md`7Sfq#YqAS4s4Nd&=L~4f>@x4HQwp9O$;(ixe{!{Z7^q3XEN$|4)Ix<?xYIw
z%<oL6-^P<3F#zkyX45kI?$F6!10gj;G818`D@7EqAc`@L*&UDi?zMrY>tOI3mTRWi
zQgfA-FuH<mkpVAcmV~gBLbF%^(~xkMYA}C!?#T6K-u!Py!yiuq^3U|8Jbjw3PfcE#
zJ*VH94TE`a>~-AHe4mwW!JJM9#uFPgd?j!BQd2jiUom<tg$=RQ6#R##nD~x(uIHSt
zta63mCulA-4SsI%(=|FjZWHXRwf};Y>vpCi+C2Fb6KTX1b;MGJu~^yAT*R9ANv2pr
z`%-OE8^m_MP21HL9Ax`Uz-O?|i9Zf#H=hekM|(IPHdHHCgH~#^+6=4<yMAF?m*r}s
ic7t9z;dgP~$bYT%8!}{KmEqjk5UF{0Kn??(kK-RWyWUs;

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-keydrive.json b/locale/fr_CH/freedombone-keydrive.json
new file mode 100644
index 000000000..eb6c94efb
--- /dev/null
+++ b/locale/fr_CH/freedombone-keydrive.json
@@ -0,0 +1,17 @@
+{
+    "${PROJECT_NAME}-keydrive -u [username] -d [device, eg. sdb] --master [yes/no] -n [no of fragments] --format [yes/no]": "",
+    "Home directory for $MY_USERNAME not found. This user may not exist on the system": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "No .gnupg directory was found for $MY_USERNAME": "",
+    "GPG Keyring copied to $USB_DRIVE. You may now remove the drive.": "",
+    "Unable to copy gpg keyring to $USB_DRIVE": "",
+    "Made directory $FRAGMENTS_DIR": "",
+    "There was a problem making the directory $FRAGMENTS_DIR": "",
+    "A key fragment already exists on the drive for the user $MY_USERNAME": "",
+    "Not enough key fragments available ${no_of_local_shares}": "",
+    "Number of fragments on the drive: ${no_of_usb_shares}": "",
+    "Too many key fragments exist in $FRAGMENTS_DIR": "",
+    "There was a problem copying the key fragment to $USB_DRIVE": "",
+    "Files found: ${no_of_usb_shares}": "",
+    "Key fragment copied to $USB_DRIVE. You may now remove the drive.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-keydrive.mo b/locale/fr_CH/freedombone-keydrive.mo
new file mode 100644
index 0000000000000000000000000000000000000000..32354cb53ee18d0d0f37abb3e769d41b195e539c
GIT binary patch
literal 1496
zcmd5+O;6iE5KY^(hxAhQ+9J&%2P$<92_KD&XiM_}X`2uQ2MJJxHu2hVv3H~0b-+dZ
zG{jHhFLc%pP9h<CttI=-dgslX*%|x(?)Gi*{_eJb*BiXw<2_rN)iZp|a0PJ%*Pjq~
z5G_Q7Xd@y6t<~K6g4V0&g~C_F7Gf>iK}+XW1FfwWS)4zJy=(_9$SuQrS42NV2k|wk
zpcY!@LhI#!W;NRVVu!j6+(5FC7BYcytG~D3X?C5Xg4uP(OftBn3MfpZ7=|o@h+YKT
z2R(j@Cj|QO1TI(to}_-nxK_Zf0;M6~OEUfTar053k(eY8N{ewo3n&kcz7-lNb-*d+
zWnLNr_!Hl#%9Oe2Xu*kyF{=c)xCF@}F-4ZCLIzW27597l@MA{ANC9(~h5p4yZeFTM
zWideKaL{!gEiw`@*AG=<QCT**a(A!OydhXmnk0}I&SJ$RrxE)F#Dz1LO@k5p2+X%Y
zxkG$OBC0f#aF#H&#s$9NaK;4)FHcVyH&4ij>fEhZzV7u8zc=enVQ|#!8{y*KQvZO4
zl2JFw+NePA`SAfpOIId4D0fcgLAnAgpU2pi`IwoB^00C@<t@5nb9A<4fin&iqye+8
z>Dd6ygjIrdM#TdWEl#3I!~|4hDw(<|wt|q&#B3;Eb8#-b^H>dYhb{^-E@FSYR4tDD
zlm=lsTMx8QjA%F~#?cUqT|C#NGg+4FN%0#$GSYU*F_S6~+=if1<LpY4k>Jx(r`>7J
zw<^|psV=z2?}j+ZgxR3cb8QmRfbYNvi&ISR#@Zvbxu2w5c}$Wf9|;$S%7)r7(4}4&
zOB#|EHeA`jC+Sk{R(BvXcUL)lhRTOh@6aK2?6Jn|NP}urt*%$L$@(U#)||?Qy|rOi
ox2?_Er&IJLeVjd0$dj(M)6!4M{h0a~&6DT#gHrYzoIgu{0Wwd(IsgCw

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-mesh-install.json b/locale/fr_CH/freedombone-mesh-install.json
new file mode 100644
index 000000000..633b692dc
--- /dev/null
+++ b/locale/fr_CH/freedombone-mesh-install.json
@@ -0,0 +1,7 @@
+{
+    "${PROJECT_NAME}-mesh-install -f [function] -r [rootdir]": "",
+    "File not found /usr/local/bin/tox-bootstrapd": "",
+    "Account to run Tox's DHT bootstrap daemon": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-mesh-install.mo b/locale/fr_CH/freedombone-mesh-install.mo
new file mode 100644
index 0000000000000000000000000000000000000000..806e2cd0f21ad9770c2d04bb80a3b6b81695a99b
GIT binary patch
literal 723
zcmbVKT}vB56kSX3VcVxZ_u)PWDmd9}qHSD>5R!-~NlfF?2ZP9Db~YK=+zB(YA*J=F
zi9gA|(7P@~5L#$2oVn*R=Y9?I{Pg&-^8EDZk?j&b5e7v-_N#O+{*d?s;fPSmziiov
z*oPg@`$m3B{yl*-bQVVJ-9NCl5IRQ(PJ_u2V!he7(7lXdrnR%q@D(InE;V`=DwBZP
zK}rb;1i3XqrUlP}nZm&74cn$9-l#q7J+P&;3#QOIo@KyNn5H=jr!?LIGcYyOB2nhH
zviEa5x%%4c#9rC!O|`1fm{#8O-|LUA<Mv>1*X>UVz0gJm+AX9BwsZWUoRwy+g#53H
zW25h-aIBxO@6uS>B?1*TQEnWgG1vaEKkU6;h1Hth(dZ;P7XMhu2plPcRmK&bfmm>3
zrEBFbWzAQe;b>E7SPz9x6wV`P&Xn`VS#Eg7F0@(N2ypch+E)DxO4>R=IEV1iA790+
zV<azLnsvFOuJu~@nbnS2y%~p%=%f+VPph@l#tmuNM6Ok_$X}%=H~xU*Jm+(&mYTcH
JrC<Is|2O{R+>ihO

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-mesh.json b/locale/fr_CH/freedombone-mesh.json
new file mode 100644
index 000000000..af1b22bbf
--- /dev/null
+++ b/locale/fr_CH/freedombone-mesh.json
@@ -0,0 +1,11 @@
+{
+    "File not found /usr/local/bin/tox-bootstrapd": "",
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
+    "File not found ~/develop/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
+    "Couldn't install toxid": "",
+    "Select a user on $AVAHI_DOMAIN:": "",
+    "Tox ID for $AVAHI_DOMAIN was not found": "",
+    "    Label:    $AVAHI_DOMAIN": "",
+    "    Address:  $AVAHI_DOMAIN": "",
+    "    Username: $USER": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-mesh.mo b/locale/fr_CH/freedombone-mesh.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d3c80aeb4af439bab90d0b769c397be022d3b8a
GIT binary patch
literal 858
zcmaKr-)_?|6vhMOD%^p@4M?1eY77ZCZ3ZLC)UnV%EK=K5ZMTcvOm5<KMy_4iPANCM
z*|bO6D{w+XODl~dS-*4q9e+8Nm52Mg7w*ITorB@wdV@<81xC5O$zE=<SDWnhPUb#w
zoCDke<Xhx7<Ok#o*<W|=WY4h*o}z$p`fSZFCC^I6CBK$zmTZ-5m+TY-j7!6`q;nQQ
z<#N;>I!%>}Oun<grLj~9uxiCKr*+YblfGM=h_g&HV<Lb`d=;N3|7u-2VFHys4SrAq
zQdyX)TxRZAtsrS(p?57Jcf<rsEl|jDEKu^V-r<664ZzQh_JvBR@F!gQI3k%SWsTKz
zkvSP<bG5%)O_iLwdp?z<KN`o~?oBHh7A~pM%vbi7X@BGQh#k(i<SE;C{N-nC$%I-w
zYB$j8JKm8b8M$KGa3v$)^-!{vB{<{K>m|MRR;pKPUQ<cSq$T5@3w$Swo&G{lE>9r6
zrP?st$nBJb+dfUDnKDh<GF2Iuvk1Zox86YHnhMfUdXCR07k^6A2u@&~HV!46LjAor
zxEPbBX4K+zq(v=$HK^5(N$n#E!g2j5`g9ZppQ~YTe2u+i$d<gg$bVbIYp+Y?ET=Pc
Oo9dh9dGQC8;r#}A(CZ8U

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-meshweb.json b/locale/fr_CH/freedombone-meshweb.json
new file mode 100644
index 000000000..166d9b1f8
--- /dev/null
+++ b/locale/fr_CH/freedombone-meshweb.json
@@ -0,0 +1,27 @@
+{
+    "Blogging on the Mesh": "",
+    "A decentralized discussion group": "",
+    "Mail for the Mesh": "",
+    "IPFS could not be initialised": "",
+    "${MY_USERNAME}'s Blog": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS": "",
+    "Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "${MY_USERNAME}'s Mail": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
+    "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-meshweb.mo b/locale/fr_CH/freedombone-meshweb.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0e7eb3f98b0c5e4e31262a66bff0aa2517905eea
GIT binary patch
literal 1875
zcmd^AU2oGc6b(>#2)uyc1%YH>Y>dh47lV>%NZp!_il(j7cGCJXxry5vGP`n|i4F17
zrv0S-1#S|WHd8hzuUJa&$@TH|xz{)D<;D4<+~vi&2IDC_&*1s}8lzia5`+@;B0(<!
zX}2{k^t=MQ2G#_-4)z#q9V|oyw4b2Rw|Ym@HbM?q9M1sCC+Km4o&$Q2i`j3%hU^2d
zuVV(F)dbCb<;1rIXydM?g&qR-VLSuqNd~$P8G~M!4F{lm{~@X(mpYUyNj!E&UF0&~
z34EUkj>b|1Q>|L7*=Dz!tGceFzHcBHD+AMRx6IzrZnM3AGo#+N`_|1AtJ-KLj9pKR
z5n0&ln$7A$2FKSB(|h(g8F~~cfkuqG$Y+W|mXbP3$Wvn;zSgkwE>R?(o!!5OSxQb`
zOjZ7jO2MhRA}3X+0Z>|0p>(~nrO&umYL<}G0%vTCFz=cIM@qt-$Bd5=w2GQgWKn;j
zH9GY!azx;{hzo^=6fw>egXZ$7t9>yKbCKYwWG4j9;Tv5%fv}s7I(Flr+A||=EI6AS
ziB7RQ!O&yQpJHaR{xVpYcWTR7t(Hk@wr08HW~-u8$*xFBUBnv+IX{|y*R)$z%lx_K
zM_rR!`C%Pui{5Ze?CnVL6+RH$aPa|^;cZ|bR;+OPU13M?6WwZ9=6tHSS<v?cS8$Ku
z-szMYNC7iH^$6qJ$e9r7Q?(PQ5w6U6l5l@SB{sPuT<9YMRfbII9WQ{p2t##_;j-b=
z=+)mTZKD|Oyy55*Dz59Db`S4KN))KWHRvV-l?ui8xbO~_D!pRa*eV<4!e+VrVE|lg
g(-RgZawGNQKyMO04#*gyjpWhZXFdK;$okcP0eFTD@Bjb+

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-mirrors.json b/locale/fr_CH/freedombone-mirrors.json
new file mode 100644
index 000000000..bcebe53c3
--- /dev/null
+++ b/locale/fr_CH/freedombone-mirrors.json
@@ -0,0 +1,8 @@
+{
+    "${PROJECT_NAME}-mirrors --sync [domain/url] -p [password]": "",
+    "  -p|--password [password]    Friend's mirrors user password": "",
+    "  -m|--mypassword [password]  Local mirrors user password": "",
+    "     --port [number]          Friend's server ssh port number": "",
+    "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "WARNING: failed to mirror repo ${repo_url}": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-mirrors.mo b/locale/fr_CH/freedombone-mirrors.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8b92c76f17a8b8217fd59d53427f422ca2dade34
GIT binary patch
literal 794
zcmbVKQBT`25YDDfNa2m=J=_Bl+ayENZYT@uq*BV(iI%F0Hi-&NCUIM%#E#BRp#pvy
z;wSMJc1dU%5AeWA=lksYzRzdL_jk7&wfnnUhhmNLJ!M#IC?1YisI@|0SLhp|cW)f0
zO?98@Lx<3(ibH6flDudwg3#MnAt-{eOrwRd%F{D}r{!6>9HJB|-ZEeW&IN)oGbpJQ
z(;;bk%~-m~xG@(RV;C<Hxg6<;Cy+`+jRtb^fMvH(W~5y1pXdNq_dY8&BsL2b!8q0_
zm+FO~D*{*zrQkx^nKNkjyEkm<{?uwG$K;g8`){V&=GAa?{Hxmu9ctdx{<KGf-rz?7
z6D|`G7v7Z@pvW|AUKPa|qCOXqWxbgF7HFha0Z7kR;?lB6tGV0n^}CNPZ@cbxw6a23
z7A`UofF<TmmeBL|AewPB!nSfdVg4fzxiS-htg9j&OEnF^Ka<uSCOPti9coNX04giD
zrq$Sk3bsBd_zvDjcX%AK4hn8*I(EP<-P)*oyR811HT=+P249*%)7#$l>nFrzBQcl7
aLtdmdPuwG}ra7OI+XVl1e!A7)bliWhHSe7O

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-pin-cert.json b/locale/fr_CH/freedombone-pin-cert.json
new file mode 100644
index 000000000..dc2fd0c16
--- /dev/null
+++ b/locale/fr_CH/freedombone-pin-cert.json
@@ -0,0 +1,3 @@
+{
+    "No certificate found for $DOMAIN_NAME": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-pin-cert.mo b/locale/fr_CH/freedombone-pin-cert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..02c3d83772bcd2f406a7c80292b2b05265a3cf4e
GIT binary patch
literal 373
zcmaJ+!AiqG5M8CG_2${b9uySZnlx6z)(EAo7%*v(;-ME=H=DRpXUk?&^y5lDslVW~
z6?${v&3iNR7-lx>)oE+9UJ;CA#2MmxTVUMpX~!3+6U508A?mMhQIou%jas>7N;_{#
zqomiYv<(!P9XlV6vwoVBiL;+td7c*hRlC|)5X^)z=x@)Jg(c0>Y;+if?SKv}cnzLU
ze->IWkItLLTpH*x^&wrYebV@n#|NL2P?y^A5hz<2s054Oji-}&<K&z_TK82828&%;
zC!HSK%j6Q+0}HR{WIW{qr=`d1_z?dPtP_NHJh<hZcp65c8;K}t2T?RbFMrWXvwh@W
VYj;MUB~*>9a9io#22Yd_`U@9~XBq$i

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-recoverkey.json b/locale/fr_CH/freedombone-recoverkey.json
new file mode 100644
index 000000000..c48d48527
--- /dev/null
+++ b/locale/fr_CH/freedombone-recoverkey.json
@@ -0,0 +1,11 @@
+{
+    "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "",
+    "User $MY_USERNAME does not exist on the system": "",
+    "Encryption keys": "",
+    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
+    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
+    "GPG Keyring loaded to $HOME_DIR": "",
+    "ssh keys imported": "",
+    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
+    "Starting key retrieval from $REMOTE_SERVER...": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-recoverkey.mo b/locale/fr_CH/freedombone-recoverkey.mo
new file mode 100644
index 0000000000000000000000000000000000000000..51846d909ebfef1edf64a9f80b04c2b5e59537eb
GIT binary patch
literal 960
zcmcIj&2AGh5H^t0azJnfF^3!q!rP=NAxa4nq)QuMlPKL(qE)Hf>?B#bYp-l?+6eJz
zRUfIZz<3){At7#zWX)&K|7ZK=`szvL=K6|}c(k6<O5KKJb-YH;*XYq2y<MXQp_lg<
z6QsY9=C>9?{u)Jup515cF=<WuAz7&kAt!_${0Fq#8&&p(d+-^TI*~I-m54D0tDw3+
z2m=<#iC*S5Q4-E^X;?TI_oGTQM~!eH3<$`zI!iHwOcm0)6n2g<KKKB!P8L{Zq5`LM
z!us#S;3wBOQ47?R4tN2_g+VPvh9|&dI4*-uD%Bsu(cn|ijaXk@fX0j>{!HvcPg0~U
zPbFU3RlSLlRwU9jB3#Qb)nb;Rw68#EFqq=R!r<KXH6=GQX9vOPFc|s1UpcTsmm|11
zjaDbP5GiF)8B|9>IEVr^CU-Xn#0m{aWdSb}V}S^AgPWzXm{rEq8dSrt?00ojvgO>T
z#8d1Tgg7B8tkO%Ut{6Hk>D}~avdCwy-@h7|G4t{^Ajxv2Eyir9)pyFpdoe#mZRon%
zkkng_7fy^Uys#Grcc!{u^SVS7(ZZu;j%~2yxtXWL+zw3ULL0Q5!cKYX&QA+zrl>hR
z2^AB+ZD^e()*GgU7AgOzbY|Kh^KxrCTRU(II~x+-LH&g{97MdUQMkv%cZH>@TeW(V
y*S7gqE2=lzuN&>gw%=?vkI0vgaFMt{{^|PW$onGXtPnHGHr1!yefLjS;{5_9#UHZ(

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-remote.json b/locale/fr_CH/freedombone-remote.json
new file mode 100644
index 000000000..c1c0d95e1
--- /dev/null
+++ b/locale/fr_CH/freedombone-remote.json
@@ -0,0 +1,6 @@
+{
+    "${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]": "",
+    "The user /home/$MY_USERNAME does not exist on the system": "",
+    "No remote backups list found: $FRIENDS_SERVERS_LIST": "",
+    "Remote backups list: $FRIENDS_SERVERS_LIST": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-remote.mo b/locale/fr_CH/freedombone-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6e1808827a6eba0a1f50f3dedccfe00cb6da2b81
GIT binary patch
literal 630
zcmaJ<O>5gg5LJtNQExf-Fb5yn!p4@JxI)2&Vk^`kc8sj1G{%IDG`2U9cE#>0O$hyI
zAwMa9p(9H)hn5aJ-W%r4$HG28J?^!hpB^2GH-vYDag|VHHSM@hIwyQ2)b{UxluxSt
z%5mNjR)i|V>zc0{zG*nC_;j*}TQdb3b7c{(cydz~1~OqRtW_z~0NTgVB%F;Gmy0ku
z52Hoh6aC%r59{p9H2lSy;jDyZX;4d^;|f>?%X(e2O=Q?qa#-d<LcxvssdNfd*x2o=
z)qa>qXD8t(cD~Uq)oe%=8j#8Y-c=_n33iKM?v2H~6_czMLT9UT?6jvpoVixlm{>MR
z**R(>lng+4zQjAr5+!fl>0}zdl)U|}J5ti3v@E_aFaS%=PLXjTk09A{ZO{%&yJr52
zPjhM3s97izl?u5Dz`qjKooA)y89P=wHv!0EmzrVk2x>WeFX1zIAKdv_%tjiyrR&(3
zTiV*|dIQ!yU_C$f`oUp8=nwV}28S2qWf9(r>LLHNe!6f^x!ja|L(|s!a`e^R{R;Ot
D%BixF

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-renew-cert.json b/locale/fr_CH/freedombone-renew-cert.json
new file mode 100644
index 000000000..05340eeda
--- /dev/null
+++ b/locale/fr_CH/freedombone-renew-cert.json
@@ -0,0 +1,11 @@
+{
+    "${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]": "",
+    "Adding Let's Encrypt certificate": "",
+    "Renewing Let's Encrypt certificate": "",
+    "Unable to add Let's encrypt certificate": "",
+    "Save the requested public key to /etc/ssl/certs/$HOSTNAME.new.crt": "",
+    "/etc/ssl/certs/$HOSTNAME.new.crt then run this command again.": "",
+    "$0: openssl is not installed, exiting": "",
+    "/etc/nginx/sites-available/$HOSTNAME does not exist": "",
+    "$PROVIDER is not currently supported": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-renew-cert.mo b/locale/fr_CH/freedombone-renew-cert.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b8085ed35452ccafe464d70716eb103f630cfb0d
GIT binary patch
literal 903
zcmaKr&2AGh5XTqj0WCMq97ZUpMZ)={P1q8oC=F^*L!vbF(5kB3-AQ8V*jwA1CLkWI
z>Lc|P7&l9DK^e*V{cX>TXJ)mJ5BINk9v|)lvXIsrTGDUG^5eC7w^oI<s*!s6EC`y!
z&qN^pA|4Pap48j5YOU2SsrvIEct!VDL~l1QR+KqsIaN-bGtGIM)8w?Cg>nQsMP;o7
zVL@pJLRrV9#N-3uLO7u&L18fLpLLHq!+$<;W(+DPmteCr)y82Gl+eW`H4$o2vcjQd
ze9ndB*Ah#G<NoRBd#l%hMC0leN^RXLhTbm4Xq?^n6&2nUW8=V0QGv-62`Vqvvl&+j
z@Cg^H7_^dvs)G}ByB0bsHp|q3&m_ho<_-h@<R3<r;vMtnz@~69)z&FK!%JW(T%<<N
zMS|vXr|_G){MKoYf}s!Cp81r|(H92>Z!@&iKcv~U6fxZ35}byoX>92%_@Vr0yem(V
zya)VG4+EorV(eHqVP|Np&?*8^X((Jc7Hc&Rd);1Vb5$vp!?sqAz788LQ;fioXDO95
zu|tTb+*owY%#B%N<7c?CV>FCrsQpMIXj}^y4rFGyWM8$J*$7nnw6)FZA*^I`Pr(<c
zyblNc5o;Udj;dovH2Das<;npoe`M9hs8WmeYf-IUtbeMVlP??MT=+(|y6&HcCtOW3
QKA~)5bJaffzguqMUw*3tjsO4v

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-repair-database.json b/locale/fr_CH/freedombone-repair-database.json
new file mode 100644
index 000000000..51649c710
--- /dev/null
+++ b/locale/fr_CH/freedombone-repair-database.json
@@ -0,0 +1,4 @@
+{
+    "$DATABASE database corruption could not be repaired. Restored from backup.": "",
+    "${PROJECT_NAME} database maintenance": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-repair-database.mo b/locale/fr_CH/freedombone-repair-database.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ff9842e5435e793b87e3a4575421a46bfc46065e
GIT binary patch
literal 472
zcmaJ;!A`<J5XH!;-aLDl0|z~9r4&gi!K9WNAygV{Ja94Fc8k@r+ibT)WBfG2C-DnT
zAqG!Q@-px3zP!oo?zWrr=5D)bV4Wf^5Zzi}O%H9~C&+z73vsZYo&2)ehG(e%u-3>4
zojd2rgM=y?(UL(dq^t^+368YN6W~HY#6YrwW|Ad3%vq@fGDxLZK}6&Cs?Zycj_-XR
zV^%cdigC(g)@*$R^V!66!$u&*8;cbgC*+yQ5{KB385U<Bio}AiHGk}T$16i`Yp$qs
z6bU~IW`jcKb&+HE0OD6FOQwdEN{My!Ny^KVN#gNXBpF}YU`3hIg1nM6C-*|GN*j2w
zm*ucCfCC*~a<~QKN(*KoaV4Ym6Oa*AIJMI@dZgVY9V;|U`^L1*zHat=3-ppXTW9qm
X|5~kuHl=)7(Iuv(^2L47@E5cnr|OFn

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-restore-local.json b/locale/fr_CH/freedombone-restore-local.json
new file mode 100644
index 000000000..7941ffcc1
--- /dev/null
+++ b/locale/fr_CH/freedombone-restore-local.json
@@ -0,0 +1,55 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Setting permissions": "",
+    "Unmount encrypted USB": "",
+    "No backup directory found on the USB drive.": "",
+    "Checking that admin user exists": "",
+    "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "Restoring configuration files": "",
+    "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
+    "Restoring mysql settings": "",
+    "Get the MariaDB password from the backup": "",
+    "MariaDB password file not found": "",
+    "Restore the MariaDB user table": "",
+    "Try again using the password obtained from backup": "",
+    "Restarting database": "",
+    "Change the MariaDB password to the backup version": "",
+    "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
+    "Restoring Mutt settings for $USERNAME": "",
+    "Restoring gnupg settings for $USERNAME": "",
+    "Restoring procmail settings for $USERNAME": "",
+    "Restoring spamassassin settings for $USERNAME": "",
+    "Restoring admin user README": "",
+    "Restoring IPFS": "",
+    "Restoring ssh keys for $USERNAME": "",
+    "Restoring config files for $USERNAME": "",
+    "Restoring fin files for $USERNAME": "",
+    "Restoring local files for $USERNAME": "",
+    "Restoring certificates": "",
+    "Restoring personal settings for $USERNAME": "",
+    "Restoring public mailing list": "",
+    "Restoring XMPP settings": "",
+    "Restoring syncthing configuration": "",
+    "Restoring syncthing shared files": "",
+    "Restoring syncthing files for $USERNAME": "",
+    "Restoring Gogs settings": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restoring Wiki installation ${WIKI_DOMAIN_NAME}": "",
+    "Restoring blog installation": "",
+    "No content directory found after restoring blog": "",
+    "Restoring cjdns installation": "",
+    "Restoring emails for $USERNAME": "",
+    "Restoring DLNA cache": "",
+    "Restoring VoIP settings": "",
+    "Restoring Tox node settings": "",
+    "Restore $RESTORE_APP": "",
+    "Restore from USB drive is complete. You can now unplug it.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-restore-local.mo b/locale/fr_CH/freedombone-restore-local.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8728e6b9045c7f58309d72f9aacb60cf741c7eda
GIT binary patch
literal 3303
zcmd5;ZFAd15Eestb15@Wpk;VF1_RA7a^p75WZX%aG;xEWPK@KUG=+w<bhfXSbgJ$Y
z$87_@tka*=zrb_SMpkIjGJGPF%(L3t+uhr}dp6IXJ^f(r`Lm}EewOg}8UFD3n*Da1
zC$G=&Lx_j?t^;8K>B~a8cuYDw=QzvIECH>J0$$23ApKHE-$Q!;jeKnd_zAv4;JMra
zQlpT*D5Ud+^eLpXZ#s_6Y@YBs&{}K*-vf?;Hit*RZ-B@g(#M5ledIdwi&ZO~dCPI^
z+Si0X0PU`OKwF~(SOsD)q|Xb9@`UcILia7Cb8o{JumQXPybqiQP6*)#68VATVlCG(
zNax?l{VfB(!}l)G>R|zi>II2<0|_g|I`ygIIP19%(npXkoN*kRZw+_`9d85e&)s)(
z+$Fq6_#5Hxg!c*e2>&4DgndGf&?gjx1HvKUh)@zfARH40gdt%>s0d@ihlB~CCNzX8
z;XdJn@PKei_=xZ^;S<6`!aoWBB1FyqAJS^4GuIW`s6?=8x4GTh>NcIV5s!v~nUP>^
zo=CoagT-9yiAsECRHpB9Z=A+#UnE+p2s?x~meCMv+%WEkGGeI~2@?lW8||#Acxsn7
zIvZ>(rkV{B6_)MbHc`qr8^W9%H``z{$|F1Nt)0!@TyG?h_=Ic5S)8bTAVL<ZG%|TE
zg6(YIV16R^aT>*{_;Ox2(Le@*Mar-NHu}!yYP)$zHL+gq$gyNH(uM~CH#jV-KEBiX
zxwW^x)n09F=JsqN%?OE0ogF*kp{UL6pa524)z$TOYjbaByV<qgXTfT$E66pxcDh?X
zHP?F1rlLbKUnassZ>D)}48d&)ibK_`t*0U*BJ+YV9~d+s$(m~q(ht<o=>&pn!MHKp
z8=+{0E63gfo@9mdx#4}7WjcE^vf>w}45#!|7ze_L8oR4f=J5!Jny@sAgLKHGsTEtx
zmngdta2*_ZwrN!#*ALl0A{P2`-N~h0TfeorilE-8>}W#`HI5rAU9!xSS{Qq-vcA>1
zxm_~5C5&dx$V;ZNVJDckQ!~?}8Hv41c{fX5deEP+xu*_L9bcTZc3ZVNC+UA}cTUuo
zo>sSsYt<};w+%jaQ%h@}Kx+rm<3^Or;63moed-<+4djs7_kjm{%9(NdV3a2L)5vT~
zVMWMgaQfx}XyWDWhfx|2ivpdRMW8$$yuwvD)enQhRVm3BB&H(lKkD77VL&mSJ<-3g
zO#6ZKm^HQ+HUJBjBI=ljAXNOK0I!Uy^@vFGlpg45<bit-=U6w&0Sk+lmwV<(k9Z>d
zyrj-{{(u-N6-p$nBJK3RN_@yOqPL;#LocR;>Km-s{g&s6vX5SjW$hC8XB0UCg?ri9
zp*_`3w|RRnBhHMvk5g!k^)N7KZcV{J6B*e4C)%(`ATHSch*&u^lNr74WdzUkR2vM7
zjJLsFGLlB(3Y6ZL&C6${JPHDLb|On+Hpo#9$60K)o<`X?%BqviA!Kf+L?}2OUN$Xl
z;b@%t($9tiChZtO@~tALCFEkqmz|!a>6GysPt8ar@{#bJPNE)QWVkKgy`9hI29x#W
zNE{d!mt()uZnc}UrFw0lvX;*ew>OPNgBe&}iUV}-nr%pe+qsgOfxA4jOOX0NBrf<;
z`DlHEE%&9VbONwI;NDb8s2j{q0(|O~%hy;gu3U`RbylCRbhdi#S|T#WaM!^|4R(2<
zzT_?}x|f%G^(&35R~m~8wZ*H8yRdb;Vqe-T_fpfP-O4Te(~|NbybY4QwIA`H>wo#F
F{0+QNrRx9y

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-restore-remote.json b/locale/fr_CH/freedombone-restore-remote.json
new file mode 100644
index 000000000..153baafb0
--- /dev/null
+++ b/locale/fr_CH/freedombone-restore-remote.json
@@ -0,0 +1,41 @@
+{
+    "No friends list found at $BACKUP_LIST": "",
+    "Server not found within the friends list": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "Restoring configuration files": "",
+    "Restoring MariaDB settings": "",
+    "Get the MariaDB password from the backup": "",
+    "MariaDB password file not found": "",
+    "Restore the MariaDB user table": "",
+    "Try again using the password obtained from backup": "",
+    "Restarting database": "",
+    "Change the MariaDB password to the backup version": "",
+    "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
+    "Restoring Mutt settings for $USERNAME": "",
+    "Restoring gnupg settings for $USERNAME": "",
+    "Restoring procmail settings for $USERNAME": "",
+    "Restoring spamassassin settings for $USERNAME": "",
+    "Restoring README": "",
+    "Restoring IPFS": "",
+    "Restoring ssh keys for $USERNAME": "",
+    "Restoring config files for $USERNAME": "",
+    "Restoring fin files for $USERNAME": "",
+    "Restoring local files for $USERNAME": "",
+    "Restoring certificates": "",
+    "Restoring personal settings for $USERNAME": "",
+    "Restoring public mailing list": "",
+    "Restoring XMPP settings": "",
+    "Restoring syncthing configuration": "",
+    "Restoring syncthing shared files": "",
+    "Restoring syncthing files for $USERNAME": "",
+    "Restoring Mediagoblin installation": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restoring Wiki installation $WIKI_DOMAIN_NAME": "",
+    "Restoring blog installation $FULLBLOG_DOMAIN_NAME": "",
+    "No content directory found after restoring blog": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-restore-remote.mo b/locale/fr_CH/freedombone-restore-remote.mo
new file mode 100644
index 0000000000000000000000000000000000000000..190ee2ec2c6e5f83f5392506c3238880316d3c34
GIT binary patch
literal 2425
zcmeHI{cqbu7`|=UfJ`6+h#@|25cYxOuIW0~WhzperXgC=Ms3Q_1WXtE>>PFOth;kZ
zK#0F=+Ml$4f#+=3aZA%8@her6=ka^*x9@%P`qj(#YOi0tB>207&!_nObjdvt0`cW4
zYnC#nnV-(t*O1-3LdX}uF3<x;z`_dbUTy{Ue#t%uyIv#Y2Jjo;C%{eM2f$x|?*I+Z
zc|}C9k4yGt$z1IG^j)xPR|)wLcmwGCE)~z)zy_Xw27U&F1=!7!-748vCA$mu_BBEr
zJ_I^D26WZ^1*Aau0W17~-7aPB^rJWO&OQRVUW|c7HDIoO*n?e1*K-DuV{bbApZ(V!
zkhiinl1l|%F7Qf$wF0j?Y)_bsIJFZ_2TTjLwMi3Z%nPLhYE>p5GygD6=n>aOC`sBX
znF$%u?yyS_`OMHzt0`r{R7jc{uAP}y%91X(XZy_zT*TZn>G$?WwH*aVg3G|rSQtw~
zmCArJOB<UT?I#CA@{jaF5pyb4p-Of(2A$d-H&$tv-cxZXsF238IA#`!)5g=@liu^K
z-N8n0=d|`XR?#W#?Sp=Qv%lLdEfn>Yv|L&m2+e)OnH^^tTGXw}*v=bqsW5F_E&;P_
z%nZ+DN}p_Z-ZM6ikB^;2<B#T_r_D-vwW`9UJL{^*Ac;hoim*4_-mg6Nxiz#SeLYJo
zHQc)Ns_Ms0KI@1Ff<<Z^<2^6PV369mSM)~H#=(AP&%K#S4tt%AtrLO~6we6w<6t;E
zOYU=YH55LxyqY>*PADSkZUye-g4nrIs`DF>=~gleQQG<TkxY}QOlo16Sotizz*T~I
zQW9#%r7!fBXys3t_&1s<UXM?mvbzy(kSgVwgiSHq_(z==Mm1(q%=dy`nwj+N#Kk$$
z)oQ>}<NU79J(&s9Jjgpo_PNH=nU6SqAzZv{sZ@6b8DSDx#Bh|Nv?x<3x0o7RoH(a$
zPZcZYK)Qj;R#i5&{M5v`#a3A+*=VuUPOw{k=K&dN^(!`j*9*KK^0nBaqPZsdZ`MOI
zj_QNnpff*eE-lyF`R?#WvxK*(h335^Mq-btkDBo|)>9jLYjZu#qzSq9Fs&*;RV}(U
z7PdZ&aeHHLTj{B3QJG|qW_{%`&FT6bNx!4byY=Dj$ZKn!-E?mY!_uNF%gt}S<yCKG
zZPdKqdT_tB+FW|L`sf*Sy*+*;+<re#^}+J9dLO?RDU0AO)X&@B*Yn?+i@)oC1LN$*
A)c^nh

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-rmemail.json b/locale/fr_CH/freedombone-rmemail.json
new file mode 100644
index 000000000..d67f055dd
--- /dev/null
+++ b/locale/fr_CH/freedombone-rmemail.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmemail -u [username] -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-rmemail.mo b/locale/fr_CH/freedombone-rmemail.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fde0bf0428003c7ae13e837537f436e12f939155
GIT binary patch
literal 394
zcmaJ+O-sW-5M8CG_2${b9y};GH6K-CY6OW9E7pb*JhT*9lWC14o3Ohniult?e^UQ~
z+g9k!fyd07dGobeE)H9(<$@U7H#jmlTN7i~TetC^i35X!JwoPxdDCVXdA{vOKOjpi
zd0sGR*tk(B1ut>J0NHq(=UFCEsY&bjJ01=mqc9<{tUfT+(97TjrOGSev)uLseriZ7
zF{k}rKiZY-wnf8AXcQWfuNr-(jq<!McrLmuedki44jMfLZ>N)7s3}T_L|SFJnEA|m
z%QcOQM)CsgD_JU^iF!j-;B?tG3{C{QVfHDF2ML4{xi;6q9oJ^7W7(Hrb-?iw+x0J8
lzvH$o=W1lMFvNMje&j!?Ymev?7qf=X%(SU|4Id~W^cV5ga2Wsq

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-rmlist.json b/locale/fr_CH/freedombone-rmlist.json
new file mode 100644
index 000000000..d6bc87564
--- /dev/null
+++ b/locale/fr_CH/freedombone-rmlist.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmlist -u [username] -l [mailing list name] -e [list email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-rmlist.mo b/locale/fr_CH/freedombone-rmlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0f695b750167141ebd4217f5e4b346b293292948
GIT binary patch
literal 423
zcmaJ+!AiqG5RKAPym|I82M-EPZQ4{~Y6OW9E7pb@JhT*9lWko|H)VHI6!FtaKdHaq
zG!=St;4$ybd+g4vSIfiNdbPBu_6bLXvyGs-+P11c6AuUndzSSVCq<03^>ovVeo)PF
zp$%XOqf&Dv*^G|?a~RE-$c3CjW&e#ij4H`DCa^41T<dY|_&Xl-AEGd^VpV+b)L=Km
z7p}A@qz}UJB>yy+7II<ty1i&;IrWAe7SeEOF!`Eu9}FeW=Q$Iy1L-?cnwy|B6ZCdD
z#iX8ag^^5)j5hSadlSZv^HQ-K?+P{3KFE0`b<pg<mIfyhuE9CA<9>pn;>^%?c*_j^
y+H5!%*l@AwB~Ht4w|v*FyO-{evN+%iu{q@5XnSZsGC3{TlwO;t*YMu9Ec+L}nS0&<

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-rmsipuser.json b/locale/fr_CH/freedombone-rmsipuser.json
new file mode 100644
index 000000000..52e3578e5
--- /dev/null
+++ b/locale/fr_CH/freedombone-rmsipuser.json
@@ -0,0 +1,6 @@
+{
+    "${PROJECT_NAME}-rmsipuser [username]": "",
+    "SIP configuration file not found": "",
+    "User $MY_USERNAME not found": "",
+    "SIP user $MY_USERNAME removed": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-rmsipuser.mo b/locale/fr_CH/freedombone-rmsipuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f4a6e98239632fde3302503c0c9906d66330b7f9
GIT binary patch
literal 530
zcmah`O-sW-5Umg|@#a;9J@lZ5tx3NODHSA*STQ!VsbEDUCY!jD?1s&zDB@2m{Ym``
zPEu@cIxstL<~`mp>}I_>R5t5X17aWY7;;oL5XrVwwFx+dM37tg(GH#L(81m>3!_p8
z{Xgjb%CWz(NOPJMIT7foe3_q;XQlb&PA9jv<uztw7X_R}G%kcMDQ7662|<iY6!C(E
zjrq);mQM9ZnU`)&=dtDlN%@k5O6gYZDp^<XcM?cE4)FsKIe43h>INep62r=+>Wm$`
zru3GkTAWG3B=$ZtVj>C3^DOZx8=&CL7der`LPprAb;4(PL<F{3z(dMn6B(~ms%`?;
zB>0-c^(JCj)#k(Y0Bzy$l%Y$cpQ-M|!<Hb`<#^;v*xJ_gKGwRpZFqXe>~+j;zolJt
g7of#cvZUo9e@c4`_0DH;;m6<>i5Kfet-ebA0kE~0?*IS*

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-rmuser.json b/locale/fr_CH/freedombone-rmuser.json
new file mode 100644
index 000000000..77abc3006
--- /dev/null
+++ b/locale/fr_CH/freedombone-rmuser.json
@@ -0,0 +1,10 @@
+{
+    "Home directory does not exist for $MY_USERNAME": "",
+    "$COMPLETION_FILE not found": "",
+    "No admin user specified in $COMPLETION_FILE": "",
+    "No admin username specified in $COMPLETION_FILE": "",
+    "The administrator user cannot be removed": "",
+    "Do you really wish to remove the user '$MY_USERNAME' (y/n) ?": "",
+    "User $MY_USERNAME was not removed": "",
+    "User $MY_USERNAME was removed": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-rmuser.mo b/locale/fr_CH/freedombone-rmuser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..40451af3afa9d8e8b299fab0b0e03b7fb0eba900
GIT binary patch
literal 800
zcmaKqZ)@8y5XL>`{fWC*dpS0^L7*u^Nt|>`aF>mdx-<|cp>qf8o1xlrqTxtElG7UY
z)k;57zrxP3aR=KfkbbAr!*h4Wcegh$?Yr9>3s(d8Yus^h!BwT}=v^Ik>gW|ljYpQ%
zLN<|YWPp5&{DpjjL?4Vk*3ll`${ePwCy$HMvYu9aR`GeoMn$LMUd0y$PbO2}o=Kqb
znhVG@Q=m62;t6LlV5T{q2aBm6PUf?JXa!xfhxH(&fkb8^w*RyWSF9|_wNcbaRhEvZ
zDD;;M6kE$Ji>>po{@LtH;M=DXOT}EV2-P{nlIfi{yG9GFpr9FiujOz>%je3+J})Nw
zOYz^=eQ4z!aR8s~V+py;upgSHIb3nQ0wb&Tz~C6WZ?<1pFO>X=?U6}LzA>e_6drJQ
zDA=_jkrZ1em<0a)liTh(V<`+1hJ^Wsd0<f4*`$<<BZyX1X=X;5NyzYCr>M{gQ^XgM
zjJa5PFudf(S)`ewDLIj9tvwK%-BpizM^J{NmVi&-9yp76NX9sf!S2X0HCVORbw7~q
wA?Xc6x9`30dxwMeVBlV$mYlIIF9vx~+P`q7R4g;PM7Ko!7@s=3AF?={-+Xo0_W%F@

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-rmxmpp.json b/locale/fr_CH/freedombone-rmxmpp.json
new file mode 100644
index 000000000..12011469d
--- /dev/null
+++ b/locale/fr_CH/freedombone-rmxmpp.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-rmxmpp -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-rmxmpp.mo b/locale/fr_CH/freedombone-rmxmpp.mo
new file mode 100644
index 0000000000000000000000000000000000000000..36ed1aff3d3b7dcb467eadc7a19f7d9757584c54
GIT binary patch
literal 377
zcmaJ+O-sW-5M8CG_2${b9z0lZYLd1RQzJ+kv0`i}!9zu4O}23**@WFqsfa(V^e6Q%
zxNU{r9C*xoGmrULua?KH^=gSs92%S$oNt7Q>s{LBw&A|P(E&pFUtJlFo^GS?2V}V@
z>zV)~FRY}zAT-M)Q|h&K`W;Wk4`Gm?SXQ4b)iBE7nMuVf;Sp}Tf-N+pm6+pb6ovbi
z-LY^`3C)Ct<f~>L(Z+dE7nF+uNk6DmO#6+VfxGufD%6Zg2t`_DT;v{c-?_$d(MVdr
zT_sE95m9fY@|^+MQU6Sk8)CO{JWe2xjB0Zo45>C-9m~E1s|Svo*j=yR^?Fww+wD$`
d7ba}ZH;?>l?N9L|6?sE*Gi@f{f_sb*{slU;Xx#t+

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-sec.json b/locale/fr_CH/freedombone-sec.json
new file mode 100644
index 000000000..a95e9be50
--- /dev/null
+++ b/locale/fr_CH/freedombone-sec.json
@@ -0,0 +1,29 @@
+{
+    "Freedombone Security Configuration": "",
+    "\\nWeb/IMAP Ciphers:": "",
+    "Protocols:": "",
+    "Ciphers:": "",
+    "\\nSecure Shell Ciphers:": "",
+    "MACs:": "",
+    "KEX:": "",
+    "Host key algorithms:": "",
+    "SSH Passwords": "",
+    "\\nAllow SSH login using passwords?": "",
+    "\\nXMPP Ciphers:": "",
+    "ECC Curve:": "",
+    "Final Confirmation": "",
+    "\\nPlease confirm that you wish your security settings to be changed?\\n\\nWARNING: any mistakes made in the security settings could compromise your system, so be extra careful when answering 'yes'.": "",
+    "Renew a StartSSL certificate": "",
+    "Freedombone Security Settings": "",
+    "Enter the domain name": "",
+    "Don't include the https://": "",
+    "An existing certificate for $renew_domain was not found": "",
+    "Invalid domain name: $renew_domain": "",
+    "Renew a Let's Encrypt certificate": "",
+    "Create a new Let's Encrypt certificate": "",
+    "Invalid domain name: $new_domain": "",
+    "Update ciphersuite": "",
+    "The ciphersuite has been updated to recommended versions": "",
+    "Import file $IMPORT_FILE not found": "",
+    "Security settings exported to $EXPORT_FILE": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-sec.mo b/locale/fr_CH/freedombone-sec.mo
new file mode 100644
index 0000000000000000000000000000000000000000..21ef62d17b7729a6613e08f2f4dd5bdc17200829
GIT binary patch
literal 1694
zcmaKsk8T@95XKL1QRS*aDo`W@(tsjT5SPU1KkKScS*}AY;?#;=h(bzP-;I6S-0dE_
zdvX16RUfIZz<0ilV?g9&`}ghc?9SZGtlz(Td#CaK-P-`qSN`jV7(sndtz4>`EA`z<
zeF=5@!yssa_rTA=```~?AN&?{;2jX>`I%aMy_)-Mr5aGdM?r7{xB*t@-U7b??}Am7
zZSXeu0&IgZ=+B3$JmP#P{I2vDwZieAuGA+hMJwfZ!|pNW?jnp^$iYz+4xZDGYyR$e
z=K0d|56@Sge|iefiD&GYc(UizbLN?PO3&Ax=bo8o?x{SrXW{vmr}4C&u3}dfDH|IF
zUBkjL2~s?#Lw1{%dMY-H!cok|$*GL79z4@((~(qhRwhg?WlEhZY_z={^txT@mga(^
zpr;(0<!YjHAr&c+bFkk(>@`Llmqxk;S$0mUnI(QxXyZ5`r)i^iGJJkKUYe59j;6X)
zNu!@vCNz~9(?)+#n@A-x>S{HWCKpa>73>>kIGkw3wDPmGn3d)llaUW4IMCM7IWI_L
zGmR+I9GUs0cM=7IP8V`$w9~Q9Adk69l(;5Umlh)@j2n#(|B=Vh=zxa8+POA~4aUf0
zTvwu$s6r|%O_&vxMS`p^Q)4*RdCn@q@B$^n3)|qua(#VoaHcw0rsq_7$n*@!FD>#+
z#ih5WFd1enEPU44L#2eHg)V6>ZCVL~^8C9_D9;32QlVy?JUvrq>bK7EQUB=Yh=f{D
zF0B*iY$+G$47jbD<G-iGy37(d&I_Zlg}t|hb)5f5cIkuPI3p+)hNopl^Aw2?%FfwT
z@3FaHySasTSXLN?PB}v#T=p@d;>mV@&>61JoeYL+<GLvueRUx+nb2B~Mzn#l2G<&x
zs`B21=BU(FpLP_w8F{GUT)Q>sVnZACKD5wlj$PPK!e8quMkHHpg?A27j*I4?Kj>X8
zwYGMe=wQdnh2urR5jj|H7a4BVld2d7_h_$l)3AMIXOOKan-CXRCx|7Y_C&hoFvBg#
z!hLPf)})H%(C+O%p<3?UQ}h$HzHbhnkHh8v0eUQah6apicc=9z+<6f0w#Tje(L;Q8
owjMorcnaI_m@j12j@Oz#K5ZVNb4oG8X;bs6dr<wm|L@cM8<@JzMgRZ+

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-splitkey.json b/locale/fr_CH/freedombone-splitkey.json
new file mode 100644
index 000000000..5f1aeaf4e
--- /dev/null
+++ b/locale/fr_CH/freedombone-splitkey.json
@@ -0,0 +1,12 @@
+{
+    "${PROJECT_NAME}-splitkey -u [username] -n [number of fragments] -e [email address] --fullname [Full name]": "",
+    "User $MY_USERNAME does not exist on the system": "",
+    "gpg key for $MY_EMAIL_ADDRESS was not found": "",
+    "gpg backup key for '$MY_NAME' was not found": "",
+    "Unable to extract public key for $KEYID": "",
+    "Unable to extract private key for $KEYID": "",
+    "Unable to extract backup public key for $MY_BACKUP_KEY_ID": "",
+    "Unable to extract backup private key for $MY_BACKUP_KEY_ID": "",
+    "Unable to split the gpg key": "",
+    "$KEY_SHARES key shares created": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-splitkey.mo b/locale/fr_CH/freedombone-splitkey.mo
new file mode 100644
index 0000000000000000000000000000000000000000..486ea1909ba3146a1043f8dd363ae722ba5f34d5
GIT binary patch
literal 1020
zcmcIjU2oGc6b+E4?2T6tx)PN-gj|}^LCI94(q>xO%Bp@KZ568A#L2v+PGmb})x=Mm
z_LKG(xK2wawy`&?B<I-oT>IW*<>vb8xqWkeW#QPu_a(mCOmM81H|*_(c^mc#S^bG+
znV3N2s|d1J$n2+<RY81>xQ#eKEF)ebzCgqikZqxQ#c;{6X9oWpYjrvUe>jAnRDnn}
zL}@NUJI-P_XG@$(DD{q~ey`O%w7MO8Ea)s@pi^KMTGBwnj0Wd<2ASjws@Y#zUs~;h
zaesQ?A3vU&&k`Q|EAv~c=a(NSZ+-5cD$7`=WwgJD$`Y>4I>}*@D<%b<vmZbNOhi7P
zF$rk|k)-jQ39T@|V8Z5<CqTncGG&%XlqZSFgUKE;D7LUmm;J%fSHC^7hWjnFt*BX@
zQcQwCGVDLJOQzlN&>xs$AWSi2d}SA0X-Ea=QwD0OG@ILFtj*YK-FNk#ow#ea^N{e4
zd3SY%8O5RNJGJ^UJ!63;-H?1|Qt?!Hz}<$x3nf7+7EZ6*^KV0LrRua(q0uWcT4u}x
zjmmdfLb=$50Gn4#H*+14#;s0Lp&}-UFM>4WBKDv$<J##bxugl%OXXa7AhKernzdb6
z(dM>*&)~js`bQ(uHilw#q=UYCP^-EhNVQICjgkA_+rh`JH0nDis3ilo;HHsBr5{h6
VLn`8&#<*J~r|o@b^=B1d=QqeEEgAp-

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-unignore.json b/locale/fr_CH/freedombone-unignore.json
new file mode 100644
index 000000000..135e92444
--- /dev/null
+++ b/locale/fr_CH/freedombone-unignore.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-unignore -u [username] -e [mail address] -t [text in subject line]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-unignore.mo b/locale/fr_CH/freedombone-unignore.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a61d501b0ae54795d1cfc7262a67c3b20636e0d4
GIT binary patch
literal 422
zcmaJ+O-sW-5RKAPym|I82M-EPP2vY3HG;&56>CEY9$JcQlWkl{CuMh26!E8({-pi|
zH?7c{!#w7_*|#&h>(%nGwO%bP6Z-~724{^hakDL(IxsvmIM}nSKf6(e8Ew7X_2M6_
zNfcB`4p_seR$LOB@i8EW(Ts@_Se{F+l<8;~Y5u7}5U6_c!7~k|AU<v#e<y?fQyisM
zBCDp4-5g)JRHC8)gzJ;JhFL`myVvc-yCb*l*il8Alg9LG&I4!`oX<-pr~}zMlZxxG
z)>HI%KFLT;xx|>VDi>4);7^3Mld_hq#D_}GQ~)&JNELb=*wXNX;1=9dJL#twNzSx+
z9o{o-wt9|xjm{-{e(GKXS53A(&lwso4){VeANkkn4ee(}Ma>E`Z7ScQN87UOUpGK|
AZ2$lO

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-update-date.json b/locale/fr_CH/freedombone-update-date.json
new file mode 100644
index 000000000..948bd604f
--- /dev/null
+++ b/locale/fr_CH/freedombone-update-date.json
@@ -0,0 +1,5 @@
+{
+    "Date went backwards between tlsdate updates. ": "",
+    "tlsdate anomaly": "",
+    "Incorrect date: $DATE_BEFORE -> $DATE_AFTER": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-update-date.mo b/locale/fr_CH/freedombone-update-date.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b3ed9499153460b12f8a95cead5f490df93c70d6
GIT binary patch
literal 487
zcmaJ;!D_-l5KX~TdMNbV!yI~ODQivC5@HpsMk-Vk2|Y-QtjTKA#@(>H(fV=XC;1DV
zHCQjD!#?KC%-fwAcE8(RmiD`?g;qjbAs$VD_ExxqzeE0xAc#VK@ypK7jyX)3D#m}Z
zb}tOZr9O{@lq}K^Q_Xz1?zY2V`V{nr;{Zsjh^;QxV9mIO8I8WyRK^NsOs^T^pi^b8
zLY^6?%3vKcl#3-zH`YjsPwYVYF?nTDC4&2qI38!;nnZ%H>_LAJoJvl)Vs`}B*p7so
z42ROFyw6ga@CHO5R4S&Mxt<g6q?44ZIg=#7ed2^KeDG$8wnu3$X-axRE|m{FJA|s~
zHlU!*8xAdSZtc-9Bpu19#_5Pz*9W)aJdjF_xL)W~{W_jnx$e0W)RHk<C1#O-rPYc3
TLir-63w&)Zr=4fp{Dl1jh<A*d

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-wifi.json b/locale/fr_CH/freedombone-wifi.json
new file mode 100644
index 000000000..73b09f04c
--- /dev/null
+++ b/locale/fr_CH/freedombone-wifi.json
@@ -0,0 +1,9 @@
+{
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
+    "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-wifi.mo b/locale/fr_CH/freedombone-wifi.mo
new file mode 100644
index 0000000000000000000000000000000000000000..173a71d050d8c2110e6dbd1aef2568a7132ac956
GIT binary patch
literal 782
zcmbu7&2AGh5XTJ)655{Nf{-}Op@&w&B?%OTt%6jgDFhJ`H4#WnE9C6XX5DV=l|7qK
zReiLokJMLSoK)$J3#0Y==lQVz{<y!peObG|yA^EDxxL|b76xn&?hU=((3cHuZRi=(
z))OH@|APB<^(&@_I;Ie3KmUU<J^fEQc8IB+Ppv`dSd-~l<rHaa#E-*%_eL&tra@|$
zXhY~SmEbu@f(c!ffjmsS*C|s8lTvwK=1zG$uWersPX^z*ov|2hys;RKdPlJsb8Rfn
zOfQ2gTftKM9LPfDk(rlMCWTxr5EKM?FtQmfl|xAEykv3Hf<vh)SrF{tY!418M`!&m
zuyiJ%Tp6CqVG0-=28n%W0K+B%LW-nx;bDq}UA_ey(pU(>Mdb-R7MKtWE@P39yQ%#O
zvPMXx&CJ90b&x5B&R%eq?4|N2I?rbogKo48{vnxIvxxe=e)lod*sDi;!o(Wn>I8r|
z^IcgeZ4MyGmGemLiZa=H%yY{444v$n#HPG>46UiAXjt$q74q1+xsSn=tD$c<4`7Y$
z9Rr`Cu^SBsW7%=Ix>0$g2xDm08y{u;gKW0OjrZ|BfBSo%>h)93l_$8+VI%)cZJtKo
Vm6=s)#<OMacjs%geuP3qe*wd}?JxiU

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-xmpp-pass.json b/locale/fr_CH/freedombone-xmpp-pass.json
new file mode 100644
index 000000000..a416ce8ea
--- /dev/null
+++ b/locale/fr_CH/freedombone-xmpp-pass.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-xmpp-pass -e [email address]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-xmpp-pass.mo b/locale/fr_CH/freedombone-xmpp-pass.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3fd525e04e02163cc4f7a337380884501cad7543
GIT binary patch
literal 380
zcmaJ+%SyvQ6dk3jap&5_EL<pfYZ7e@sSzYbtQZ?ga8VH%lS!SD&V-q1sfeFe`bqr-
zC#}$(mwPz(ak!85YI)dNua?N#zQvKnS(8}1-qMDfT4-^whtTA&KDRM?zD?pESWN30
zYN|B>Mqb&J@`})+P)zH$*70{b96ZKRhEgRbEH}_E;Dss8r3eUjeZdw6aw+CG=_m27
z<+dFhNnw~UkbTuGAjT@s>xy#GBl#y)nwfBBO7M3&MTIVzf>`9T;9?vQ|AQNxRx?E_
zxR+|G10w28sza|wwqbZ8$PIB%aXQE#Qj8jV9o$i4w|b7-1?LhxKXWgFj`gdy)9H?^
d7KUujn@9eY`Xl^A#dt=?c3P?4qX&!-{so%zY3Bd{

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone-zram.json b/locale/fr_CH/freedombone-zram.json
new file mode 100644
index 000000000..de1f963de
--- /dev/null
+++ b/locale/fr_CH/freedombone-zram.json
@@ -0,0 +1,3 @@
+{
+    "${PROJECT_NAME}-zram [on|off]": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-zram.mo b/locale/fr_CH/freedombone-zram.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8efa4844f29d45a3ac734aaed51ce89192f41f09
GIT binary patch
literal 365
zcmaJ+O-sW-5M8CG_2yY&4;~bp+SFD;Y6M9mR;&#rcxVw>(@l)DvthF>e*U!5pVYtL
zv=w@Dn8&=CdCbRhG2gE&7js6oOE@5$t`f4#O<2c6;yz(-hq2*bJtNK@uDjt6d>T0s
zLyg}$O`j@9Us1nz7X~qljDAyzh0X{bl__(Lp2!^+)w_j6<BWGZ-EiA-sx=;Hv<fZ6
zABFOSCFNN$mN~XW@+wWKtUt9WxLci(Sf<KAh>0HMn0dl|$t{n@QzOT4qs^rB1QzSG
z^y@9Lq5d(7E8(2*s24+El(cjmw56r3^_p`5wFcDP*g5x_<ZiX$HU^}HzMAE$NB)&I
T2mD@QHkBDoOU-j|%NgUp*AHZ>

literal 0
HcmV?d00001

diff --git a/locale/fr_CH/freedombone.json b/locale/fr_CH/freedombone.json
new file mode 100644
index 000000000..91cd0528b
--- /dev/null
+++ b/locale/fr_CH/freedombone.json
@@ -0,0 +1,146 @@
+{
+    "Search engine login": "",
+    "${PROJECT_NAME} -c [configuration file]": "",
+    "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD',": "",
+    "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA', '$VARIANT_WRITER', '$VARIANT_DEVELOPER'": "",
+    "or '$VARIANT_MESH'.": "",
+    "If you wish to install everything except email then use the '$VARIANT_NONMAILBOX' variaint.": "",
+    "The command ${PROJECT_NAME}-remote was not found": "",
+    "  ${PROJECT_NAME}-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes": "",
+    "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
+    "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
+    "The command ${PROJECT_NAME}-config was not found": "",
+    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
+    "Encrypted backup to other servers": "",
+    "${PROJECT_NAME} Configuration": "",
+    "\\nDo you wish to configure some remote backup locations?": "",
+    "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
+    "'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant.": "",
+    "The configuration file $CONFIGURATION_FILE was not found": "",
+    "Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
+    "No Tor installation found. ${onion_service_name} onion site cannot be configured.": "",
+    "${onion_service_name} onion site hostname not found": "",
+    "Private certificate for $CHECK_HOSTNAME was not created": "",
+    "Public certificate for $CHECK_HOSTNAME was not created": "",
+    "Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
+    "Lets Encrypt failed for $SITE_DOMAIN_NAME, so try making a self-signed cert": "",
+    "Lets Encrypt failed for $SITE_DOMAIN_NAME": "",
+    "Mesh Networking (cjdns)": "",
+    "cjdns IPv6 address: $CJDNS_IPV6": "",
+    "cjdns public key: $CJDNS_PUBLIC_KEY": "",
+    "cjdns private key: $CJDNS_PRIVATE_KEY": "",
+    "cjdns password: $CJDNS_PASSWORD": "",
+    "cjdns port: $CJDNS_PORT": "",
+    "Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}": "",
+    "Address:    $ZERONET_BLOG_ADDRESS": "",
+    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
+    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
+    "Address:    $ZERONET_MAIL_ADDRESS": "",
+    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
+    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
+    "ZeroNet Mail address": "",
+    "ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
+    "${MY_USERNAME}'s Forum": "",
+    "Address:    $ZERONET_FORUM_ADDRESS": "",
+    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
+    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
+    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "ZeroNet Forum address": "",
+    "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
+    "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
+    "OneRNG package could not be downloaded": "",
+    "OneRNG package: $ONERNG_PACKAGE": "",
+    "Hash does not match. This could indicate that the package has been tampered with.": "",
+    "OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
+    "OneRNG actual hash: $hash": "",
+    "OneRNG Device": "",
+    "Please plug in the OneRNG device": "",
+    "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
+    "Added onion site for ${onion_service_name}": "",
+    "# Tripwire reports which have no violations don't need to be logged": "",
+    "ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE": "",
+    "Unknown subkey usage: $GPG_KEY_USAGE": "",
+    "Public key:  $MY_GPG_PUBLIC_KEY": "",
+    "Private key: $MY_GPG_PRIVATE_KEY": "",
+    "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
+    "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
+    "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
+    "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
+    "Change your GPG password": "",
+    "It's very important to add a password to your GPG key so that": "",
+    "if anyone does get access to your email they still won't be able": "",
+    "Publish your GPG public key": "",
+    "If you have imported legacy email which is not encrypted": "",
+    "ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE": "",
+    "Creating the $PUBLIC_MAILING_LIST mailing list": "",
+    "$PUBLIC_MAILING_LIST mailing list": "",
+    "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
+    "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
+    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "Email import directory $IMPORT_MAILDIR not found": "",
+    "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
+    "Your MariaDB password is: $MARIADB_PASSWORD": "",
+    "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
+    "Unable to clone repo $GOPATH/src/github.com/gogits/gogs": "",
+    "Gogs admin user password": "",
+    "Database password: $MARIADB_PASSWORD": "",
+    "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
+    "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "Note that there's a usability/security trade-off made here.": "",
+    "In order to allow git clone via http we don't redirect everything": "",
+    "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
+    "Your Tox node public key is": "",
+    "tox onion domain: ${TOX_ONION_HOSTNAME}": "",
+    "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
+    "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
+    "XMPP onion domain: ${XMPP_ONION_HOSTNAME}": "",
+    "Your XMPP password is: $XMPP_PASSWORD": "",
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
+    "IRC onion domain": "",
+    "IRC Server": "",
+    "Wiki password": "",
+    "Wiki onion domain: ${WIKI_ONION_HOSTNAME}": "",
+    "Wiki username: $MY_USERNAME": "",
+    "Wiki password: $WIKI_ADMIN_PASSWORD": "",
+    "Your blog username: $MY_USERNAME": "",
+    "Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
+    "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
+    "Blog onion domain: ${FULLBLOG_ONION_HOSTNAME}": "",
+    "Log into your blog at https://${FULLBLOG_ONION_HOSTNAME}/login": "",
+    "RSS Reader": "",
+    "RSS reader domain: ${RSS_READER_DOMAIN_NAME}": "",
+    "RSS reader onion domain: ${RSS_READER_ONION_HOSTNAME}": "",
+    "RSS reader admin username: admin": "",
+    "RSS reader admin password: ${RSS_READER_ADMIN_PASSWORD}": "",
+    "GNU Social": "",
+    "Microblog administrator": "",
+    "Microblog administrator nickname: $MY_USERNAME": "",
+    "Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
+    "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
+    "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
+    "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
+    "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
+    "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
+    "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
+    "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
+    "VoIP onion domain": "",
+    "VoIP Server": "",
+    "VoIP onion domain:$VOIP_ONION_HOSTNAME": "",
+    "VoIP server password: $VOIP_SERVER_PASSWORD": "",
+    "SIP onion domain": "",
+    "SIP Server": "",
+    "SIP onion_domain: $SIP_ONION_HOSTNAME": "",
+    "SIP server username: $MY_USERNAME": "",
+    "SIP server extension: 201": "",
+    "SIP server password: $SIP_SERVER_PASSWORD": "",
+    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "See /home/$MY_USERNAME/README for post-installation instructions.": ""
+}
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone.mo b/locale/fr_CH/freedombone.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d04e48f8e18066e3e22b432b513d94e458b91118
GIT binary patch
literal 10918
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

literal 0
HcmV?d00001

diff --git a/locale/fr_ca/freedombone-config.json b/locale/fr_ca/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/fr_ca/freedombone-config.json
+++ b/locale/fr_ca/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/fr_ca/freedombone-controlpanel.json b/locale/fr_ca/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/fr_ca/freedombone-controlpanel.json
+++ b/locale/fr_ca/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone-dhparam.json b/locale/fr_ca/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/fr_ca/freedombone-dhparam.json
+++ b/locale/fr_ca/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone-image.json b/locale/fr_ca/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/fr_ca/freedombone-image.json
+++ b/locale/fr_ca/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone-wifi.json b/locale/fr_ca/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/fr_ca/freedombone-wifi.json
+++ b/locale/fr_ca/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone.json b/locale/fr_ca/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/fr_ca/freedombone.json
+++ b/locale/fr_ca/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ga/freedombone-config.json b/locale/ga/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ga/freedombone-config.json
+++ b/locale/ga/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ga/freedombone-controlpanel.json b/locale/ga/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ga/freedombone-controlpanel.json
+++ b/locale/ga/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone-dhparam.json b/locale/ga/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ga/freedombone-dhparam.json
+++ b/locale/ga/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone-image.json b/locale/ga/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ga/freedombone-image.json
+++ b/locale/ga/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone-wifi.json b/locale/ga/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ga/freedombone-wifi.json
+++ b/locale/ga/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone.json b/locale/ga/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ga/freedombone.json
+++ b/locale/ga/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/gl/freedombone-config.json b/locale/gl/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/gl/freedombone-config.json
+++ b/locale/gl/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/gl/freedombone-controlpanel.json b/locale/gl/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/gl/freedombone-controlpanel.json
+++ b/locale/gl/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone-dhparam.json b/locale/gl/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/gl/freedombone-dhparam.json
+++ b/locale/gl/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone-image.json b/locale/gl/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/gl/freedombone-image.json
+++ b/locale/gl/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone-wifi.json b/locale/gl/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/gl/freedombone-wifi.json
+++ b/locale/gl/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone.json b/locale/gl/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/gl/freedombone.json
+++ b/locale/gl/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/gu/freedombone-config.json b/locale/gu/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/gu/freedombone-config.json
+++ b/locale/gu/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/gu/freedombone-controlpanel.json b/locale/gu/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/gu/freedombone-controlpanel.json
+++ b/locale/gu/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone-dhparam.json b/locale/gu/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/gu/freedombone-dhparam.json
+++ b/locale/gu/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone-image.json b/locale/gu/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/gu/freedombone-image.json
+++ b/locale/gu/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone-wifi.json b/locale/gu/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/gu/freedombone-wifi.json
+++ b/locale/gu/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone.json b/locale/gu/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/gu/freedombone.json
+++ b/locale/gu/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/he/freedombone-config.json b/locale/he/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/he/freedombone-config.json
+++ b/locale/he/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/he/freedombone-controlpanel.json b/locale/he/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/he/freedombone-controlpanel.json
+++ b/locale/he/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone-dhparam.json b/locale/he/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/he/freedombone-dhparam.json
+++ b/locale/he/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone-image.json b/locale/he/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/he/freedombone-image.json
+++ b/locale/he/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone-wifi.json b/locale/he/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/he/freedombone-wifi.json
+++ b/locale/he/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone.json b/locale/he/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/he/freedombone.json
+++ b/locale/he/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/hi/freedombone-config.json b/locale/hi/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/hi/freedombone-config.json
+++ b/locale/hi/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/hi/freedombone-controlpanel.json b/locale/hi/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/hi/freedombone-controlpanel.json
+++ b/locale/hi/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone-dhparam.json b/locale/hi/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/hi/freedombone-dhparam.json
+++ b/locale/hi/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone-image.json b/locale/hi/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/hi/freedombone-image.json
+++ b/locale/hi/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone-wifi.json b/locale/hi/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/hi/freedombone-wifi.json
+++ b/locale/hi/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone.json b/locale/hi/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/hi/freedombone.json
+++ b/locale/hi/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/hr/freedombone-config.json b/locale/hr/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/hr/freedombone-config.json
+++ b/locale/hr/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/hr/freedombone-controlpanel.json b/locale/hr/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/hr/freedombone-controlpanel.json
+++ b/locale/hr/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone-dhparam.json b/locale/hr/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/hr/freedombone-dhparam.json
+++ b/locale/hr/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone-image.json b/locale/hr/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/hr/freedombone-image.json
+++ b/locale/hr/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone-wifi.json b/locale/hr/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/hr/freedombone-wifi.json
+++ b/locale/hr/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone.json b/locale/hr/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/hr/freedombone.json
+++ b/locale/hr/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/hu/freedombone-config.json b/locale/hu/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/hu/freedombone-config.json
+++ b/locale/hu/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/hu/freedombone-controlpanel.json b/locale/hu/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/hu/freedombone-controlpanel.json
+++ b/locale/hu/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone-dhparam.json b/locale/hu/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/hu/freedombone-dhparam.json
+++ b/locale/hu/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone-image.json b/locale/hu/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/hu/freedombone-image.json
+++ b/locale/hu/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone-wifi.json b/locale/hu/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/hu/freedombone-wifi.json
+++ b/locale/hu/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone.json b/locale/hu/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/hu/freedombone.json
+++ b/locale/hu/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/id/freedombone-config.json b/locale/id/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/id/freedombone-config.json
+++ b/locale/id/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/id/freedombone-controlpanel.json b/locale/id/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/id/freedombone-controlpanel.json
+++ b/locale/id/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone-dhparam.json b/locale/id/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/id/freedombone-dhparam.json
+++ b/locale/id/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone-image.json b/locale/id/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/id/freedombone-image.json
+++ b/locale/id/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone-wifi.json b/locale/id/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/id/freedombone-wifi.json
+++ b/locale/id/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone.json b/locale/id/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/id/freedombone.json
+++ b/locale/id/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/is/freedombone-config.json b/locale/is/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/is/freedombone-config.json
+++ b/locale/is/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/is/freedombone-controlpanel.json b/locale/is/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/is/freedombone-controlpanel.json
+++ b/locale/is/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone-dhparam.json b/locale/is/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/is/freedombone-dhparam.json
+++ b/locale/is/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone-image.json b/locale/is/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/is/freedombone-image.json
+++ b/locale/is/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone-wifi.json b/locale/is/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/is/freedombone-wifi.json
+++ b/locale/is/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone.json b/locale/is/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/is/freedombone.json
+++ b/locale/is/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/it/freedombone-config.json b/locale/it/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/it/freedombone-config.json
+++ b/locale/it/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/it/freedombone-controlpanel.json b/locale/it/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/it/freedombone-controlpanel.json
+++ b/locale/it/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone-dhparam.json b/locale/it/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/it/freedombone-dhparam.json
+++ b/locale/it/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone-image.json b/locale/it/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/it/freedombone-image.json
+++ b/locale/it/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone-wifi.json b/locale/it/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/it/freedombone-wifi.json
+++ b/locale/it/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone.json b/locale/it/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/it/freedombone.json
+++ b/locale/it/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ja/freedombone-config.json b/locale/ja/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ja/freedombone-config.json
+++ b/locale/ja/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ja/freedombone-controlpanel.json b/locale/ja/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ja/freedombone-controlpanel.json
+++ b/locale/ja/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone-dhparam.json b/locale/ja/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ja/freedombone-dhparam.json
+++ b/locale/ja/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone-image.json b/locale/ja/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ja/freedombone-image.json
+++ b/locale/ja/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone-wifi.json b/locale/ja/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ja/freedombone-wifi.json
+++ b/locale/ja/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone.json b/locale/ja/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ja/freedombone.json
+++ b/locale/ja/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ka/freedombone-config.json b/locale/ka/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ka/freedombone-config.json
+++ b/locale/ka/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ka/freedombone-controlpanel.json b/locale/ka/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ka/freedombone-controlpanel.json
+++ b/locale/ka/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone-dhparam.json b/locale/ka/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ka/freedombone-dhparam.json
+++ b/locale/ka/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone-image.json b/locale/ka/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ka/freedombone-image.json
+++ b/locale/ka/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone-wifi.json b/locale/ka/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ka/freedombone-wifi.json
+++ b/locale/ka/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone.json b/locale/ka/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ka/freedombone.json
+++ b/locale/ka/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/km/freedombone-config.json b/locale/km/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/km/freedombone-config.json
+++ b/locale/km/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/km/freedombone-controlpanel.json b/locale/km/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/km/freedombone-controlpanel.json
+++ b/locale/km/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone-dhparam.json b/locale/km/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/km/freedombone-dhparam.json
+++ b/locale/km/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone-image.json b/locale/km/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/km/freedombone-image.json
+++ b/locale/km/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone-wifi.json b/locale/km/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/km/freedombone-wifi.json
+++ b/locale/km/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone.json b/locale/km/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/km/freedombone.json
+++ b/locale/km/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/kn/freedombone-config.json b/locale/kn/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/kn/freedombone-config.json
+++ b/locale/kn/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/kn/freedombone-controlpanel.json b/locale/kn/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/kn/freedombone-controlpanel.json
+++ b/locale/kn/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone-dhparam.json b/locale/kn/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/kn/freedombone-dhparam.json
+++ b/locale/kn/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone-image.json b/locale/kn/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/kn/freedombone-image.json
+++ b/locale/kn/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone-wifi.json b/locale/kn/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/kn/freedombone-wifi.json
+++ b/locale/kn/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone.json b/locale/kn/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/kn/freedombone.json
+++ b/locale/kn/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ko/freedombone-config.json b/locale/ko/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ko/freedombone-config.json
+++ b/locale/ko/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ko/freedombone-controlpanel.json b/locale/ko/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ko/freedombone-controlpanel.json
+++ b/locale/ko/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone-dhparam.json b/locale/ko/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ko/freedombone-dhparam.json
+++ b/locale/ko/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone-image.json b/locale/ko/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ko/freedombone-image.json
+++ b/locale/ko/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone-wifi.json b/locale/ko/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ko/freedombone-wifi.json
+++ b/locale/ko/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone.json b/locale/ko/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ko/freedombone.json
+++ b/locale/ko/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/lo/freedombone-config.json b/locale/lo/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/lo/freedombone-config.json
+++ b/locale/lo/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/lo/freedombone-controlpanel.json b/locale/lo/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/lo/freedombone-controlpanel.json
+++ b/locale/lo/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone-dhparam.json b/locale/lo/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/lo/freedombone-dhparam.json
+++ b/locale/lo/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone-image.json b/locale/lo/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/lo/freedombone-image.json
+++ b/locale/lo/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone-wifi.json b/locale/lo/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/lo/freedombone-wifi.json
+++ b/locale/lo/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone.json b/locale/lo/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/lo/freedombone.json
+++ b/locale/lo/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/lt/freedombone-config.json b/locale/lt/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/lt/freedombone-config.json
+++ b/locale/lt/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/lt/freedombone-controlpanel.json b/locale/lt/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/lt/freedombone-controlpanel.json
+++ b/locale/lt/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone-dhparam.json b/locale/lt/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/lt/freedombone-dhparam.json
+++ b/locale/lt/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone-image.json b/locale/lt/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/lt/freedombone-image.json
+++ b/locale/lt/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone-wifi.json b/locale/lt/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/lt/freedombone-wifi.json
+++ b/locale/lt/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone.json b/locale/lt/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/lt/freedombone.json
+++ b/locale/lt/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/lv/freedombone-config.json b/locale/lv/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/lv/freedombone-config.json
+++ b/locale/lv/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/lv/freedombone-controlpanel.json b/locale/lv/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/lv/freedombone-controlpanel.json
+++ b/locale/lv/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone-dhparam.json b/locale/lv/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/lv/freedombone-dhparam.json
+++ b/locale/lv/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone-image.json b/locale/lv/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/lv/freedombone-image.json
+++ b/locale/lv/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone-wifi.json b/locale/lv/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/lv/freedombone-wifi.json
+++ b/locale/lv/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone.json b/locale/lv/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/lv/freedombone.json
+++ b/locale/lv/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/mi_tn/freedombone-config.json b/locale/mi_tn/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/mi_tn/freedombone-config.json
+++ b/locale/mi_tn/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/mi_tn/freedombone-controlpanel.json b/locale/mi_tn/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/mi_tn/freedombone-controlpanel.json
+++ b/locale/mi_tn/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone-dhparam.json b/locale/mi_tn/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/mi_tn/freedombone-dhparam.json
+++ b/locale/mi_tn/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone-image.json b/locale/mi_tn/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/mi_tn/freedombone-image.json
+++ b/locale/mi_tn/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone-wifi.json b/locale/mi_tn/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/mi_tn/freedombone-wifi.json
+++ b/locale/mi_tn/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone.json b/locale/mi_tn/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/mi_tn/freedombone.json
+++ b/locale/mi_tn/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/mi_wwow/freedombone-config.json b/locale/mi_wwow/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/mi_wwow/freedombone-config.json
+++ b/locale/mi_wwow/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/mi_wwow/freedombone-controlpanel.json b/locale/mi_wwow/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/mi_wwow/freedombone-controlpanel.json
+++ b/locale/mi_wwow/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone-dhparam.json b/locale/mi_wwow/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/mi_wwow/freedombone-dhparam.json
+++ b/locale/mi_wwow/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone-image.json b/locale/mi_wwow/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/mi_wwow/freedombone-image.json
+++ b/locale/mi_wwow/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone-wifi.json b/locale/mi_wwow/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/mi_wwow/freedombone-wifi.json
+++ b/locale/mi_wwow/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone.json b/locale/mi_wwow/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/mi_wwow/freedombone.json
+++ b/locale/mi_wwow/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ml/freedombone-config.json b/locale/ml/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ml/freedombone-config.json
+++ b/locale/ml/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ml/freedombone-controlpanel.json b/locale/ml/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ml/freedombone-controlpanel.json
+++ b/locale/ml/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone-dhparam.json b/locale/ml/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ml/freedombone-dhparam.json
+++ b/locale/ml/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone-image.json b/locale/ml/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ml/freedombone-image.json
+++ b/locale/ml/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone-wifi.json b/locale/ml/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ml/freedombone-wifi.json
+++ b/locale/ml/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone.json b/locale/ml/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ml/freedombone.json
+++ b/locale/ml/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/mn/freedombone-config.json b/locale/mn/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/mn/freedombone-config.json
+++ b/locale/mn/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/mn/freedombone-controlpanel.json b/locale/mn/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/mn/freedombone-controlpanel.json
+++ b/locale/mn/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone-dhparam.json b/locale/mn/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/mn/freedombone-dhparam.json
+++ b/locale/mn/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone-image.json b/locale/mn/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/mn/freedombone-image.json
+++ b/locale/mn/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone-wifi.json b/locale/mn/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/mn/freedombone-wifi.json
+++ b/locale/mn/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone.json b/locale/mn/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/mn/freedombone.json
+++ b/locale/mn/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ms/freedombone-config.json b/locale/ms/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ms/freedombone-config.json
+++ b/locale/ms/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ms/freedombone-controlpanel.json b/locale/ms/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ms/freedombone-controlpanel.json
+++ b/locale/ms/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone-dhparam.json b/locale/ms/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ms/freedombone-dhparam.json
+++ b/locale/ms/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone-image.json b/locale/ms/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ms/freedombone-image.json
+++ b/locale/ms/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone-wifi.json b/locale/ms/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ms/freedombone-wifi.json
+++ b/locale/ms/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone.json b/locale/ms/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ms/freedombone.json
+++ b/locale/ms/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/nl/freedombone-config.json b/locale/nl/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/nl/freedombone-config.json
+++ b/locale/nl/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/nl/freedombone-controlpanel.json b/locale/nl/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/nl/freedombone-controlpanel.json
+++ b/locale/nl/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone-dhparam.json b/locale/nl/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/nl/freedombone-dhparam.json
+++ b/locale/nl/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone-image.json b/locale/nl/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/nl/freedombone-image.json
+++ b/locale/nl/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone-wifi.json b/locale/nl/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/nl/freedombone-wifi.json
+++ b/locale/nl/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone.json b/locale/nl/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/nl/freedombone.json
+++ b/locale/nl/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/nn/freedombone-config.json b/locale/nn/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/nn/freedombone-config.json
+++ b/locale/nn/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/nn/freedombone-controlpanel.json b/locale/nn/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/nn/freedombone-controlpanel.json
+++ b/locale/nn/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone-dhparam.json b/locale/nn/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/nn/freedombone-dhparam.json
+++ b/locale/nn/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone-image.json b/locale/nn/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/nn/freedombone-image.json
+++ b/locale/nn/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone-wifi.json b/locale/nn/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/nn/freedombone-wifi.json
+++ b/locale/nn/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone.json b/locale/nn/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/nn/freedombone.json
+++ b/locale/nn/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/no/freedombone-config.json b/locale/no/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/no/freedombone-config.json
+++ b/locale/no/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/no/freedombone-controlpanel.json b/locale/no/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/no/freedombone-controlpanel.json
+++ b/locale/no/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone-dhparam.json b/locale/no/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/no/freedombone-dhparam.json
+++ b/locale/no/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone-image.json b/locale/no/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/no/freedombone-image.json
+++ b/locale/no/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone-wifi.json b/locale/no/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/no/freedombone-wifi.json
+++ b/locale/no/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone.json b/locale/no/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/no/freedombone.json
+++ b/locale/no/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/no_gr/freedombone-config.json b/locale/no_gr/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/no_gr/freedombone-config.json
+++ b/locale/no_gr/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/no_gr/freedombone-controlpanel.json b/locale/no_gr/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/no_gr/freedombone-controlpanel.json
+++ b/locale/no_gr/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone-dhparam.json b/locale/no_gr/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/no_gr/freedombone-dhparam.json
+++ b/locale/no_gr/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone-image.json b/locale/no_gr/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/no_gr/freedombone-image.json
+++ b/locale/no_gr/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone-wifi.json b/locale/no_gr/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/no_gr/freedombone-wifi.json
+++ b/locale/no_gr/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone.json b/locale/no_gr/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/no_gr/freedombone.json
+++ b/locale/no_gr/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/pl/freedombone-config.json b/locale/pl/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/pl/freedombone-config.json
+++ b/locale/pl/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/pl/freedombone-controlpanel.json b/locale/pl/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/pl/freedombone-controlpanel.json
+++ b/locale/pl/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone-dhparam.json b/locale/pl/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/pl/freedombone-dhparam.json
+++ b/locale/pl/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone-image.json b/locale/pl/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/pl/freedombone-image.json
+++ b/locale/pl/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone-wifi.json b/locale/pl/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/pl/freedombone-wifi.json
+++ b/locale/pl/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone.json b/locale/pl/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/pl/freedombone.json
+++ b/locale/pl/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/pt/freedombone-config.json b/locale/pt/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/pt/freedombone-config.json
+++ b/locale/pt/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/pt/freedombone-controlpanel.json b/locale/pt/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/pt/freedombone-controlpanel.json
+++ b/locale/pt/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone-dhparam.json b/locale/pt/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/pt/freedombone-dhparam.json
+++ b/locale/pt/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone-image.json b/locale/pt/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/pt/freedombone-image.json
+++ b/locale/pt/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone-wifi.json b/locale/pt/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/pt/freedombone-wifi.json
+++ b/locale/pt/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone.json b/locale/pt/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/pt/freedombone.json
+++ b/locale/pt/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/pt_br/freedombone-config.json b/locale/pt_br/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/pt_br/freedombone-config.json
+++ b/locale/pt_br/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/pt_br/freedombone-controlpanel.json b/locale/pt_br/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/pt_br/freedombone-controlpanel.json
+++ b/locale/pt_br/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone-dhparam.json b/locale/pt_br/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/pt_br/freedombone-dhparam.json
+++ b/locale/pt_br/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone-image.json b/locale/pt_br/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/pt_br/freedombone-image.json
+++ b/locale/pt_br/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone-wifi.json b/locale/pt_br/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/pt_br/freedombone-wifi.json
+++ b/locale/pt_br/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone.json b/locale/pt_br/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/pt_br/freedombone.json
+++ b/locale/pt_br/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ro/freedombone-config.json b/locale/ro/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ro/freedombone-config.json
+++ b/locale/ro/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ro/freedombone-controlpanel.json b/locale/ro/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ro/freedombone-controlpanel.json
+++ b/locale/ro/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone-dhparam.json b/locale/ro/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ro/freedombone-dhparam.json
+++ b/locale/ro/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone-image.json b/locale/ro/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ro/freedombone-image.json
+++ b/locale/ro/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone-wifi.json b/locale/ro/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ro/freedombone-wifi.json
+++ b/locale/ro/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone.json b/locale/ro/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ro/freedombone.json
+++ b/locale/ro/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ru/freedombone-config.json b/locale/ru/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ru/freedombone-config.json
+++ b/locale/ru/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ru/freedombone-controlpanel.json b/locale/ru/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ru/freedombone-controlpanel.json
+++ b/locale/ru/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone-dhparam.json b/locale/ru/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ru/freedombone-dhparam.json
+++ b/locale/ru/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone-image.json b/locale/ru/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ru/freedombone-image.json
+++ b/locale/ru/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone-wifi.json b/locale/ru/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ru/freedombone-wifi.json
+++ b/locale/ru/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone.json b/locale/ru/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ru/freedombone.json
+++ b/locale/ru/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sk/freedombone-config.json b/locale/sk/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sk/freedombone-config.json
+++ b/locale/sk/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sk/freedombone-controlpanel.json b/locale/sk/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sk/freedombone-controlpanel.json
+++ b/locale/sk/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone-dhparam.json b/locale/sk/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sk/freedombone-dhparam.json
+++ b/locale/sk/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone-image.json b/locale/sk/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sk/freedombone-image.json
+++ b/locale/sk/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone-wifi.json b/locale/sk/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sk/freedombone-wifi.json
+++ b/locale/sk/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone.json b/locale/sk/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sk/freedombone.json
+++ b/locale/sk/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sl/freedombone-config.json b/locale/sl/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sl/freedombone-config.json
+++ b/locale/sl/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sl/freedombone-controlpanel.json b/locale/sl/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sl/freedombone-controlpanel.json
+++ b/locale/sl/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone-dhparam.json b/locale/sl/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sl/freedombone-dhparam.json
+++ b/locale/sl/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone-image.json b/locale/sl/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sl/freedombone-image.json
+++ b/locale/sl/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone-wifi.json b/locale/sl/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sl/freedombone-wifi.json
+++ b/locale/sl/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone.json b/locale/sl/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sl/freedombone.json
+++ b/locale/sl/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sm/freedombone-config.json b/locale/sm/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sm/freedombone-config.json
+++ b/locale/sm/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sm/freedombone-controlpanel.json b/locale/sm/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sm/freedombone-controlpanel.json
+++ b/locale/sm/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone-dhparam.json b/locale/sm/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sm/freedombone-dhparam.json
+++ b/locale/sm/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone-image.json b/locale/sm/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sm/freedombone-image.json
+++ b/locale/sm/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone-wifi.json b/locale/sm/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sm/freedombone-wifi.json
+++ b/locale/sm/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone.json b/locale/sm/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sm/freedombone.json
+++ b/locale/sm/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/so/freedombone-config.json b/locale/so/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/so/freedombone-config.json
+++ b/locale/so/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/so/freedombone-controlpanel.json b/locale/so/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/so/freedombone-controlpanel.json
+++ b/locale/so/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone-dhparam.json b/locale/so/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/so/freedombone-dhparam.json
+++ b/locale/so/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone-image.json b/locale/so/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/so/freedombone-image.json
+++ b/locale/so/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone-wifi.json b/locale/so/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/so/freedombone-wifi.json
+++ b/locale/so/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone.json b/locale/so/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/so/freedombone.json
+++ b/locale/so/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sq/freedombone-config.json b/locale/sq/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sq/freedombone-config.json
+++ b/locale/sq/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sq/freedombone-controlpanel.json b/locale/sq/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sq/freedombone-controlpanel.json
+++ b/locale/sq/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone-dhparam.json b/locale/sq/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sq/freedombone-dhparam.json
+++ b/locale/sq/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone-image.json b/locale/sq/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sq/freedombone-image.json
+++ b/locale/sq/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone-wifi.json b/locale/sq/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sq/freedombone-wifi.json
+++ b/locale/sq/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone.json b/locale/sq/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sq/freedombone.json
+++ b/locale/sq/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sr/freedombone-config.json b/locale/sr/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sr/freedombone-config.json
+++ b/locale/sr/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sr/freedombone-controlpanel.json b/locale/sr/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sr/freedombone-controlpanel.json
+++ b/locale/sr/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone-dhparam.json b/locale/sr/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sr/freedombone-dhparam.json
+++ b/locale/sr/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone-image.json b/locale/sr/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sr/freedombone-image.json
+++ b/locale/sr/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone-wifi.json b/locale/sr/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sr/freedombone-wifi.json
+++ b/locale/sr/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone.json b/locale/sr/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sr/freedombone.json
+++ b/locale/sr/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/sv/freedombone-config.json b/locale/sv/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/sv/freedombone-config.json
+++ b/locale/sv/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/sv/freedombone-controlpanel.json b/locale/sv/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/sv/freedombone-controlpanel.json
+++ b/locale/sv/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone-dhparam.json b/locale/sv/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/sv/freedombone-dhparam.json
+++ b/locale/sv/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone-image.json b/locale/sv/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/sv/freedombone-image.json
+++ b/locale/sv/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone-wifi.json b/locale/sv/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/sv/freedombone-wifi.json
+++ b/locale/sv/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone.json b/locale/sv/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/sv/freedombone.json
+++ b/locale/sv/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/ta/freedombone-config.json b/locale/ta/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/ta/freedombone-config.json
+++ b/locale/ta/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/ta/freedombone-controlpanel.json b/locale/ta/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/ta/freedombone-controlpanel.json
+++ b/locale/ta/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone-dhparam.json b/locale/ta/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/ta/freedombone-dhparam.json
+++ b/locale/ta/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone-image.json b/locale/ta/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/ta/freedombone-image.json
+++ b/locale/ta/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone-wifi.json b/locale/ta/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/ta/freedombone-wifi.json
+++ b/locale/ta/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone.json b/locale/ta/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/ta/freedombone.json
+++ b/locale/ta/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/th/freedombone-config.json b/locale/th/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/th/freedombone-config.json
+++ b/locale/th/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/th/freedombone-controlpanel.json b/locale/th/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/th/freedombone-controlpanel.json
+++ b/locale/th/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone-dhparam.json b/locale/th/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/th/freedombone-dhparam.json
+++ b/locale/th/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone-image.json b/locale/th/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/th/freedombone-image.json
+++ b/locale/th/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone-wifi.json b/locale/th/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/th/freedombone-wifi.json
+++ b/locale/th/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone.json b/locale/th/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/th/freedombone.json
+++ b/locale/th/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/tl/freedombone-config.json b/locale/tl/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/tl/freedombone-config.json
+++ b/locale/tl/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/tl/freedombone-controlpanel.json b/locale/tl/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/tl/freedombone-controlpanel.json
+++ b/locale/tl/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone-dhparam.json b/locale/tl/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/tl/freedombone-dhparam.json
+++ b/locale/tl/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone-image.json b/locale/tl/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/tl/freedombone-image.json
+++ b/locale/tl/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone-wifi.json b/locale/tl/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/tl/freedombone-wifi.json
+++ b/locale/tl/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone.json b/locale/tl/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/tl/freedombone.json
+++ b/locale/tl/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/to/freedombone-config.json b/locale/to/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/to/freedombone-config.json
+++ b/locale/to/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/to/freedombone-controlpanel.json b/locale/to/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/to/freedombone-controlpanel.json
+++ b/locale/to/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone-dhparam.json b/locale/to/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/to/freedombone-dhparam.json
+++ b/locale/to/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone-image.json b/locale/to/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/to/freedombone-image.json
+++ b/locale/to/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone-wifi.json b/locale/to/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/to/freedombone-wifi.json
+++ b/locale/to/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone.json b/locale/to/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/to/freedombone.json
+++ b/locale/to/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/tr/freedombone-config.json b/locale/tr/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/tr/freedombone-config.json
+++ b/locale/tr/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/tr/freedombone-controlpanel.json b/locale/tr/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/tr/freedombone-controlpanel.json
+++ b/locale/tr/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone-dhparam.json b/locale/tr/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/tr/freedombone-dhparam.json
+++ b/locale/tr/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone-image.json b/locale/tr/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/tr/freedombone-image.json
+++ b/locale/tr/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone-wifi.json b/locale/tr/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/tr/freedombone-wifi.json
+++ b/locale/tr/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone.json b/locale/tr/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/tr/freedombone.json
+++ b/locale/tr/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/uk/freedombone-config.json b/locale/uk/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/uk/freedombone-config.json
+++ b/locale/uk/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/uk/freedombone-controlpanel.json b/locale/uk/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/uk/freedombone-controlpanel.json
+++ b/locale/uk/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone-dhparam.json b/locale/uk/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/uk/freedombone-dhparam.json
+++ b/locale/uk/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone-image.json b/locale/uk/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/uk/freedombone-image.json
+++ b/locale/uk/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone-wifi.json b/locale/uk/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/uk/freedombone-wifi.json
+++ b/locale/uk/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone.json b/locale/uk/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/uk/freedombone.json
+++ b/locale/uk/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/vi/freedombone-config.json b/locale/vi/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/vi/freedombone-config.json
+++ b/locale/vi/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/vi/freedombone-controlpanel.json b/locale/vi/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/vi/freedombone-controlpanel.json
+++ b/locale/vi/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone-dhparam.json b/locale/vi/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/vi/freedombone-dhparam.json
+++ b/locale/vi/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone-image.json b/locale/vi/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/vi/freedombone-image.json
+++ b/locale/vi/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone-wifi.json b/locale/vi/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/vi/freedombone-wifi.json
+++ b/locale/vi/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone.json b/locale/vi/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/vi/freedombone.json
+++ b/locale/vi/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/zh_cn/freedombone-config.json b/locale/zh_cn/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/zh_cn/freedombone-config.json
+++ b/locale/zh_cn/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/zh_cn/freedombone-controlpanel.json b/locale/zh_cn/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/zh_cn/freedombone-controlpanel.json
+++ b/locale/zh_cn/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone-dhparam.json b/locale/zh_cn/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/zh_cn/freedombone-dhparam.json
+++ b/locale/zh_cn/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone-image.json b/locale/zh_cn/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/zh_cn/freedombone-image.json
+++ b/locale/zh_cn/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone-wifi.json b/locale/zh_cn/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/zh_cn/freedombone-wifi.json
+++ b/locale/zh_cn/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone.json b/locale/zh_cn/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/zh_cn/freedombone.json
+++ b/locale/zh_cn/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
diff --git a/locale/zh_tw/freedombone-config.json b/locale/zh_tw/freedombone-config.json
index c88c4c90e..40d7dee91 100644
--- a/locale/zh_tw/freedombone-config.json
+++ b/locale/zh_tw/freedombone-config.json
@@ -115,6 +115,7 @@
     "Set your username for the system\\n\\nYour username should not contain any spaces": "",
     "Don't use the default user account": "",
     "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
     "Install Target": "",
     "\\nAre you installing onto a Beaglebone Black?": "",
     "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
@@ -189,19 +190,11 @@
     "ValiDOM": "",
     "Freie Unzensierte": "",
     "Google": "",
-    "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "Choose Dynamic DNS provider:": "",
     "Dynamic DNS provider username": "",
     "Dynamic DNS provider password": "",
     "Password quality check": "",
     "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Your full name (or nick)": "",
     "Static local IP address": "",
     "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
     "Local Network Configuration": "",
diff --git a/locale/zh_tw/freedombone-controlpanel.json b/locale/zh_tw/freedombone-controlpanel.json
index bd201df85..ab859ac6f 100644
--- a/locale/zh_tw/freedombone-controlpanel.json
+++ b/locale/zh_tw/freedombone-controlpanel.json
@@ -167,13 +167,15 @@
     "Set the IP address of your internet router/modem": "",
     "Set the local IP address for your internet router or ADSL modem.\\n\\nIt will typically be 192.168.1.1, 192.168.1.254, or similar": "",
     "Wifi Settings": "",
-    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
-    "Interface:": "",
+    "Wifi settings were changed": "",
+    "Hotspot Settings": "",
+    "Enabled (yes/no):": "",
     "SSID:": "",
-    "Type:": "",
+    "Type (wpa2-psk/none):": "",
     "Passphrase:": "",
-    "Hotspot:": "",
-    "Wifi settings were changed": "",
+    "No wifi hotspot passphrase was given": "",
+    "Wifi hotspot passphrase was too short": "",
+    "Hotspot settings were changed": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
@@ -200,6 +202,14 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
+    "Enable Wifi": "",
+    "\\nDo you wish to enable wifi?": "",
+    "Wifi Menu": "",
+    "${status_str}\\n\\nChoose an operation:": "",
+    "Enable or disable Wifi": "",
+    "Configure wifi networks": "",
+    "Manually edit wifi networks file": "",
+    "Hotspot settings": "",
     "IRC Menu": "",
     "No IRC server is installed": "",
     "Set a password for all IRC users": "",
@@ -214,5 +224,6 @@
     "Set the main repository (repo mirrors)": "",
     "Media menu": "",
     "IRC menu": "",
-    "Change your blog avatar": ""
+    "Change your blog avatar": "",
+    "Wifi menu": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone-dhparam.json b/locale/zh_tw/freedombone-dhparam.json
index 5b2e563ee..a671f3ea3 100644
--- a/locale/zh_tw/freedombone-dhparam.json
+++ b/locale/zh_tw/freedombone-dhparam.json
@@ -1,5 +1,7 @@
 {
     "${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]": "",
     "Recalculated DH params for $filename": "",
+    "yes": "",
+    "y": "",
     "$0: openssl is not installed, exiting": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone-image.json b/locale/zh_tw/freedombone-image.json
index 6978cb263..a4fd155c1 100644
--- a/locale/zh_tw/freedombone-image.json
+++ b/locale/zh_tw/freedombone-image.json
@@ -1,9 +1,10 @@
 {
     "Config file $CONFIG_FILENAME not found": "",
     "Your password chould contain at least ${MINIMUM_PASSWORD_LENGTH} characters": "",
+    "$1": "",
     "\nImage was created.\n\nYou will be able to log into it with:\n": "",
-    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\n    Password: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone-wifi.json b/locale/zh_tw/freedombone-wifi.json
index 0078dce4c..73b09f04c 100644
--- a/locale/zh_tw/freedombone-wifi.json
+++ b/locale/zh_tw/freedombone-wifi.json
@@ -1,3 +1,9 @@
 {
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nIf you wish to use wifi and have a Free Software compatible adapter (eg. Atheros) rather than wired ethernet then enter the details below, otherwise just select Ok:": "",
+    "SSID:": "",
+    "Type:": "",
+    "Passphrase:": "",
     "${PROJECT_NAME}-wifi -i [interface] -t [type] -s [ssid] -p [passphrase]": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone.json b/locale/zh_tw/freedombone.json
index cb403b624..91cd0528b 100644
--- a/locale/zh_tw/freedombone.json
+++ b/locale/zh_tw/freedombone.json
@@ -124,6 +124,9 @@
     "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": "",
     "Search engine onion domain: ${SEARCH_ENGINE_ONION_HOSTNAME}": "",
     "Your search engine password is: $SEARCH_ENGINE_PASSWORD": "",
+    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": "",
     "Open https://$HUBZILLA_DOMAIN_NAME and register a new user": "",
     "Open http://$HUBZILLA_ONION_HOSTNAME and register a new user": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
-- 
GitLab