Browse Source

Update translations

Bob Mottram 3 years ago
parent
commit
6244f5ce21
100 changed files with 814 additions and 1194 deletions
  1. 2 5
      locale/af/freedombone-adduser.json
  2. 0 2
      locale/af/freedombone-app-dlna.json
  3. 10 0
      locale/af/freedombone-app-dokuwiki.json
  4. 18 0
      locale/af/freedombone-app-etherpad.json
  5. 16 9
      locale/af/freedombone-app-gnusocial.json
  6. 1 11
      locale/af/freedombone-app-gogs.json
  7. 18 0
      locale/af/freedombone-app-htmly.json
  8. 0 7
      locale/af/freedombone-app-hubzilla.json
  9. 0 2
      locale/af/freedombone-app-ipfs.json
  10. 1 2
      locale/af/freedombone-app-irc.json
  11. 4 0
      locale/af/freedombone-app-jitsi.json
  12. 3 0
      locale/af/freedombone-app-pelican.json
  13. 34 0
      locale/af/freedombone-app-pihole.json
  14. 14 0
      locale/af/freedombone-app-postactiv.json
  15. 0 2
      locale/af/freedombone-app-syncthing.json
  16. 0 2
      locale/af/freedombone-app-tahoelafs.json
  17. 4 0
      locale/af/freedombone-app-vim.json
  18. 2 2
      locale/af/freedombone-app-webmail.json
  19. 0 2
      locale/af/freedombone-app-xmpp.json
  20. 2 16
      locale/af/freedombone-backup-local.json
  21. 1 28
      locale/af/freedombone-backup-remote.json
  22. 6 0
      locale/af/freedombone-base-chaoskey.json
  23. 0 1
      locale/af/freedombone-base-email.json
  24. 94 142
      locale/af/freedombone-config.json
  25. 10 30
      locale/af/freedombone-controlpanel-user.json
  26. 54 87
      locale/af/freedombone-controlpanel.json
  27. 4 9
      locale/af/freedombone-image-customise.json
  28. 2 18
      locale/af/freedombone-image-mesh.json
  29. 1 0
      locale/af/freedombone-image.json
  30. 1 0
      locale/af/freedombone-keydrive.json
  31. 1 5
      locale/af/freedombone-mesh-install.json
  32. 1 0
      locale/af/freedombone-mirrors.json
  33. 4 1
      locale/af/freedombone-pin-cert.json
  34. 0 6
      locale/af/freedombone-recoverkey.json
  35. 0 23
      locale/af/freedombone-restore-local.json
  36. 2 14
      locale/af/freedombone-restore-remote.json
  37. 5 4
      locale/af/freedombone-rmuser.json
  38. 14 2
      locale/af/freedombone-sec.json
  39. 9 1
      locale/af/freedombone-utils-backup.json
  40. 1 1
      locale/af/freedombone-utils-final.json
  41. 8 1
      locale/af/freedombone-utils-interactive.json
  42. 15 0
      locale/af/freedombone-utils-keys.json
  43. 9 0
      locale/af/freedombone-utils-selector.json
  44. 4 4
      locale/af/freedombone-utils-web.json
  45. 8 0
      locale/af/freedombone-utils-wifi.json
  46. 0 6
      locale/af/freedombone-wifi.json
  47. 1 144
      locale/af/freedombone.json
  48. 2 5
      locale/ar/freedombone-adduser.json
  49. 0 2
      locale/ar/freedombone-app-dlna.json
  50. 10 0
      locale/ar/freedombone-app-dokuwiki.json
  51. 18 0
      locale/ar/freedombone-app-etherpad.json
  52. 16 9
      locale/ar/freedombone-app-gnusocial.json
  53. 1 11
      locale/ar/freedombone-app-gogs.json
  54. 18 0
      locale/ar/freedombone-app-htmly.json
  55. 0 7
      locale/ar/freedombone-app-hubzilla.json
  56. 0 2
      locale/ar/freedombone-app-ipfs.json
  57. 1 2
      locale/ar/freedombone-app-irc.json
  58. 4 0
      locale/ar/freedombone-app-jitsi.json
  59. 3 0
      locale/ar/freedombone-app-pelican.json
  60. 34 0
      locale/ar/freedombone-app-pihole.json
  61. 14 0
      locale/ar/freedombone-app-postactiv.json
  62. 0 2
      locale/ar/freedombone-app-syncthing.json
  63. 0 2
      locale/ar/freedombone-app-tahoelafs.json
  64. 4 0
      locale/ar/freedombone-app-vim.json
  65. 2 2
      locale/ar/freedombone-app-webmail.json
  66. 0 2
      locale/ar/freedombone-app-xmpp.json
  67. 2 16
      locale/ar/freedombone-backup-local.json
  68. 1 28
      locale/ar/freedombone-backup-remote.json
  69. 6 0
      locale/ar/freedombone-base-chaoskey.json
  70. 0 1
      locale/ar/freedombone-base-email.json
  71. 94 142
      locale/ar/freedombone-config.json
  72. 10 30
      locale/ar/freedombone-controlpanel-user.json
  73. 54 87
      locale/ar/freedombone-controlpanel.json
  74. 4 9
      locale/ar/freedombone-image-customise.json
  75. 2 18
      locale/ar/freedombone-image-mesh.json
  76. 1 0
      locale/ar/freedombone-image.json
  77. 1 0
      locale/ar/freedombone-keydrive.json
  78. 1 5
      locale/ar/freedombone-mesh-install.json
  79. 1 0
      locale/ar/freedombone-mirrors.json
  80. 4 1
      locale/ar/freedombone-pin-cert.json
  81. 0 6
      locale/ar/freedombone-recoverkey.json
  82. 0 23
      locale/ar/freedombone-restore-local.json
  83. 2 14
      locale/ar/freedombone-restore-remote.json
  84. 5 4
      locale/ar/freedombone-rmuser.json
  85. 14 2
      locale/ar/freedombone-sec.json
  86. 9 1
      locale/ar/freedombone-utils-backup.json
  87. 1 1
      locale/ar/freedombone-utils-final.json
  88. 8 1
      locale/ar/freedombone-utils-interactive.json
  89. 15 0
      locale/ar/freedombone-utils-keys.json
  90. 9 0
      locale/ar/freedombone-utils-selector.json
  91. 4 4
      locale/ar/freedombone-utils-web.json
  92. 8 0
      locale/ar/freedombone-utils-wifi.json
  93. 0 6
      locale/ar/freedombone-wifi.json
  94. 1 144
      locale/ar/freedombone.json
  95. 2 5
      locale/be/freedombone-adduser.json
  96. 0 2
      locale/be/freedombone-app-dlna.json
  97. 10 0
      locale/be/freedombone-app-dokuwiki.json
  98. 18 0
      locale/be/freedombone-app-etherpad.json
  99. 16 9
      locale/be/freedombone-app-gnusocial.json
  100. 0 0
      locale/be/freedombone-app-gogs.json

+ 2 - 5
locale/af/freedombone-adduser.json

@@ -3,12 +3,9 @@
     "$COMPLETION_FILE not found": "",
     "It's very important to add a password to your GPG key so that": "",
     "if anyone does get access to your email they still won't be able": "",
-    "Adding an XMPP account for $MY_USERNAME": "",
-    "XMPP account not created": "",
-    "Adding XMPP client setup": "",
-    "Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs": "",
+    "Adding user to ${app_name}": "",
+    "Failed with error code ${retval}": "",
     "New user $MY_USERNAME was created": "",
-    "Their SIP phone extension is $SIP_EXTENSION": "",
     "Their login password is $NEW_USER_PASSWORD": "",
     "They can download their GPG keys with:": "",
     "They should also run ${PROJECT_NAME}-client on their system to ensure": ""

+ 0 - 2
locale/af/freedombone-app-dlna.json

@@ -5,8 +5,6 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring DLNA cache": "",
     "Backing up DLNA cache": "",
     "Backup of DLNA cache complete": "",

+ 10 - 0
locale/af/freedombone-app-dokuwiki.json

@@ -0,0 +1,10 @@
+{
+    "Restoring Dokuwiki installation": "",
+    "Restore of Dokuwiki complete": "",
+    "Backing up dokuwiki": "",
+    "Restoring Dokuwiki installation $DOKUWIKI_DOMAIN_NAME": "",
+    "Dokuwiki password": "",
+    "Dokuwiki onion domain: ${DOKUWIKI_ONION_HOSTNAME}": "",
+    "Dokuwiki username: $MY_USERNAME": "",
+    "Dokuwiki password: $DOKUWIKI_ADMIN_PASSWORD": ""
+}

+ 18 - 0
locale/af/freedombone-app-etherpad.json

@@ -0,0 +1,18 @@
+{
+    "Welcome to ${ETHERPAD_TITLE}!\\n\\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!": "",
+    "Etherpad Title": "",
+    "Freedombone Control Panel": "",
+    "Title has been set": "",
+    "Etherpad Welcome Message": "",
+    "Welcome message has been set": "",
+    "Etherpad Settings": "",
+    "Choose an operation:": "",
+    "Set Title": "",
+    "Set a welcome message": "",
+    "Exit": "",
+    "etherpad domain specified but not found in ${temp_backup_dir}": "",
+    "Etherpad administrator": "",
+    "Etherpad administrator nickname: $MY_USERNAME": "",
+    "Etherpad administrator password: $ETHERPAD_ADMIN_PASSWORD": "",
+    "Etherpad onion domain: ${ETHERPAD_ONION_HOSTNAME}": ""
+}

+ 16 - 9
locale/af/freedombone-app-gnusocial.json

@@ -1,21 +1,28 @@
 {
     "Freedombone Configuration": "",
-    "Microblog Configuration": "",
-    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "GNU Social Configuration": "",
+    "\\nPlease enter your GNU Social details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
     "Domain:": "",
     "Welcome Message:": "",
     "Background image URL:": "",
     "Code:": "",
     "Domain name validation": "",
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
+    "GNU Social": "",
+    "Freedombone Control Panel": "",
+    "Set GNU Social login background": "",
+    "The background image has been set": "",
+    "Set GNU Social welcome message": "",
+    "Welcome message has been set": "",
+    "Choose an operation:": "",
+    "Set a login screen background image": "",
+    "Set a welcome message": "",
+    "Exit": "",
     "Restoring gnusocial": "",
     "Restore of gnusocial complete": "",
     "Backing up GNU social installation": "",
     "gnusocial domain specified but not found in ${temp_backup_dir}": "",
-    "GNU Social": "",
-    "Microblog administrator": "",
-    "Microblog administrator nickname: $MY_USERNAME": "",
-    "Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
-    "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": ""
+    "Gnusocial administrator": "",
+    "Gnusocial administrator nickname: $MY_USERNAME": "",
+    "Gnusocial administrator password: $GNUSOCIAL_ADMIN_PASSWORD": "",
+    "Gnusocial onion domain: ${GNUSOCIAL_ONION_HOSTNAME}": ""
 }

+ 1 - 11
locale/af/freedombone-app-gogs.json

@@ -1,10 +1,4 @@
 {
-    "Freedombone Configuration": "",
-    "Developer Configuration": "",
-    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
-    "Domain:": "",
-    "Code:": "",
-    "Domain name validation": "",
     "Backing up gogs": "",
     "Gogs backup complete": "",
     "Restoring Gogs settings": "",
@@ -13,9 +7,5 @@
     "Obtaining Gogs settings backup": "",
     "Obtaining Gogs repos backup": "",
     "Obtaining Gogs authorized_keys backup": "",
-    "Restore of Gogs complete": "",
-    "Gogs admin user password": "",
-    "Note that there's a usability/security trade-off made here.": "",
-    "In order to allow git clone via http we don't redirect everything": "",
-    "should change /etc/nginx/sites-available/${GIT_DOMAIN_NAME} to redirect everything over https.": ""
+    "Restore of Gogs complete": ""
 }

+ 18 - 0
locale/af/freedombone-app-htmly.json

@@ -0,0 +1,18 @@
+{
+    "Change htmly avatar": "",
+    "Freedombone Control Panel": "",
+    "Enter a URL for an image. It should be approximately a square image.": "",
+    "Your htmly avatar has been changed": "",
+    "Restoring htmly installation": "",
+    "No content directory found after restoring htmly": "",
+    "Backing up htmly": "",
+    "Backup of htmly complete": "",
+    "Htmly domain specified but not found in $temp_backup_dir": "",
+    "Restoring htmly installation $HTMLY_DOMAIN_NAME": "",
+    "Restore of htmly complete": "",
+    "Your htmly username: $MY_USERNAME": "",
+    "Your htmly password is: $HTMLY_ADMIN_PASSWORD": "",
+    "Log into your htmly at https://$HTMLY_DOMAIN_NAME/login": "",
+    "Htmly onion domain: ${HTMLY_ONION_HOSTNAME}": "",
+    "Log into your htmly at https://${HTMLY_ONION_HOSTNAME}/login": ""
+}

+ 0 - 7
locale/af/freedombone-app-hubzilla.json

@@ -13,13 +13,6 @@
     "Choose an operation:": "",
     "Set channel directory server": "",
     "Back to main menu": "",
-    "Freedombone Configuration": "",
-    "Hubzilla Configuration": "",
-    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Domain:": "",
-    "Code:": "",
-    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Domain name validation": "",
     "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": "",

+ 0 - 2
locale/af/freedombone-app-ipfs.json

@@ -1,6 +1,4 @@
 {
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring IPFS": "",
     "Restore of IPFS complete": "",
     "Backing up IPFS": "",

+ 1 - 2
locale/af/freedombone-app-irc.json

@@ -9,6 +9,5 @@
     "Set a password for all IRC users": "",
     "Show current IRC login password": "",
     "Exit": "",
-    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
-    "IRC Server": ""
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": ""
 }

+ 4 - 0
locale/af/freedombone-app-jitsi.json

@@ -0,0 +1,4 @@
+{
+    "Jitsi ${jitsi_subdomain_name} onion domain: ${new_domain}": "",
+    "Jitsi onion domain: ${JITSI_ONION_HOSTNAME}": ""
+}

+ 3 - 0
locale/af/freedombone-app-pelican.json

@@ -0,0 +1,3 @@
+{
+    "Freedombone Blog": ""
+}

+ 34 - 0
locale/af/freedombone-app-pihole.json

@@ -0,0 +1,34 @@
+{
+    "Ad Blocker Upstream DNS": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Pause Ad Blocker": "",
+    "Ad blocking is paused": "",
+    "Resume Ad Blocker": "",
+    "Ad blocking has resumed": "",
+    "Freedombone Control Panel": "",
+    "Ad Blocker": "",
+    "Choose an operation:": "",
+    "Edit ads list": "",
+    "Edit blacklisted domain names": "",
+    "Edit whitelisted domain names": "",
+    "Change upstream DNS servers": "",
+    "Pause blocker": "",
+    "Resume blocker": "",
+    "Exit": ""
+}

+ 14 - 0
locale/af/freedombone-app-postactiv.json

@@ -0,0 +1,14 @@
+{
+    "Freedombone Configuration": "",
+    "PostActiv Configuration": "",
+    "\\nPlease enter your postactiv details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Domain:": "",
+    "Code:": "",
+    "Domain name validation": "",
+    "postactiv domain specified but not found in ${temp_backup_dir}": "",
+    "postactiv": "",
+    "Postactiv administrator": "",
+    "Postactiv administrator nickname: $MY_USERNAME": "",
+    "Postactiv administrator password: $POSTACTIV_ADMIN_PASSWORD": "",
+    "Postactiv onion domain: ${POSTACTIV_ONION_HOSTNAME}": ""
+}

+ 0 - 2
locale/af/freedombone-app-syncthing.json

@@ -21,8 +21,6 @@
     "Remove an ID for another machine or device": "",
     "Manually edit device IDs": "",
     "Back to main menu": "",
-    "Backing up syncthing": "",
-    "Backup to syncthing complete": "",
     "Backing up syncthing files for $USERNAME": "",
     "Restoring syncthing configuration": "",
     "Restoring syncthing shared files": "",

+ 0 - 2
locale/af/freedombone-app-tahoelafs.json

@@ -1,6 +1,4 @@
 {
-    "Backing up Tahoe-LAFS introducer": "",
-    "Backup to $dest_directory complete": "",
     "Restoring Tahoe-LAFS introducer": "",
     "Restore complete": ""
 }

+ 4 - 0
locale/af/freedombone-app-vim.json

@@ -0,0 +1,4 @@
+{
+    "Backing up Vim config for $USERNAME": "",
+    "Restoring Vim config for $USERNAME": ""
+}

+ 2 - 2
locale/af/freedombone-app-webmail.json

@@ -3,7 +3,7 @@
     "Backing up webmail complete": "",
     "Restoring webmail": "",
     "Restore of webmail complete": "",
-    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
-    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "To access webmail open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "To access webmail open http://$WEBMAIL_ONION_HOSTNAME": "",
     "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": ""
 }

+ 0 - 2
locale/af/freedombone-app-xmpp.json

@@ -1,6 +1,4 @@
 {
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring xmpp settings": "",
     "Restore of xmpp settings complete": "",
     "Backing up the xmpp settings": "",

+ 2 - 16
locale/af/freedombone-backup-local.json

@@ -1,21 +1,11 @@
 {
-    "Please attach a USB drive": "",
-    "There was a problem mounting the USB drive to $USB_MOUNT": "",
-    "Unable to unmount the drive. This means that the backup did not work": "",
-    "Unmount encrypted USB": "",
-    "Backup to USB drive is complete. You can now unplug it.": "",
-    "No MariaDB password was given": "",
-    "Obtaining ${1} database backup": "",
-    "${1} database could not be saved": "",
-    "WARNING: directory does not exist: ${1}": "",
-    "Backup key could not be found": "",
     "There was a problem making the directory $USB_MOUNT/backup.": "",
     "Less than 5% of space remaining on backup drive": "",
     "Backing up gpg keys for $USERNAME": "",
     "Backing up personal settings for $USERNAME": "",
     "Backing up ssh keys for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
-    "Backing up syncthing files for $USERNAME": "",
+    "Backing up Emacs config for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
     "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
@@ -29,10 +19,6 @@
     "Backing up $source_directory to $dest_directory": "",
     "Backing up ${PROJECT_NAME} configuration files": "",
     "Backing up README": "",
-    "Backing up VoIP settings": "",
     "Unable to backup mysql settings": "",
-    "Backing up some additional directories": "",
-    "WARNING: The backup directory $destination_dir is already used.": "",
-    "Choose a different destination name for backing up $backup_dir": "",
-    "WARNING: Directory $backup_dir does not exist": ""
+    "Backup to USB drive is complete. You can now unplug it.": ""
 }

+ 1 - 28
locale/af/freedombone-backup-remote.json

@@ -1,10 +1,5 @@
 {
     "Creating backup key": "",
-    "Backup key could not be found": "",
-    "No MariaDB password was given": "",
-    "${1} database could not be saved": "",
-    "Unable to export ${1} database": "",
-    "${PROJECT_NAME} backup to friends": "",
     "Backing up ${PROJECT_NAME} configuration files": "",
     "Backing up personal settings for $USERNAME": "",
     "Backing up gpg keys for $USERNAME": "",
@@ -23,32 +18,10 @@
     "Backing up emails for $USERNAME": "",
     "Backing up Lets Encrypt settings": "",
     "Backing up Tor settings": "",
-    "Backing up RSS reader installation": "",
-    "RSS reader domain specified but not found in /etc/share/ttrss}": "",
-    "Backing up GNU social installation": "",
-    "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
-    "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
-    "Backing up syncthing configuration": "",
-    "Backing up syncthing shared files": "",
-    "Backing up Mediagoblin": "",
-    "Obtaining Gogs settings backup": "",
-    "Obtaining Gogs repos backup": "",
-    "Obtaining Gogs authorized_keys backup": "",
-    "Backing up wiki": "",
-    "Backing up blog": "",
-    "Blog domain specified but not found in /var/www/${FULLBLOG_DOMAIN_NAME}": "",
     "Backing up certificates": "",
     "Backing up the public mailing list": "",
-    "Backing up the XMPP settings": "",
     "Backing up web settings": "",
     "Backing up README": "",
-    "Backing up IPFS": "",
-    "Backing up DLNA cache": "",
-    "Backing up VoIP settings": "",
     "Unable to backup MariaDB settings": "",
-    "Unable to export database settings": "",
-    "Backing up some additional directories": "",
-    "WARNING: The backup directory $destination_dir is already used.": "",
-    "Choose a different destination name for backing up $backup_dir": "",
-    "WARNING: Directory $backup_dir does not exist": ""
+    "Unable to export database settings": ""
 }

+ 6 - 0
locale/af/freedombone-base-chaoskey.json

@@ -0,0 +1,6 @@
+{
+    "chaoskey tarball: $CHAOSKEY_TARBALL": "",
+    "Hash does not match. This could indicate that the tarball has been tampered with.": "",
+    "chaoskey expected tarball hash: $CHAOSKEY_HASH": "",
+    "chaoskey actual hash: $hash": ""
+}

+ 0 - 1
locale/af/freedombone-base-email.json

@@ -6,7 +6,6 @@
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
     "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
-    "Email import directory $IMPORT_MAILDIR not found": "",
     "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
     "No Tor installation found. ${onion_service_name} onion site cannot be configured.": "",
     "Added onion site for ${onion_service_name}": "",

+ 94 - 142
locale/af/freedombone-config.json

@@ -1,19 +1,101 @@
 {
-    "<h1>Welcome to \\$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>": "",
+    "<h1>Welcome to \\$GNUSOCIAL_DOMAIN_NAME – a federated social network</h1><p>Another $PROJECT_NAME site</p>": "",
     "${PROJECT_NAME}-config -f [config filename] -m [min password length]": "",
+    "Freedombone Configuration": "",
+    "Your email address": "",
+    "Your main domain name": "",
+    "\\nWhich domain name should your email/XMPP/IRC/Mumble be associated with?": "",
+    "Domain:": "",
+    "Code:": "",
+    "mail subdomain Code:": "",
+    "XMPP subdomain Code:": "",
+    "Which domain name should your email/XMPP/IRC/Mumble be associated with?": "",
+    "Domain name validation": "",
+    "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.": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Where to download Debian packages from:": "",
+    "Australia": "",
+    "Austria": "",
+    "Belarus": "",
+    "Belgium": "",
+    "Bosnia and Herzegovina": "",
+    "Brazil": "",
+    "Bulgaria": "",
+    "Canada": "",
+    "Chile": "",
+    "China": "",
+    "Croatia": "",
+    "Czech Republic": "",
+    "Denmark": "",
+    "El Salvador": "",
+    "Estonia": "",
+    "Finland": "",
+    "France 1": "",
+    "France 2": "",
+    "Germany 1": "",
+    "Germany 2": "",
+    "Greece": "",
+    "Hungary": "",
+    "Iceland": "",
+    "Iran": "",
+    "Ireland": "",
+    "Italy": "",
+    "Japan": "",
+    "Korea": "",
+    "Lithuania": "",
+    "Mexico": "",
+    "Netherlands": "",
+    "New Caledonia": "",
+    "New Zealand": "",
+    "Norway": "",
+    "Poland": "",
+    "Portugal": "",
+    "Romania": "",
+    "Russia": "",
+    "Slovakia": "",
+    "Slovenia": "",
+    "Spain": "",
+    "Sweden": "",
+    "Switzerland": "",
+    "Taiwan": "",
+    "Thailand": "",
+    "Turkey": "",
+    "Ukraine": "",
+    "United Kingdom": "",
+    "United States": "",
+    "Type of Random Number Generator:": "",
+    "OneRNG Device": "",
+    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
+    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
+    "Social Key Management": "",
+    "Username": "",
+    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
+    "Don't use the default user account": "",
+    "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
+    "Type of Installation": "",
     "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
     "Invalid FreeDNS Code": "",
-    "Encryption keys": "",
-    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
-    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
-    "GPG Keyring loaded to $HOME_DIR": "",
-    "ssh keys imported": "",
-    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
-    "Freedombone Configuration": "",
-    "GPG/PGP keys for your system:": "",
-    "Generate new keys (new user)": "",
-    "Import keys from USB drive/s": "",
-    "Retrieve keys from friends servers": "",
     "Freedombone Control Panel": "",
     "Main Repository (Mirrors)": "",
     "If you don't know what this means then just select Ok.\\n\\nIf you don't wish to use the default repositories they can be obtained from mirrored repos on another ${PROJECT_NAME} system.\\n\\nThe repositories are for applications which are not yet packaged for Debian.": "",
@@ -96,135 +178,5 @@
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
     "Freedombone": "",
-    "Type of Installation:": "",
-    "Full": "",
-    "Writer": "",
-    "Cloud": "",
-    "Chat": "",
-    "Mailbox": "",
-    "Non-Mailbox": "",
-    "Social": "",
-    "Media": "",
-    "Developer": "",
-    "Mesh (router)": "",
-    "Mesh (user device)": "",
-    "Wireless Mesh ESSID\\n\\nIf you press enter the default will be '$WIFI_SSID'": "",
-    "Give your mesh peer a name": "",
-    "Wifi Channel (spaced to be non-overlapping):": "",
-    "Username": "",
-    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
-    "Don't use the default user account": "",
-    "The directory /home/$MY_USERNAME does not exist": "",
-    "Your full name (or nick)": "",
-    "Install Target": "",
-    "\\nAre you installing onto a Beaglebone Black?": "",
-    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
-    "Social Key Management": "",
-    "Type of Random Number Generator:": "",
-    "OneRNG Device": "",
-    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
-    "Where to download Debian packages from:": "",
-    "Australia": "",
-    "Austria": "",
-    "Belarus": "",
-    "Belgium": "",
-    "Bosnia and Herzegovina": "",
-    "Brazil": "",
-    "Bulgaria": "",
-    "Canada": "",
-    "Chile": "",
-    "China": "",
-    "Croatia": "",
-    "Czech Republic": "",
-    "Denmark": "",
-    "El Salvador": "",
-    "Estonia": "",
-    "Finland": "",
-    "France 1": "",
-    "France 2": "",
-    "Germany 1": "",
-    "Germany 2": "",
-    "Greece": "",
-    "Hungary": "",
-    "Iceland": "",
-    "Iran": "",
-    "Ireland": "",
-    "Italy": "",
-    "Japan": "",
-    "Korea": "",
-    "Lithuania": "",
-    "Mexico": "",
-    "Netherlands": "",
-    "New Caledonia": "",
-    "New Zealand": "",
-    "Norway": "",
-    "Poland": "",
-    "Portugal": "",
-    "Romania": "",
-    "Russia": "",
-    "Slovakia": "",
-    "Slovenia": "",
-    "Spain": "",
-    "Sweden": "",
-    "Switzerland": "",
-    "Taiwan": "",
-    "Thailand": "",
-    "Turkey": "",
-    "Ukraine": "",
-    "United Kingdom": "",
-    "United States": "",
-    "Pick a domain name service (DNS):": "",
-    "Digital Courage": "",
-    "German Privacy Foundation 1": "",
-    "German Privacy Foundation 2": "",
-    "Chaos Computer Club": "",
-    "ClaraNet": "",
-    "OpenNIC 1": "",
-    "OpenNIC 2": "",
-    "OpenNIC 3": "",
-    "OpenNIC 4": "",
-    "OpenNIC 5": "",
-    "OpenNIC 6": "",
-    "OpenNIC 7": "",
-    "PowerNS": "",
-    "ValiDOM": "",
-    "Freie Unzensierte": "",
-    "Google": "",
-    "Choose Dynamic DNS provider:": "",
-    "Dynamic DNS provider username": "",
-    "Dynamic DNS provider password": "",
-    "Password quality check": "",
-    "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Static local IP address": "",
-    "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
-    "Local Network Configuration": "",
-    "\\nPlease enter the IP addresses:": "",
-    "This system:": "",
-    "Internet router:": "",
-    "Wiki Configuration": "",
-    "\\nPlease enter your wiki details:": "",
-    "Title:": "",
-    "Domain:": "",
-    "Code:": "",
-    "Domain name validation": "",
-    "Blog Configuration": "",
-    "\\nPlease enter your blog details:": "",
-    "Mediagoblin Configuration": "",
-    "\\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:": "",
-    "Media Server Configuration": "",
-    "\\nPlease enter your Media Server details, or just select Ok if you don't need a Media Server site:": "",
-    "Hubzilla Configuration": "",
-    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Microblog Configuration": "",
-    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Welcome Message:": "",
-    "Background image URL:": "",
-    "Developer Configuration": "",
-    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
-    "Your main domain name": "",
-    "\\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?": "",
-    "Which domain name should your email/XMPP/IRC/VoIP be associated with?": "",
-    "Your email address": "",
     "Configuration filename:": ""
 }

+ 10 - 30
locale/af/freedombone-controlpanel-user.json

@@ -25,6 +25,14 @@
     "No email address was given": "",
     "No folder name was given": "",
     "Email rule for $RULE_EMAIL was added": "",
+    "Trust a PGP/GPG key or website domain": "",
+    "Set the trust level for $TRUST_ADDRESS:": "",
+    "I don't know or won't say": "",
+    "I do NOT trust": "",
+    "I trust marginally": "",
+    "I trust fully": "",
+    "I trust ultimately": "",
+    "$TRUST_ADDRESS was set to trust level ${TRUST_LEVEL}": "",
     "When email arrives with subject containing:": "",
     "No subject text was given": "",
     "Email rule for subject '$RULE_SUBJECT' was added": "",
@@ -71,33 +79,11 @@
     "Port:": "",
     "Username:": "",
     "Password:": "",
-    "# The ${PROJECT_NAME} syncthing ID is: $SYNCTHING_ID": "",
-    "Device ID for ${PROJECT_NAME}": "",
-    "In a desktop terminal press shift and select the ID below,\\nthen right click and copy.\\n\\nWithin Connectbot select Menu/Copy and then highlight the ID below\\n\\n$SYNCTHING_ID": "",
-    "Add a Syncthing device ID": "",
-    "Paste the device ID for your laptop/desktop/netbook/phone/tablet below": "",
-    "Device ID:": "",
-    "Description (optional):": "",
-    "That doesn't look like a device ID": "",
-    "That ID has already been added": "",
-    "The ID was added": "",
-    "Remove a Syncthing device ID": "",
-    "Paste the device ID which is to be removed below": "",
-    "That ID wasn't registered anyway": "",
-    "The ID was removed": "",
     "Sign a PGP/GPG key or website domain": "",
     "Enter the Key ID, address or domain to be signed.\\n\\nIf you are signing a website domain then include the https:// at the beginning.\\n\\nIf you are signing an ssh key then include ssh:// before the domain name.": "",
     "Sign a PGP/GPG key": "",
     "$SIGN_ADDRESS was signed": "",
-    "Trust a PGP/GPG key or website domain": "",
     "Enter the Key ID, address or domain to be trusted.\\n\\nIf you are trusting a website domain then include the https:// at the beginning.\\n\\nIf you are trusting an ssh key then include ssh:// before the domain name.": "",
-    "Set the trust level for $TRUST_ADDRESS:": "",
-    "I don't know or won't say": "",
-    "I do NOT trust": "",
-    "I trust marginally": "",
-    "I trust fully": "",
-    "I trust ultimately": "",
-    "$TRUST_ADDRESS was set to trust level ${TRUST_LEVEL}": "",
     "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
@@ -111,19 +97,13 @@
     "Add an email rule for a subject": "",
     "Block or unblock an email address": "",
     "Block or unblock email with subject text": "",
-    "File Synchronization": "",
-    "Show device ID for ${PROJECT_NAME}": "",
-    "Add an ID for another machine or device": "",
-    "Remove an ID for another machine or device": "",
-    "Manually edit device IDs": "",
     "Monkeysphere sign server keys": "",
     "Freedombone Security Configuration": "",
     "\\nMonkeysphere has been enabled and you will need to sign and trust the server keys. Do you want to do that now?": "",
+    "Freedombone": "",
+    "Run an App": "",
     "User Control Panel": "",
     "Use Email": "",
-    "Use Tox Chat": "",
-    "Use XMPP Chat": "",
-    "Use IRC": "",
     "Browse the Web": "",
     "Set an outgoing email proxy": "",
     "Administrator controls": "",

+ 54 - 87
locale/af/freedombone-controlpanel.json

@@ -21,12 +21,6 @@
     "This does not look like an ssh public key": "",
     "Select User": "",
     "Select one of the following:": "",
-    "SMTP Proxy for $ADMIN_USER": "",
-    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
-    "Enable proxy:": "",
-    "Protocol (smtp/smtps):": "",
-    "ISP mail server:": "",
-    "Port:": "",
     "Administrator user": "",
     "You can't delete the administrator user": "",
     "No Administrator user found. Check $COMPLETION_FILE": "",
@@ -36,12 +30,6 @@
     "New password for user $SELECTED_USERNAME": "",
     "The password should be ${MINIMUM_PASSWORD_LENGTH} or more characters": "",
     "Password for $SELECTED_USERNAME was changed": "",
-    "IRC Password": "",
-    "Password for all IRC users, or press Enter for no password": "",
-    "The IRC password was changed": "",
-    "Change blog avatar": "",
-    "Enter a URL for an image. It should be approximately a square image.": "",
-    "Your blog avatar has been changed": "",
     "Change ssh public key": "",
     "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "",
     "Change ssh public key for $SELECTED_USERNAME": "",
@@ -82,41 +70,19 @@
     "Plug in a LUKS encrypted USB drive": "",
     "USB Fragment Keydrive": "",
     "Backup data to USB": "",
-    "Restore from USB backup": "",
-    "Choose an application to restore:": "",
-    "Everything": "",
-    "Return to the backup and restore menu": "",
-    "Configuration files": "",
-    "MariaDB settings": "",
-    "Let's Encrypt account": "",
-    "Mutt email client settings": "",
-    "GPG keys": "",
-    "Email processing rules": "",
-    "Spam filtering rules": "",
-    "Administrator's README file": "",
-    "IPFS": "",
-    "SSH keys": "",
-    "User configuration files": "",
-    "User local files": "",
-    "User fin files": "",
-    "SSL/TLS certificates": "",
-    "Personal settings": "",
-    "Mailing List": "",
-    "XMPP chat": "",
-    "GNU Social": "",
-    "Hubzilla": "",
-    "Syncthing": "",
-    "Gogs": "",
-    "Wiki": "",
-    "Blog": "",
-    "CJDNS": "",
-    "Email": "",
-    "DLNA": "",
-    "VoIP": "",
-    "RSS reader": "",
-    "Tox": "",
-    "Mediagoblin": "",
-    "Restore from ${remote_domain_name}": "",
+    "Detected USB drive $USB_DRIVE": "",
+    "all": "",
+    "Exit": "",
+    "Restore apps": "",
+    "Restore apps from USB drive $USB_DRIVE": "",
+    "Freedombone": "",
+    "Restore all apps from USB": "",
+    "Restore failed with code $retcode": "",
+    "Restore all apps from $1": "",
+    "Restore complete": "",
+    "Restore apps from USB": "",
+    "Restore of ${app_name} failed with code $retcode": "",
+    "Restore apps from $1": "",
     "Restore data from USB": "",
     "Plug in your backup USB drive": "",
     "Restore data from remote server": "",
@@ -131,25 +97,10 @@
     "\\nDo you want to turn logging on?": "",
     "Restore GPG key for user": "",
     "Plug in your USB keydrive": "",
-    "Renew SSL certificate": "",
-    "\\nThis will renew a letsencrypt certificate. Select 'yes' to continue": "",
-    "Hubzilla install directory not found": "",
-    "Hubzilla certificate has been renewed": "",
-    "Hubzilla channel directory server": "",
-    "Hubzilla is not installed on this system": "",
-    "When you click on 'channel directory' this is where Hubzilla will obtain its list from": "",
-    "Invalid domain - include the https://": "",
-    "Domain channel directory server changed to $hubzilla_domain_server": "",
-    "Format a USB drive (LUKS encrypted)": "",
-    "Choose a drive:": "",
-    "sda (Beaglebone Black)": "",
-    "sdb": "",
-    "sdc": "",
-    "sdd": "",
-    "Back to Backup and Restore menu": "",
-    "Format USB drive": "",
-    "\\nPlease confirm that you wish to format drive\\n\\n    ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
-    "Remove backups from a USB drive": "",
+    "Format USB drive $USB_DRIVE": "",
+    "\\nPlease confirm that you wish to format drive\\n\\n    ${USB_DRIVE}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
+    "Formatting drive $USB_DRIVE. ALL CONTENTS WILL BE LOST.": "",
+    "Remove backups from a USB drive $USB_DRIVE": "",
     "\\nPlease confirm that you wish to remove backups from this drive\\n\\n    ${drive}\\n\\nYou will not be able to recover them afterwards.": "",
     "Power off the system": "",
     "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "",
@@ -158,16 +109,19 @@
     "Change the name of this system": "",
     "New local network name": "",
     "The name of this system on your local network was changed successfully": "",
-    "Set the TLS date/time source": "",
-    "Enter a domain name to use as a TLS time source.\\n\\nFactors to consider when choosing a source are whether you wish that site to know that your system is 'alive' and also what might happen if an adversary were to try to mess with the date/time from that domain (i.e. how much blowback would there be).": "",
-    "Don't include the 'https'": "",
-    "That doesn't look like a domain name": "",
+    "Return to using a dynamic IP address": "",
+    "\\nDo you wish to go back to using a dynamic IP address?": "",
+    "System is rebooting. You may need to close this terminal and log in from a new one.": "",
     "Set a static local IP address": "",
-    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be 192.168.1.x": "",
+    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be ${IPv4_address_base}.x\\n\\nIf you leave this field blank then the system will revert to using a dynamic IP address.": "",
     "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 ${IPv4_address_base}.1, ${IPv4_address_base}.254, or similar": "",
+    "Static local IP address": "",
+    "\\nSet a static address for the wifi adapter?\\n\\nIf you select 'no' then wired ethernet will be used.": "",
+    "\\nFor the change to take effect your system will now need to reboot. Do this now?": "",
     "Wifi Settings": "",
-    "Wifi settings were changed": "",
+    "Wifi settings were changed.": "",
+    "Wifi settings were changed. You will need to restart the system with ethernet cable removed for the changes to take effect.": "",
     "Hotspot Settings": "",
     "Enabled (yes/no):": "",
     "SSID:": "",
@@ -176,54 +130,67 @@
     "No wifi hotspot passphrase was given": "",
     "Wifi hotspot passphrase was too short": "",
     "Hotspot settings were changed": "",
+    "Reinstall MariaDB": "",
+    "\\nThis should be a LAST RESORT, if the mysql daemon won't start. You will lose ALL databases and will then need to restore them from backup.\\n\\nAre you sure that you wish to continue?": "",
+    "MariaDB has been reinstalled": "",
+    "Firewall Settings": "",
+    "Email Domains": "",
+    "Enter the list of email domains to use, separated by semicolons": "",
+    "Email domains were changed": "",
+    "Email Domains not set": "",
+    "There should be no spaces in the list": "",
+    "SMTP Proxy for $ADMIN_USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
     "Restore GPG key from USB keydrive": "",
     "Restore data from USB drive": "",
+    "Reinstall mariadb": "",
     "Configure remote backups": "",
     "Restore from remote backup": "",
     "Backup GPG key to USB (master keydrive)": "",
     "Backup GPG key to USB (fragment keydrive)": "",
+    "Format a USB drive (LUKS encrypted)": "",
+    "Remove backups from a USB drive": "",
     "Back to main menu": "",
-    "Email Filtering Rules": "",
+    "Email Menu": "",
     "Add a user to a mailing list": "",
     "Remove a user from a mailing list": "",
     "Add an email rule": "",
     "Block/Unblock an email address": "",
     "Block/Unblock email with subject text": "",
+    "Outgoing Email Proxy": "",
+    "Extra email domains": "",
     "Manage Users": "",
     "Add a user": "",
     "Delete a user": "",
     "Change user password": "",
     "Change user ssh public key": "",
-    "Set channel directory server": "",
-    "Media Menu": "",
-    "Attach a drive containing playable media": "",
-    "Remove a drive containing playable media": "",
-    "Exit": "",
     "Enable Wifi": "",
     "\\nDo you wish to enable wifi?": "",
+    "Wifi": "",
+    "No wifi adaptors were detected": "",
     "Wifi Menu": "",
     "${status_str}\\n\\nChoose an operation:": "",
     "Enable or disable Wifi": "",
     "Configure wifi networks": "",
     "Manually edit wifi networks file": "",
     "Hotspot settings": "",
-    "IRC Menu": "",
-    "No IRC server is installed": "",
-    "Set a password for all IRC users": "",
-    "Show current IRC login password": "",
+    "Change Settings for an App": "",
     "Control Panel": "",
     "About this system": "",
+    "Show Firewall": "",
     "Reset Tripwire": "",
+    "App Settings": "",
+    "Add/Remove Apps": "",
     "Logging on/off": "",
     "Ping enable/disable": "",
-    "Outgoing Email Proxy": "",
     "Security Settings": "",
     "Set the main repository (repo mirrors)": "",
-    "Media menu": "",
-    "IRC menu": "",
-    "Change your blog avatar": "",
     "Wifi menu": ""
 }

+ 4 - 9
locale/af/freedombone-image-customise.json

@@ -1,19 +1,14 @@
 {
+    "Freedombone Mesh": "",
+    "Welcome to the Freedombone mesh.\\n\\nThe first thing you will need to do is set a username so that other peers can find you.": "",
     "info: Adding apt config to call dpkg via eatmydata": "",
     "error: unable to find /usr/bin/eatmydata after installing the eatmydata package": "",
     "info: Removing apt config to call dpkg via eatmydata": "",
     "warning: missing $rootdir$override": "",
-    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n\t\t\t\t\tInitial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n\tsudo su\n\t${PROJECT_NAME} menuconfig\n\n": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Initial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n    sudo su\n    ${PROJECT_NAME} menuconfig\n\n": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Freedom in the Mesh\n": "",
     "Using ssh public key:": "",
     "Install failed. Press x to continue...": "",
-    "Toxcore compile failed at $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "Toxcore compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "File not found /usr/local/bin/tox-bootstrapd": "",
-    "Account to run Tox's DHT bootstrap daemon": "",
-    "Unable to install toxid, returned $?": "",
-    "Toxic client compile failed at $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "Tox client was not installed to $TOXIC_FILE": "",
-    "Toxic client compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
     "warning: creating initial user $username with well known password!": "",
     "info: killing leftover processes in chroot": ""
 }

+ 2 - 18
locale/af/freedombone-image-mesh.json

@@ -1,21 +1,5 @@
 {
     "avahi name changed to P${PEER_ID}.local": "",
-    "Regenerating ssh host keys": "",
-    "zeronet daemon updated to P${PEER_ID}.local": "",
-    "Address:    $ZERONET_BLOG_ADDRESS": "",
-    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
-    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
-    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
-    "Address:    $ZERONET_MAIL_ADDRESS": "",
-    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
-    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
-    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
-    "Address:    $ZERONET_FORUM_ADDRESS": "",
-    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
-    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
-    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
-    "Home directory for $DEFAULT_USERNAME not found": ""
+    "new": "",
+    "amnesic": ""
 }

+ 1 - 0
locale/af/freedombone-image.json

@@ -6,5 +6,6 @@
     "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT\n\nPassword: $PASSWORD\n": "",
     "    Username: $USERNAME\nPassword: $PASSWORD\n": "",
     "\nUsername: $USERNAME\nPassword: $PASSWORD\n": "",
+    "\nImage was created.\n": "",
     "Username: $USERNAME\nPassword: $PASSWORD": ""
 }

+ 1 - 0
locale/af/freedombone-keydrive.json

@@ -3,6 +3,7 @@
     "Home directory for $MY_USERNAME not found. This user may not exist on the system": "",
     "There was a problem mounting the USB drive to $USB_MOUNT": "",
     "No .gnupg directory was found for $MY_USERNAME": "",
+    "LetsEncrypt keys copied to $USB_DRIVE": "",
     "GPG Keyring copied to $USB_DRIVE. You may now remove the drive.": "",
     "Unable to copy gpg keyring to $USB_DRIVE": "",
     "Made directory $FRAGMENTS_DIR": "",

+ 1 - 5
locale/af/freedombone-mesh-install.json

@@ -1,7 +1,3 @@
 {
-    "${PROJECT_NAME}-mesh-install -f [function] -r [rootdir]": "",
-    "File not found /usr/local/bin/tox-bootstrapd": "",
-    "Account to run Tox's DHT bootstrap daemon": "",
-    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
-    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": ""
+    "${PROJECT_NAME}-mesh-install -f [function] -r [rootdir]": ""
 }

+ 1 - 0
locale/af/freedombone-mirrors.json

@@ -4,5 +4,6 @@
     "  -m|--mypassword [password]  Local mirrors user password": "",
     "     --port [number]          Friend's server ssh port number": "",
     "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "The app $SYNC_SINGLE_APP was not found": "",
     "WARNING: failed to mirror repo ${repo_url}": ""
 }

+ 4 - 1
locale/af/freedombone-pin-cert.json

@@ -1,3 +1,6 @@
 {
-    "No certificate found for $DOMAIN_NAME": ""
+    "Pinned $DOMAIN_NAME with keys $KEY_HASH $BACKUP_KEY_HASH": "",
+    "Removed pinning for ${DOMAIN_NAME}": "",
+    "No private key certificate found for $DOMAIN_NAME": "",
+    "No fullchain certificate found for $DOMAIN_NAME": ""
 }

+ 0 - 6
locale/af/freedombone-recoverkey.json

@@ -1,11 +1,5 @@
 {
     "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "",
     "User $MY_USERNAME does not exist on the system": "",
-    "Encryption keys": "",
-    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
-    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
-    "GPG Keyring loaded to $HOME_DIR": "",
-    "ssh keys imported": "",
-    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
     "Starting key retrieval from $REMOTE_SERVER...": ""
 }

+ 0 - 23
locale/af/freedombone-restore-local.json

@@ -1,16 +1,8 @@
 {
-    "Please attach a USB drive": "",
-    "There was a problem mounting the USB drive to $USB_MOUNT": "",
-    "Unable to unmount the drive. This means that the backup did not work": "",
-    "Setting permissions": "",
-    "Unmount encrypted USB": "",
     "No backup directory found on the USB drive.": "",
     "Checking that admin user exists": "",
     "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
     "Copying GPG keys from admin user to root": "",
-    "Restoring ${1} database": "",
-    "Unable to restore ${1} database": "",
-    "Restoring ${1} installation": "",
     "Restoring configuration files": "",
     "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
     "Restoring mysql settings": "",
@@ -27,7 +19,6 @@
     "Restoring procmail settings for $USERNAME": "",
     "Restoring spamassassin settings for $USERNAME": "",
     "Restoring admin user README": "",
-    "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
     "Restoring monkeysphere ids for $USERNAME": "",
@@ -36,21 +27,7 @@
     "Restoring certificates": "",
     "Restoring personal settings for $USERNAME": "",
     "Restoring public mailing list": "",
-    "Restoring XMPP settings": "",
-    "Restoring syncthing configuration": "",
-    "Restoring syncthing shared files": "",
-    "Restoring syncthing files for $USERNAME": "",
-    "Restoring Gogs settings": "",
-    "Restoring Gogs repos": "",
-    "Restoring Gogs authorized_keys": "",
-    "Restoring Wiki installation ${WIKI_DOMAIN_NAME}": "",
-    "Restoring blog installation": "",
-    "No content directory found after restoring blog": "",
-    "Restoring cjdns installation": "",
     "Restoring emails for $USERNAME": "",
-    "Restoring DLNA cache": "",
-    "Restoring VoIP settings": "",
-    "Restoring Tox node settings": "",
     "Restore $RESTORE_APP": "",
     "Restore from USB drive is complete. You can now unplug it.": ""
 }

+ 2 - 14
locale/af/freedombone-restore-remote.json

@@ -2,9 +2,6 @@
     "No friends list found at $BACKUP_LIST": "",
     "Server not found within the friends list": "",
     "Copying GPG keys from admin user to root": "",
-    "Restoring ${1} database": "",
-    "Unable to restore ${1} database": "",
-    "Restoring ${1} installation": "",
     "Restoring configuration files": "",
     "Restoring MariaDB settings": "",
     "Get the MariaDB password from the backup": "",
@@ -20,7 +17,6 @@
     "Restoring procmail settings for $USERNAME": "",
     "Restoring spamassassin settings for $USERNAME": "",
     "Restoring README": "",
-    "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
     "Restoring monkeysphere ids for $USERNAME": "",
@@ -29,14 +25,6 @@
     "Restoring certificates": "",
     "Restoring personal settings for $USERNAME": "",
     "Restoring public mailing list": "",
-    "Restoring XMPP settings": "",
-    "Restoring syncthing configuration": "",
-    "Restoring syncthing shared files": "",
-    "Restoring syncthing files for $USERNAME": "",
-    "Restoring Mediagoblin installation": "",
-    "Restoring Gogs repos": "",
-    "Restoring Gogs authorized_keys": "",
-    "Restoring Wiki installation $WIKI_DOMAIN_NAME": "",
-    "Restoring blog installation $FULLBLOG_DOMAIN_NAME": "",
-    "No content directory found after restoring blog": ""
+    "Restoring emails for $USERNAME": "",
+    "*** Remote restore was successful ***": ""
 }

+ 5 - 4
locale/af/freedombone-rmuser.json

@@ -1,10 +1,11 @@
 {
-    "Home directory does not exist for $MY_USERNAME": "",
+    "Home directory does not exist for $REMOVE_USERNAME": "",
     "$COMPLETION_FILE not found": "",
     "No admin user specified in $COMPLETION_FILE": "",
     "No admin username specified in $COMPLETION_FILE": "",
     "The administrator user cannot be removed": "",
-    "Do you really wish to remove the user '$MY_USERNAME' (y/n) ?": "",
-    "User $MY_USERNAME was not removed": "",
-    "User $MY_USERNAME was removed": ""
+    "Do you really wish to remove the user '$REMOVE_USERNAME' (y/n) ?": "",
+    "User $REMOVE_USERNAME was not removed": "",
+    "Removing user from ${app_name}": "",
+    "User $REMOVE_USERNAME was removed": ""
 }

+ 14 - 2
locale/af/freedombone-sec.json

@@ -1,5 +1,7 @@
 {
+    "SSH Passwords": "",
     "Freedombone Security Configuration": "",
+    "\\nAllow SSH login using passwords?": "",
     "\\nWeb/IMAP Ciphers:": "",
     "Protocols:": "",
     "Ciphers:": "",
@@ -7,8 +9,6 @@
     "MACs:": "",
     "KEX:": "",
     "Host key algorithms:": "",
-    "SSH Passwords": "",
-    "\\nAllow SSH login using passwords?": "",
     "\\nXMPP Ciphers:": "",
     "ECC Curve:": "",
     "Final Confirmation": "",
@@ -36,6 +36,18 @@
     "Register a website with monkeysphere": "",
     "Enter the website domain name (without https://)": "",
     "$domain has been registered": "",
+    "Remove pinning for a domain": "",
+    "Removed pinning from $domain": "",
+    "Freedombone Control Panel": "",
+    "Security Settings": "",
+    "Choose an operation:": "",
+    "Regenerate ssh host keys": "",
+    "Regenerate Diffie-Hellman keys": "",
+    "Update cipersuite": "",
+    "Renew Let's Encrypt certificate": "",
+    "Enable GPG based authentication (monkeysphere)": "",
+    "Allow ssh login with passwords": "",
+    "Go Back/Exit": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }

+ 9 - 1
locale/af/freedombone-utils-backup.json

@@ -6,16 +6,24 @@
     "No MariaDB password was given": "",
     "Obtaining ${1} database backup": "",
     "${1} database could not be saved": "",
+    "${1} database could not be dumped": "",
+    "Database dump was created for ${1}": "",
     "WARNING: directory does not exist: ${1}": "",
     "Backup key could not be found": "",
+    "Error backing up ${1} database to ${local_database_dir}/${1}.sql": "",
     "Setting permissions": "",
     "Unable to export ${1} database": "",
     "${PROJECT_NAME} backup to friends": "",
+    "Unable to dump ${1} database": "",
     "Backup ${app_name}": "",
     "Backup ${app_name} completed": "",
     "Restoring ${app_name}": "",
     "Restored ${app_name}": "",
     "Restoring ${1} database": "",
     "Unable to restore ${1} database": "",
-    "Restoring ${1} installation": ""
+    "Restoring ${1} installation": "",
+    "Backing up some additional directories": "",
+    "WARNING: The backup directory $destination_dir is already used.": "",
+    "Choose a different destination name for backing up $backup_dir": "",
+    "WARNING: Directory $backup_dir does not exist": ""
 }

+ 1 - 1
locale/af/freedombone-utils-final.json

@@ -1,4 +1,4 @@
 {
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n": "",
+    "\n    *** ${PROJECT_NAME} installation is complete ***\n\n    Ensure that ports are forwarded from your internet router\n": "",
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
 }

+ 8 - 1
locale/af/freedombone-utils-interactive.json

@@ -5,5 +5,12 @@
     "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
     "${PROJECT_NAME} Configuration": "",
-    "\\nDo you wish to configure some remote backup locations?": ""
+    "\\nDo you wish to configure some remote backup locations?": "",
+    "Freedombone Configuration": "",
+    "${site_name^} Configuration": "",
+    "\\nPlease enter your ${site_name^} details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Domain:": "",
+    "Code:": "",
+    "Domain name validation": "",
+    "Title:": ""
 }

+ 15 - 0
locale/af/freedombone-utils-keys.json

@@ -0,0 +1,15 @@
+{
+    "Recover Encryption Keys": "",
+    "There was a problem mounting the USB drive $USB_DRIVE to $USB_MOUNT": "",
+    "The directory $USB_MOUNT/.gnupg or $USB_MOUNT/.gnupg_fragments was not found": "",
+    "GPG Keyring loaded to $HOME_DIR": "",
+    "ssh keys imported": "",
+    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
+    "Encryption Keys Recovery": "",
+    "Freedombone Configuration": "",
+    "GPG/PGP keys for your system:": "",
+    "Generate new keys (new user)": "",
+    "Import keys from USB drive/s": "",
+    "Retrieve keys from friends servers": "",
+    "Do you wish to recover your previous encryption keys from a USB master keydrive?": ""
+}

+ 9 - 0
locale/af/freedombone-utils-selector.json

@@ -1,14 +1,23 @@
 {
+    "${app_name}_variables was not found": "",
+    "No variant name for choosing apps": "",
+    "${app_name} chosen": "",
     "${a}": "",
+    "Removing users for application: ${a}": "",
     "Removing application: ${a}": "",
     "${a} was removed": "",
+    "Interactive installer": "",
+    "Interactive settings complete": "",
+    "Login for user ${USERNAME}=": "",
     "Upgrading application from interactive: ${a}": "",
     "${a} was upgraded from interactive": "",
     "Installing application from interactive: ${a}": "",
     "${a} was installed from interactive": "",
+    "${a} was not installed from interactive": "",
     "Upgrading application: ${a}": "",
     "${a} was upgraded": "",
     "Installing application: ${a}": "",
     "${a} was installed": "",
+    "${a} was not installed": "",
     "${a} has been removed and so will not be reinstalled": ""
 }

+ 4 - 4
locale/af/freedombone-utils-web.json

@@ -1,10 +1,10 @@
 {
     "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
-    "Private certificate for $CHECK_HOSTNAME was not created": "",
-    "Public certificate for $CHECK_HOSTNAME was not created": "",
-    "Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
-    "Lets Encrypt failed for $SITE_DOMAIN_NAME, so try making a self-signed cert": "",
+    "Private certificate for ${CHECK_HOSTNAME} was not created": "",
+    "Public certificate for ${CHECK_HOSTNAME} was not created": "",
+    "Diffie–Hellman parameters for ${CHECK_HOSTNAME} were not created": "",
+    "Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert": "",
     "Lets Encrypt failed for $SITE_DOMAIN_NAME": "",
     "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": ""
 }

+ 8 - 0
locale/af/freedombone-utils-wifi.json

@@ -0,0 +1,8 @@
+{
+    "Freedombone Configuration": "",
+    "Wifi Settings ${wifi_ctr}": "",
+    "\\nTo use this system via wifi (eg. USB dongle) enter the details below, otherwise just select Ok:": "",
+    "SSID (can be 'any'):": "",
+    "Type (open/wpa2-psk):": "",
+    "Passphrase:": ""
+}

+ 0 - 6
locale/af/freedombone-wifi.json

@@ -1,9 +1,3 @@
 {
-    "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]": ""
 }

+ 1 - 144
locale/af/freedombone.json

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

+ 2 - 5
locale/ar/freedombone-adduser.json

@@ -3,12 +3,9 @@
     "$COMPLETION_FILE not found": "",
     "It's very important to add a password to your GPG key so that": "",
     "if anyone does get access to your email they still won't be able": "",
-    "Adding an XMPP account for $MY_USERNAME": "",
-    "XMPP account not created": "",
-    "Adding XMPP client setup": "",
-    "Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs": "",
+    "Adding user to ${app_name}": "",
+    "Failed with error code ${retval}": "",
     "New user $MY_USERNAME was created": "",
-    "Their SIP phone extension is $SIP_EXTENSION": "",
     "Their login password is $NEW_USER_PASSWORD": "",
     "They can download their GPG keys with:": "",
     "They should also run ${PROJECT_NAME}-client on their system to ensure": ""

+ 0 - 2
locale/ar/freedombone-app-dlna.json

@@ -5,8 +5,6 @@
     "Attach a drive containing playable media": "",
     "Remove a drive containing playable media": "",
     "Exit": "",
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring DLNA cache": "",
     "Backing up DLNA cache": "",
     "Backup of DLNA cache complete": "",

+ 10 - 0
locale/ar/freedombone-app-dokuwiki.json

@@ -0,0 +1,10 @@
+{
+    "Restoring Dokuwiki installation": "",
+    "Restore of Dokuwiki complete": "",
+    "Backing up dokuwiki": "",
+    "Restoring Dokuwiki installation $DOKUWIKI_DOMAIN_NAME": "",
+    "Dokuwiki password": "",
+    "Dokuwiki onion domain: ${DOKUWIKI_ONION_HOSTNAME}": "",
+    "Dokuwiki username: $MY_USERNAME": "",
+    "Dokuwiki password: $DOKUWIKI_ADMIN_PASSWORD": ""
+}

+ 18 - 0
locale/ar/freedombone-app-etherpad.json

@@ -0,0 +1,18 @@
+{
+    "Welcome to ${ETHERPAD_TITLE}!\\n\\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!": "",
+    "Etherpad Title": "",
+    "Freedombone Control Panel": "",
+    "Title has been set": "",
+    "Etherpad Welcome Message": "",
+    "Welcome message has been set": "",
+    "Etherpad Settings": "",
+    "Choose an operation:": "",
+    "Set Title": "",
+    "Set a welcome message": "",
+    "Exit": "",
+    "etherpad domain specified but not found in ${temp_backup_dir}": "",
+    "Etherpad administrator": "",
+    "Etherpad administrator nickname: $MY_USERNAME": "",
+    "Etherpad administrator password: $ETHERPAD_ADMIN_PASSWORD": "",
+    "Etherpad onion domain: ${ETHERPAD_ONION_HOSTNAME}": ""
+}

+ 16 - 9
locale/ar/freedombone-app-gnusocial.json

@@ -1,21 +1,28 @@
 {
     "Freedombone Configuration": "",
-    "Microblog Configuration": "",
-    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "GNU Social Configuration": "",
+    "\\nPlease enter your GNU Social details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
     "Domain:": "",
     "Welcome Message:": "",
     "Background image URL:": "",
     "Code:": "",
     "Domain name validation": "",
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
+    "GNU Social": "",
+    "Freedombone Control Panel": "",
+    "Set GNU Social login background": "",
+    "The background image has been set": "",
+    "Set GNU Social welcome message": "",
+    "Welcome message has been set": "",
+    "Choose an operation:": "",
+    "Set a login screen background image": "",
+    "Set a welcome message": "",
+    "Exit": "",
     "Restoring gnusocial": "",
     "Restore of gnusocial complete": "",
     "Backing up GNU social installation": "",
     "gnusocial domain specified but not found in ${temp_backup_dir}": "",
-    "GNU Social": "",
-    "Microblog administrator": "",
-    "Microblog administrator nickname: $MY_USERNAME": "",
-    "Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
-    "Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}": ""
+    "Gnusocial administrator": "",
+    "Gnusocial administrator nickname: $MY_USERNAME": "",
+    "Gnusocial administrator password: $GNUSOCIAL_ADMIN_PASSWORD": "",
+    "Gnusocial onion domain: ${GNUSOCIAL_ONION_HOSTNAME}": ""
 }

+ 1 - 11
locale/ar/freedombone-app-gogs.json

@@ -1,10 +1,4 @@
 {
-    "Freedombone Configuration": "",
-    "Developer Configuration": "",
-    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
-    "Domain:": "",
-    "Code:": "",
-    "Domain name validation": "",
     "Backing up gogs": "",
     "Gogs backup complete": "",
     "Restoring Gogs settings": "",
@@ -13,9 +7,5 @@
     "Obtaining Gogs settings backup": "",
     "Obtaining Gogs repos backup": "",
     "Obtaining Gogs authorized_keys backup": "",
-    "Restore of Gogs complete": "",
-    "Gogs admin user password": "",
-    "Note that there's a usability/security trade-off made here.": "",
-    "In order to allow git clone via http we don't redirect everything": "",
-    "should change /etc/nginx/sites-available/${GIT_DOMAIN_NAME} to redirect everything over https.": ""
+    "Restore of Gogs complete": ""
 }

+ 18 - 0
locale/ar/freedombone-app-htmly.json

@@ -0,0 +1,18 @@
+{
+    "Change htmly avatar": "",
+    "Freedombone Control Panel": "",
+    "Enter a URL for an image. It should be approximately a square image.": "",
+    "Your htmly avatar has been changed": "",
+    "Restoring htmly installation": "",
+    "No content directory found after restoring htmly": "",
+    "Backing up htmly": "",
+    "Backup of htmly complete": "",
+    "Htmly domain specified but not found in $temp_backup_dir": "",
+    "Restoring htmly installation $HTMLY_DOMAIN_NAME": "",
+    "Restore of htmly complete": "",
+    "Your htmly username: $MY_USERNAME": "",
+    "Your htmly password is: $HTMLY_ADMIN_PASSWORD": "",
+    "Log into your htmly at https://$HTMLY_DOMAIN_NAME/login": "",
+    "Htmly onion domain: ${HTMLY_ONION_HOSTNAME}": "",
+    "Log into your htmly at https://${HTMLY_ONION_HOSTNAME}/login": ""
+}

+ 0 - 7
locale/ar/freedombone-app-hubzilla.json

@@ -13,13 +13,6 @@
     "Choose an operation:": "",
     "Set channel directory server": "",
     "Back to main menu": "",
-    "Freedombone Configuration": "",
-    "Hubzilla Configuration": "",
-    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Domain:": "",
-    "Code:": "",
-    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Domain name validation": "",
     "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": "",

+ 0 - 2
locale/ar/freedombone-app-ipfs.json

@@ -1,6 +1,4 @@
 {
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring IPFS": "",
     "Restore of IPFS complete": "",
     "Backing up IPFS": "",

+ 1 - 2
locale/ar/freedombone-app-irc.json

@@ -9,6 +9,5 @@
     "Set a password for all IRC users": "",
     "Show current IRC login password": "",
     "Exit": "",
-    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
-    "IRC Server": ""
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": ""
 }

+ 4 - 0
locale/ar/freedombone-app-jitsi.json

@@ -0,0 +1,4 @@
+{
+    "Jitsi ${jitsi_subdomain_name} onion domain: ${new_domain}": "",
+    "Jitsi onion domain: ${JITSI_ONION_HOSTNAME}": ""
+}

+ 3 - 0
locale/ar/freedombone-app-pelican.json

@@ -0,0 +1,3 @@
+{
+    "Freedombone Blog": ""
+}

+ 34 - 0
locale/ar/freedombone-app-pihole.json

@@ -0,0 +1,34 @@
+{
+    "Ad Blocker Upstream DNS": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Pause Ad Blocker": "",
+    "Ad blocking is paused": "",
+    "Resume Ad Blocker": "",
+    "Ad blocking has resumed": "",
+    "Freedombone Control Panel": "",
+    "Ad Blocker": "",
+    "Choose an operation:": "",
+    "Edit ads list": "",
+    "Edit blacklisted domain names": "",
+    "Edit whitelisted domain names": "",
+    "Change upstream DNS servers": "",
+    "Pause blocker": "",
+    "Resume blocker": "",
+    "Exit": ""
+}

+ 14 - 0
locale/ar/freedombone-app-postactiv.json

@@ -0,0 +1,14 @@
+{
+    "Freedombone Configuration": "",
+    "PostActiv Configuration": "",
+    "\\nPlease enter your postactiv details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
+    "Domain:": "",
+    "Code:": "",
+    "Domain name validation": "",
+    "postactiv domain specified but not found in ${temp_backup_dir}": "",
+    "postactiv": "",
+    "Postactiv administrator": "",
+    "Postactiv administrator nickname: $MY_USERNAME": "",
+    "Postactiv administrator password: $POSTACTIV_ADMIN_PASSWORD": "",
+    "Postactiv onion domain: ${POSTACTIV_ONION_HOSTNAME}": ""
+}

+ 0 - 2
locale/ar/freedombone-app-syncthing.json

@@ -21,8 +21,6 @@
     "Remove an ID for another machine or device": "",
     "Manually edit device IDs": "",
     "Back to main menu": "",
-    "Backing up syncthing": "",
-    "Backup to syncthing complete": "",
     "Backing up syncthing files for $USERNAME": "",
     "Restoring syncthing configuration": "",
     "Restoring syncthing shared files": "",

+ 0 - 2
locale/ar/freedombone-app-tahoelafs.json

@@ -1,6 +1,4 @@
 {
-    "Backing up Tahoe-LAFS introducer": "",
-    "Backup to $dest_directory complete": "",
     "Restoring Tahoe-LAFS introducer": "",
     "Restore complete": ""
 }

+ 4 - 0
locale/ar/freedombone-app-vim.json

@@ -0,0 +1,4 @@
+{
+    "Backing up Vim config for $USERNAME": "",
+    "Restoring Vim config for $USERNAME": ""
+}

+ 2 - 2
locale/ar/freedombone-app-webmail.json

@@ -3,7 +3,7 @@
     "Backing up webmail complete": "",
     "Restoring webmail": "",
     "Restore of webmail complete": "",
-    "Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
-    "Open http://$WEBMAIL_ONION_HOSTNAME": "",
+    "To access webmail open https://$DEFAULT_DOMAIN_NAME/webmail/index.php": "",
+    "To access webmail open http://$WEBMAIL_ONION_HOSTNAME": "",
     "MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD": ""
 }

+ 0 - 2
locale/ar/freedombone-app-xmpp.json

@@ -1,6 +1,4 @@
 {
-    "Backing up $source_directory to $dest_directory": "",
-    "Backup to $dest_directory complete": "",
     "Restoring xmpp settings": "",
     "Restore of xmpp settings complete": "",
     "Backing up the xmpp settings": "",

+ 2 - 16
locale/ar/freedombone-backup-local.json

@@ -1,21 +1,11 @@
 {
-    "Please attach a USB drive": "",
-    "There was a problem mounting the USB drive to $USB_MOUNT": "",
-    "Unable to unmount the drive. This means that the backup did not work": "",
-    "Unmount encrypted USB": "",
-    "Backup to USB drive is complete. You can now unplug it.": "",
-    "No MariaDB password was given": "",
-    "Obtaining ${1} database backup": "",
-    "${1} database could not be saved": "",
-    "WARNING: directory does not exist: ${1}": "",
-    "Backup key could not be found": "",
     "There was a problem making the directory $USB_MOUNT/backup.": "",
     "Less than 5% of space remaining on backup drive": "",
     "Backing up gpg keys for $USERNAME": "",
     "Backing up personal settings for $USERNAME": "",
     "Backing up ssh keys for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
-    "Backing up syncthing files for $USERNAME": "",
+    "Backing up Emacs config for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
     "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
@@ -29,10 +19,6 @@
     "Backing up $source_directory to $dest_directory": "",
     "Backing up ${PROJECT_NAME} configuration files": "",
     "Backing up README": "",
-    "Backing up VoIP settings": "",
     "Unable to backup mysql settings": "",
-    "Backing up some additional directories": "",
-    "WARNING: The backup directory $destination_dir is already used.": "",
-    "Choose a different destination name for backing up $backup_dir": "",
-    "WARNING: Directory $backup_dir does not exist": ""
+    "Backup to USB drive is complete. You can now unplug it.": ""
 }

+ 1 - 28
locale/ar/freedombone-backup-remote.json

@@ -1,10 +1,5 @@
 {
     "Creating backup key": "",
-    "Backup key could not be found": "",
-    "No MariaDB password was given": "",
-    "${1} database could not be saved": "",
-    "Unable to export ${1} database": "",
-    "${PROJECT_NAME} backup to friends": "",
     "Backing up ${PROJECT_NAME} configuration files": "",
     "Backing up personal settings for $USERNAME": "",
     "Backing up gpg keys for $USERNAME": "",
@@ -23,32 +18,10 @@
     "Backing up emails for $USERNAME": "",
     "Backing up Lets Encrypt settings": "",
     "Backing up Tor settings": "",
-    "Backing up RSS reader installation": "",
-    "RSS reader domain specified but not found in /etc/share/ttrss}": "",
-    "Backing up GNU social installation": "",
-    "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
-    "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
-    "Backing up syncthing configuration": "",
-    "Backing up syncthing shared files": "",
-    "Backing up Mediagoblin": "",
-    "Obtaining Gogs settings backup": "",
-    "Obtaining Gogs repos backup": "",
-    "Obtaining Gogs authorized_keys backup": "",
-    "Backing up wiki": "",
-    "Backing up blog": "",
-    "Blog domain specified but not found in /var/www/${FULLBLOG_DOMAIN_NAME}": "",
     "Backing up certificates": "",
     "Backing up the public mailing list": "",
-    "Backing up the XMPP settings": "",
     "Backing up web settings": "",
     "Backing up README": "",
-    "Backing up IPFS": "",
-    "Backing up DLNA cache": "",
-    "Backing up VoIP settings": "",
     "Unable to backup MariaDB settings": "",
-    "Unable to export database settings": "",
-    "Backing up some additional directories": "",
-    "WARNING: The backup directory $destination_dir is already used.": "",
-    "Choose a different destination name for backing up $backup_dir": "",
-    "WARNING: Directory $backup_dir does not exist": ""
+    "Unable to export database settings": ""
 }

+ 6 - 0
locale/ar/freedombone-base-chaoskey.json

@@ -0,0 +1,6 @@
+{
+    "chaoskey tarball: $CHAOSKEY_TARBALL": "",
+    "Hash does not match. This could indicate that the tarball has been tampered with.": "",
+    "chaoskey expected tarball hash: $CHAOSKEY_HASH": "",
+    "chaoskey actual hash: $hash": ""
+}

+ 0 - 1
locale/ar/freedombone-base-email.json

@@ -6,7 +6,6 @@
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
     "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
-    "Email import directory $IMPORT_MAILDIR not found": "",
     "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
     "No Tor installation found. ${onion_service_name} onion site cannot be configured.": "",
     "Added onion site for ${onion_service_name}": "",

+ 94 - 142
locale/ar/freedombone-config.json

@@ -1,19 +1,101 @@
 {
-    "<h1>Welcome to \\$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>": "",
+    "<h1>Welcome to \\$GNUSOCIAL_DOMAIN_NAME – a federated social network</h1><p>Another $PROJECT_NAME site</p>": "",
     "${PROJECT_NAME}-config -f [config filename] -m [min password length]": "",
+    "Freedombone Configuration": "",
+    "Your email address": "",
+    "Your main domain name": "",
+    "\\nWhich domain name should your email/XMPP/IRC/Mumble be associated with?": "",
+    "Domain:": "",
+    "Code:": "",
+    "mail subdomain Code:": "",
+    "XMPP subdomain Code:": "",
+    "Which domain name should your email/XMPP/IRC/Mumble be associated with?": "",
+    "Domain name validation": "",
+    "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.": "",
+    "Pick a domain name service (DNS):": "",
+    "Digital Courage": "",
+    "German Privacy Foundation 1": "",
+    "German Privacy Foundation 2": "",
+    "Chaos Computer Club": "",
+    "ClaraNet": "",
+    "OpenNIC 1": "",
+    "OpenNIC 2": "",
+    "OpenNIC 3": "",
+    "OpenNIC 4": "",
+    "OpenNIC 5": "",
+    "OpenNIC 6": "",
+    "OpenNIC 7": "",
+    "PowerNS": "",
+    "ValiDOM": "",
+    "Freie Unzensierte": "",
+    "Google": "",
+    "Where to download Debian packages from:": "",
+    "Australia": "",
+    "Austria": "",
+    "Belarus": "",
+    "Belgium": "",
+    "Bosnia and Herzegovina": "",
+    "Brazil": "",
+    "Bulgaria": "",
+    "Canada": "",
+    "Chile": "",
+    "China": "",
+    "Croatia": "",
+    "Czech Republic": "",
+    "Denmark": "",
+    "El Salvador": "",
+    "Estonia": "",
+    "Finland": "",
+    "France 1": "",
+    "France 2": "",
+    "Germany 1": "",
+    "Germany 2": "",
+    "Greece": "",
+    "Hungary": "",
+    "Iceland": "",
+    "Iran": "",
+    "Ireland": "",
+    "Italy": "",
+    "Japan": "",
+    "Korea": "",
+    "Lithuania": "",
+    "Mexico": "",
+    "Netherlands": "",
+    "New Caledonia": "",
+    "New Zealand": "",
+    "Norway": "",
+    "Poland": "",
+    "Portugal": "",
+    "Romania": "",
+    "Russia": "",
+    "Slovakia": "",
+    "Slovenia": "",
+    "Spain": "",
+    "Sweden": "",
+    "Switzerland": "",
+    "Taiwan": "",
+    "Thailand": "",
+    "Turkey": "",
+    "Ukraine": "",
+    "United Kingdom": "",
+    "United States": "",
+    "Type of Random Number Generator:": "",
+    "OneRNG Device": "",
+    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
+    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
+    "Social Key Management": "",
+    "Username": "",
+    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
+    "Don't use the default user account": "",
+    "The directory /home/$MY_USERNAME does not exist": "",
+    "Your full name (or nick)": "",
+    "Type of Installation": "",
     "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
     "Invalid FreeDNS Code": "",
-    "Encryption keys": "",
-    "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "",
-    "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "",
-    "GPG Keyring loaded to $HOME_DIR": "",
-    "ssh keys imported": "",
-    "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "",
-    "Freedombone Configuration": "",
-    "GPG/PGP keys for your system:": "",
-    "Generate new keys (new user)": "",
-    "Import keys from USB drive/s": "",
-    "Retrieve keys from friends servers": "",
     "Freedombone Control Panel": "",
     "Main Repository (Mirrors)": "",
     "If you don't know what this means then just select Ok.\\n\\nIf you don't wish to use the default repositories they can be obtained from mirrored repos on another ${PROJECT_NAME} system.\\n\\nThe repositories are for applications which are not yet packaged for Debian.": "",
@@ -96,135 +178,5 @@
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE.": "",
     "Freedombone": "",
-    "Type of Installation:": "",
-    "Full": "",
-    "Writer": "",
-    "Cloud": "",
-    "Chat": "",
-    "Mailbox": "",
-    "Non-Mailbox": "",
-    "Social": "",
-    "Media": "",
-    "Developer": "",
-    "Mesh (router)": "",
-    "Mesh (user device)": "",
-    "Wireless Mesh ESSID\\n\\nIf you press enter the default will be '$WIFI_SSID'": "",
-    "Give your mesh peer a name": "",
-    "Wifi Channel (spaced to be non-overlapping):": "",
-    "Username": "",
-    "Set your username for the system\\n\\nYour username should not contain any spaces": "",
-    "Don't use the default user account": "",
-    "The directory /home/$MY_USERNAME does not exist": "",
-    "Your full name (or nick)": "",
-    "Install Target": "",
-    "\\nAre you installing onto a Beaglebone Black?": "",
-    "\\nDo you wish to enable social key management, otherwise known as \\\"the unforgettable key\\\"?\\n\\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \\\"no\\\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient.": "",
-    "Social Key Management": "",
-    "Type of Random Number Generator:": "",
-    "OneRNG Device": "",
-    "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation": "",
-    "Where to download Debian packages from:": "",
-    "Australia": "",
-    "Austria": "",
-    "Belarus": "",
-    "Belgium": "",
-    "Bosnia and Herzegovina": "",
-    "Brazil": "",
-    "Bulgaria": "",
-    "Canada": "",
-    "Chile": "",
-    "China": "",
-    "Croatia": "",
-    "Czech Republic": "",
-    "Denmark": "",
-    "El Salvador": "",
-    "Estonia": "",
-    "Finland": "",
-    "France 1": "",
-    "France 2": "",
-    "Germany 1": "",
-    "Germany 2": "",
-    "Greece": "",
-    "Hungary": "",
-    "Iceland": "",
-    "Iran": "",
-    "Ireland": "",
-    "Italy": "",
-    "Japan": "",
-    "Korea": "",
-    "Lithuania": "",
-    "Mexico": "",
-    "Netherlands": "",
-    "New Caledonia": "",
-    "New Zealand": "",
-    "Norway": "",
-    "Poland": "",
-    "Portugal": "",
-    "Romania": "",
-    "Russia": "",
-    "Slovakia": "",
-    "Slovenia": "",
-    "Spain": "",
-    "Sweden": "",
-    "Switzerland": "",
-    "Taiwan": "",
-    "Thailand": "",
-    "Turkey": "",
-    "Ukraine": "",
-    "United Kingdom": "",
-    "United States": "",
-    "Pick a domain name service (DNS):": "",
-    "Digital Courage": "",
-    "German Privacy Foundation 1": "",
-    "German Privacy Foundation 2": "",
-    "Chaos Computer Club": "",
-    "ClaraNet": "",
-    "OpenNIC 1": "",
-    "OpenNIC 2": "",
-    "OpenNIC 3": "",
-    "OpenNIC 4": "",
-    "OpenNIC 5": "",
-    "OpenNIC 6": "",
-    "OpenNIC 7": "",
-    "PowerNS": "",
-    "ValiDOM": "",
-    "Freie Unzensierte": "",
-    "Google": "",
-    "Choose Dynamic DNS provider:": "",
-    "Dynamic DNS provider username": "",
-    "Dynamic DNS provider password": "",
-    "Password quality check": "",
-    "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site.": "",
-    "Static local IP address": "",
-    "\\nDo you want to set a static local IP address for this system?\\n\\nFor example, 192.168.1.10": "",
-    "Local Network Configuration": "",
-    "\\nPlease enter the IP addresses:": "",
-    "This system:": "",
-    "Internet router:": "",
-    "Wiki Configuration": "",
-    "\\nPlease enter your wiki details:": "",
-    "Title:": "",
-    "Domain:": "",
-    "Code:": "",
-    "Domain name validation": "",
-    "Blog Configuration": "",
-    "\\nPlease enter your blog details:": "",
-    "Mediagoblin Configuration": "",
-    "\\nPlease enter your Mediagoblin details, or just select Ok if you don't need a Mediagoblin site:": "",
-    "Media Server Configuration": "",
-    "\\nPlease enter your Media Server details, or just select Ok if you don't need a Media Server site:": "",
-    "Hubzilla Configuration": "",
-    "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Microblog Configuration": "",
-    "\\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "",
-    "Welcome Message:": "",
-    "Background image URL:": "",
-    "Developer Configuration": "",
-    "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "",
-    "Your main domain name": "",
-    "\\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?": "",
-    "Which domain name should your email/XMPP/IRC/VoIP be associated with?": "",
-    "Your email address": "",
     "Configuration filename:": ""
 }

+ 10 - 30
locale/ar/freedombone-controlpanel-user.json

@@ -25,6 +25,14 @@
     "No email address was given": "",
     "No folder name was given": "",
     "Email rule for $RULE_EMAIL was added": "",
+    "Trust a PGP/GPG key or website domain": "",
+    "Set the trust level for $TRUST_ADDRESS:": "",
+    "I don't know or won't say": "",
+    "I do NOT trust": "",
+    "I trust marginally": "",
+    "I trust fully": "",
+    "I trust ultimately": "",
+    "$TRUST_ADDRESS was set to trust level ${TRUST_LEVEL}": "",
     "When email arrives with subject containing:": "",
     "No subject text was given": "",
     "Email rule for subject '$RULE_SUBJECT' was added": "",
@@ -71,33 +79,11 @@
     "Port:": "",
     "Username:": "",
     "Password:": "",
-    "# The ${PROJECT_NAME} syncthing ID is: $SYNCTHING_ID": "",
-    "Device ID for ${PROJECT_NAME}": "",
-    "In a desktop terminal press shift and select the ID below,\\nthen right click and copy.\\n\\nWithin Connectbot select Menu/Copy and then highlight the ID below\\n\\n$SYNCTHING_ID": "",
-    "Add a Syncthing device ID": "",
-    "Paste the device ID for your laptop/desktop/netbook/phone/tablet below": "",
-    "Device ID:": "",
-    "Description (optional):": "",
-    "That doesn't look like a device ID": "",
-    "That ID has already been added": "",
-    "The ID was added": "",
-    "Remove a Syncthing device ID": "",
-    "Paste the device ID which is to be removed below": "",
-    "That ID wasn't registered anyway": "",
-    "The ID was removed": "",
     "Sign a PGP/GPG key or website domain": "",
     "Enter the Key ID, address or domain to be signed.\\n\\nIf you are signing a website domain then include the https:// at the beginning.\\n\\nIf you are signing an ssh key then include ssh:// before the domain name.": "",
     "Sign a PGP/GPG key": "",
     "$SIGN_ADDRESS was signed": "",
-    "Trust a PGP/GPG key or website domain": "",
     "Enter the Key ID, address or domain to be trusted.\\n\\nIf you are trusting a website domain then include the https:// at the beginning.\\n\\nIf you are trusting an ssh key then include ssh:// before the domain name.": "",
-    "Set the trust level for $TRUST_ADDRESS:": "",
-    "I don't know or won't say": "",
-    "I do NOT trust": "",
-    "I trust marginally": "",
-    "I trust fully": "",
-    "I trust ultimately": "",
-    "$TRUST_ADDRESS was set to trust level ${TRUST_LEVEL}": "",
     "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
@@ -111,19 +97,13 @@
     "Add an email rule for a subject": "",
     "Block or unblock an email address": "",
     "Block or unblock email with subject text": "",
-    "File Synchronization": "",
-    "Show device ID for ${PROJECT_NAME}": "",
-    "Add an ID for another machine or device": "",
-    "Remove an ID for another machine or device": "",
-    "Manually edit device IDs": "",
     "Monkeysphere sign server keys": "",
     "Freedombone Security Configuration": "",
     "\\nMonkeysphere has been enabled and you will need to sign and trust the server keys. Do you want to do that now?": "",
+    "Freedombone": "",
+    "Run an App": "",
     "User Control Panel": "",
     "Use Email": "",
-    "Use Tox Chat": "",
-    "Use XMPP Chat": "",
-    "Use IRC": "",
     "Browse the Web": "",
     "Set an outgoing email proxy": "",
     "Administrator controls": "",

+ 54 - 87
locale/ar/freedombone-controlpanel.json

@@ -21,12 +21,6 @@
     "This does not look like an ssh public key": "",
     "Select User": "",
     "Select one of the following:": "",
-    "SMTP Proxy for $ADMIN_USER": "",
-    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
-    "Enable proxy:": "",
-    "Protocol (smtp/smtps):": "",
-    "ISP mail server:": "",
-    "Port:": "",
     "Administrator user": "",
     "You can't delete the administrator user": "",
     "No Administrator user found. Check $COMPLETION_FILE": "",
@@ -36,12 +30,6 @@
     "New password for user $SELECTED_USERNAME": "",
     "The password should be ${MINIMUM_PASSWORD_LENGTH} or more characters": "",
     "Password for $SELECTED_USERNAME was changed": "",
-    "IRC Password": "",
-    "Password for all IRC users, or press Enter for no password": "",
-    "The IRC password was changed": "",
-    "Change blog avatar": "",
-    "Enter a URL for an image. It should be approximately a square image.": "",
-    "Your blog avatar has been changed": "",
     "Change ssh public key": "",
     "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "",
     "Change ssh public key for $SELECTED_USERNAME": "",
@@ -82,41 +70,19 @@
     "Plug in a LUKS encrypted USB drive": "",
     "USB Fragment Keydrive": "",
     "Backup data to USB": "",
-    "Restore from USB backup": "",
-    "Choose an application to restore:": "",
-    "Everything": "",
-    "Return to the backup and restore menu": "",
-    "Configuration files": "",
-    "MariaDB settings": "",
-    "Let's Encrypt account": "",
-    "Mutt email client settings": "",
-    "GPG keys": "",
-    "Email processing rules": "",
-    "Spam filtering rules": "",
-    "Administrator's README file": "",
-    "IPFS": "",
-    "SSH keys": "",
-    "User configuration files": "",
-    "User local files": "",
-    "User fin files": "",
-    "SSL/TLS certificates": "",
-    "Personal settings": "",
-    "Mailing List": "",
-    "XMPP chat": "",
-    "GNU Social": "",
-    "Hubzilla": "",
-    "Syncthing": "",
-    "Gogs": "",
-    "Wiki": "",
-    "Blog": "",
-    "CJDNS": "",
-    "Email": "",
-    "DLNA": "",
-    "VoIP": "",
-    "RSS reader": "",
-    "Tox": "",
-    "Mediagoblin": "",
-    "Restore from ${remote_domain_name}": "",
+    "Detected USB drive $USB_DRIVE": "",
+    "all": "",
+    "Exit": "",
+    "Restore apps": "",
+    "Restore apps from USB drive $USB_DRIVE": "",
+    "Freedombone": "",
+    "Restore all apps from USB": "",
+    "Restore failed with code $retcode": "",
+    "Restore all apps from $1": "",
+    "Restore complete": "",
+    "Restore apps from USB": "",
+    "Restore of ${app_name} failed with code $retcode": "",
+    "Restore apps from $1": "",
     "Restore data from USB": "",
     "Plug in your backup USB drive": "",
     "Restore data from remote server": "",
@@ -131,25 +97,10 @@
     "\\nDo you want to turn logging on?": "",
     "Restore GPG key for user": "",
     "Plug in your USB keydrive": "",
-    "Renew SSL certificate": "",
-    "\\nThis will renew a letsencrypt certificate. Select 'yes' to continue": "",
-    "Hubzilla install directory not found": "",
-    "Hubzilla certificate has been renewed": "",
-    "Hubzilla channel directory server": "",
-    "Hubzilla is not installed on this system": "",
-    "When you click on 'channel directory' this is where Hubzilla will obtain its list from": "",
-    "Invalid domain - include the https://": "",
-    "Domain channel directory server changed to $hubzilla_domain_server": "",
-    "Format a USB drive (LUKS encrypted)": "",
-    "Choose a drive:": "",
-    "sda (Beaglebone Black)": "",
-    "sdb": "",
-    "sdc": "",
-    "sdd": "",
-    "Back to Backup and Restore menu": "",
-    "Format USB drive": "",
-    "\\nPlease confirm that you wish to format drive\\n\\n    ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
-    "Remove backups from a USB drive": "",
+    "Format USB drive $USB_DRIVE": "",
+    "\\nPlease confirm that you wish to format drive\\n\\n    ${USB_DRIVE}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "",
+    "Formatting drive $USB_DRIVE. ALL CONTENTS WILL BE LOST.": "",
+    "Remove backups from a USB drive $USB_DRIVE": "",
     "\\nPlease confirm that you wish to remove backups from this drive\\n\\n    ${drive}\\n\\nYou will not be able to recover them afterwards.": "",
     "Power off the system": "",
     "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "",
@@ -158,16 +109,19 @@
     "Change the name of this system": "",
     "New local network name": "",
     "The name of this system on your local network was changed successfully": "",
-    "Set the TLS date/time source": "",
-    "Enter a domain name to use as a TLS time source.\\n\\nFactors to consider when choosing a source are whether you wish that site to know that your system is 'alive' and also what might happen if an adversary were to try to mess with the date/time from that domain (i.e. how much blowback would there be).": "",
-    "Don't include the 'https'": "",
-    "That doesn't look like a domain name": "",
+    "Return to using a dynamic IP address": "",
+    "\\nDo you wish to go back to using a dynamic IP address?": "",
+    "System is rebooting. You may need to close this terminal and log in from a new one.": "",
     "Set a static local IP address": "",
-    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be 192.168.1.x": "",
+    "In order to forward incoming internet traffic to this system most internet routers need to know a static local IP address to send the data to.\\n\\n\nEnter a static local IP address for this system.\\n\\nIt will typically be ${IPv4_address_base}.x\\n\\nIf you leave this field blank then the system will revert to using a dynamic IP address.": "",
     "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 ${IPv4_address_base}.1, ${IPv4_address_base}.254, or similar": "",
+    "Static local IP address": "",
+    "\\nSet a static address for the wifi adapter?\\n\\nIf you select 'no' then wired ethernet will be used.": "",
+    "\\nFor the change to take effect your system will now need to reboot. Do this now?": "",
     "Wifi Settings": "",
-    "Wifi settings were changed": "",
+    "Wifi settings were changed.": "",
+    "Wifi settings were changed. You will need to restart the system with ethernet cable removed for the changes to take effect.": "",
     "Hotspot Settings": "",
     "Enabled (yes/no):": "",
     "SSID:": "",
@@ -176,54 +130,67 @@
     "No wifi hotspot passphrase was given": "",
     "Wifi hotspot passphrase was too short": "",
     "Hotspot settings were changed": "",
+    "Reinstall MariaDB": "",
+    "\\nThis should be a LAST RESORT, if the mysql daemon won't start. You will lose ALL databases and will then need to restore them from backup.\\n\\nAre you sure that you wish to continue?": "",
+    "MariaDB has been reinstalled": "",
+    "Firewall Settings": "",
+    "Email Domains": "",
+    "Enter the list of email domains to use, separated by semicolons": "",
+    "Email domains were changed": "",
+    "Email Domains not set": "",
+    "There should be no spaces in the list": "",
+    "SMTP Proxy for $ADMIN_USER": "",
+    "You may need to proxy outgoing email via your ISP's mail server. If so enter the details below.": "",
+    "Enable proxy:": "",
+    "Protocol (smtp/smtps):": "",
+    "ISP mail server:": "",
+    "Port:": "",
     "Backup and Restore": "",
     "Choose an operation:": "",
     "Backup data to USB drive": "",
     "Restore GPG key from USB keydrive": "",
     "Restore data from USB drive": "",
+    "Reinstall mariadb": "",
     "Configure remote backups": "",
     "Restore from remote backup": "",
     "Backup GPG key to USB (master keydrive)": "",
     "Backup GPG key to USB (fragment keydrive)": "",
+    "Format a USB drive (LUKS encrypted)": "",
+    "Remove backups from a USB drive": "",
     "Back to main menu": "",
-    "Email Filtering Rules": "",
+    "Email Menu": "",
     "Add a user to a mailing list": "",
     "Remove a user from a mailing list": "",
     "Add an email rule": "",
     "Block/Unblock an email address": "",
     "Block/Unblock email with subject text": "",
+    "Outgoing Email Proxy": "",
+    "Extra email domains": "",
     "Manage Users": "",
     "Add a user": "",
     "Delete a user": "",
     "Change user password": "",
     "Change user ssh public key": "",
-    "Set channel directory server": "",
-    "Media Menu": "",
-    "Attach a drive containing playable media": "",
-    "Remove a drive containing playable media": "",
-    "Exit": "",
     "Enable Wifi": "",
     "\\nDo you wish to enable wifi?": "",
+    "Wifi": "",
+    "No wifi adaptors were detected": "",
     "Wifi Menu": "",
     "${status_str}\\n\\nChoose an operation:": "",
     "Enable or disable Wifi": "",
     "Configure wifi networks": "",
     "Manually edit wifi networks file": "",
     "Hotspot settings": "",
-    "IRC Menu": "",
-    "No IRC server is installed": "",
-    "Set a password for all IRC users": "",
-    "Show current IRC login password": "",
+    "Change Settings for an App": "",
     "Control Panel": "",
     "About this system": "",
+    "Show Firewall": "",
     "Reset Tripwire": "",
+    "App Settings": "",
+    "Add/Remove Apps": "",
     "Logging on/off": "",
     "Ping enable/disable": "",
-    "Outgoing Email Proxy": "",
     "Security Settings": "",
     "Set the main repository (repo mirrors)": "",
-    "Media menu": "",
-    "IRC menu": "",
-    "Change your blog avatar": "",
     "Wifi menu": ""
 }

+ 4 - 9
locale/ar/freedombone-image-customise.json

@@ -1,19 +1,14 @@
 {
+    "Freedombone Mesh": "",
+    "Welcome to the Freedombone mesh.\\n\\nThe first thing you will need to do is set a username so that other peers can find you.": "",
     "info: Adding apt config to call dpkg via eatmydata": "",
     "error: unable to find /usr/bin/eatmydata after installing the eatmydata package": "",
     "info: Removing apt config to call dpkg via eatmydata": "",
     "warning: missing $rootdir$override": "",
-    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n\t\t\t\t\tInitial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n\tsudo su\n\t${PROJECT_NAME} menuconfig\n\n": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Initial base install\n\nYour system is not yet installed. To complete the process run the\nfollowing commands, then enter your details.\n\n    sudo su\n    ${PROJECT_NAME} menuconfig\n\n": "",
+    "\n .---.                  .              .\n |                      |              |\n |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.\n |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'\n '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'\n\n                    Freedom in the Mesh\n": "",
     "Using ssh public key:": "",
     "Install failed. Press x to continue...": "",
-    "Toxcore compile failed at $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "Toxcore compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "File not found /usr/local/bin/tox-bootstrapd": "",
-    "Account to run Tox's DHT bootstrap daemon": "",
-    "Unable to install toxid, returned $?": "",
-    "Toxic client compile failed at $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
-    "Tox client was not installed to $TOXIC_FILE": "",
-    "Toxic client compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed.": "",
     "warning: creating initial user $username with well known password!": "",
     "info: killing leftover processes in chroot": ""
 }

+ 2 - 18
locale/ar/freedombone-image-mesh.json

@@ -1,21 +1,5 @@
 {
     "avahi name changed to P${PEER_ID}.local": "",
-    "Regenerating ssh host keys": "",
-    "zeronet daemon updated to P${PEER_ID}.local": "",
-    "Address:    $ZERONET_BLOG_ADDRESS": "",
-    "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
-    "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS": "",
-    "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY": "",
-    "Address:    $ZERONET_MAIL_ADDRESS": "",
-    "Public key: $ZERONET_MAIL_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
-    "ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS": "",
-    "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
-    "Address:    $ZERONET_FORUM_ADDRESS": "",
-    "Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
-    "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
-    "Forum address:     $ZERONET_FORUM_ADDRESS": "",
-    "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
-    "Home directory for $DEFAULT_USERNAME not found": ""
+    "new": "",
+    "amnesic": ""
 }