Update translations

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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",

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:",
-    "SSID:": "SSID:",
-    "Type:": "Type:",
-    "Passphrase:": "Passphrase:",
-    "Hotspot:": "Hotspot:",
     "Wifi settings were changed": "Wifi settings were changed",
+    "Hotspot Settings": "Hotspot Settings",
+    "Enabled (yes/no):": "Enabled (yes/no):",
+    "SSID:": "SSID:",
+    "Type (wpa2-psk/none):": "Type (wpa2-psk/none):",
+    "Passphrase:": "Passphrase:",
+    "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"
 }

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"
 }

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",
+    "    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\n    Password: $PASSWORD\n": "    Username: $USERNAME\n    Password: $PASSWORD\n",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "    Username: $USERNAME\nPassword: $PASSWORD\n",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "\n    Username: $USERNAME\n    Password: $PASSWORD\n",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "\nUsername: $USERNAME\nPassword: $PASSWORD\n",
     "Username: $USERNAME\nPassword: $PASSWORD": "Username: $USERNAME\nPassword: $PASSWORD"
 }

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]"
 }

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",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

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]": ""
 }

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": "",

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": "",

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:": "",
-    "SSID:": "",
-    "Type:": "",
-    "Passphrase:": "",
-    "Hotspot:": "",
     "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": "",
@@ -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": ""
 }

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": ""
 }

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": "",
+    "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
-    "    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
-    "\n    Username: $USERNAME\n    Password: $PASSWORD\n": "",
+    "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }