diff --git a/locale/af/freedombone-backup-local.json b/locale/af/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/af/freedombone-backup-local.json
+++ b/locale/af/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/af/freedombone-backup-remote.json b/locale/af/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/af/freedombone-backup-remote.json
+++ b/locale/af/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/af/freedombone-client.json b/locale/af/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/af/freedombone-client.json
+++ b/locale/af/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone-controlpanel-user.json b/locale/af/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/af/freedombone-controlpanel-user.json
+++ b/locale/af/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/af/freedombone-restore-local.json b/locale/af/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/af/freedombone-restore-local.json
+++ b/locale/af/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/af/freedombone-restore-remote.json b/locale/af/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/af/freedombone-restore-remote.json
+++ b/locale/af/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/af/freedombone-sec.json b/locale/af/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/af/freedombone-sec.json
+++ b/locale/af/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/af/freedombone.json b/locale/af/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/af/freedombone.json
+++ b/locale/af/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone-backup-local.json b/locale/ar/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ar/freedombone-backup-local.json
+++ b/locale/ar/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ar/freedombone-backup-remote.json b/locale/ar/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ar/freedombone-backup-remote.json
+++ b/locale/ar/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ar/freedombone-client.json b/locale/ar/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ar/freedombone-client.json
+++ b/locale/ar/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone-controlpanel-user.json b/locale/ar/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ar/freedombone-controlpanel-user.json
+++ b/locale/ar/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ar/freedombone-restore-local.json b/locale/ar/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ar/freedombone-restore-local.json
+++ b/locale/ar/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ar/freedombone-restore-remote.json b/locale/ar/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ar/freedombone-restore-remote.json
+++ b/locale/ar/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ar/freedombone-sec.json b/locale/ar/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ar/freedombone-sec.json
+++ b/locale/ar/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ar/freedombone.json b/locale/ar/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ar/freedombone.json
+++ b/locale/ar/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone-backup-local.json b/locale/be/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/be/freedombone-backup-local.json
+++ b/locale/be/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/be/freedombone-backup-remote.json b/locale/be/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/be/freedombone-backup-remote.json
+++ b/locale/be/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/be/freedombone-client.json b/locale/be/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/be/freedombone-client.json
+++ b/locale/be/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone-controlpanel-user.json b/locale/be/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/be/freedombone-controlpanel-user.json
+++ b/locale/be/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/be/freedombone-restore-local.json b/locale/be/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/be/freedombone-restore-local.json
+++ b/locale/be/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/be/freedombone-restore-remote.json b/locale/be/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/be/freedombone-restore-remote.json
+++ b/locale/be/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/be/freedombone-sec.json b/locale/be/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/be/freedombone-sec.json
+++ b/locale/be/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/be/freedombone.json b/locale/be/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/be/freedombone.json
+++ b/locale/be/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone-backup-local.json b/locale/bg/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/bg/freedombone-backup-local.json
+++ b/locale/bg/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/bg/freedombone-backup-remote.json b/locale/bg/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/bg/freedombone-backup-remote.json
+++ b/locale/bg/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/bg/freedombone-client.json b/locale/bg/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/bg/freedombone-client.json
+++ b/locale/bg/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone-controlpanel-user.json b/locale/bg/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/bg/freedombone-controlpanel-user.json
+++ b/locale/bg/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/bg/freedombone-restore-local.json b/locale/bg/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/bg/freedombone-restore-local.json
+++ b/locale/bg/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/bg/freedombone-restore-remote.json b/locale/bg/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/bg/freedombone-restore-remote.json
+++ b/locale/bg/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/bg/freedombone-sec.json b/locale/bg/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/bg/freedombone-sec.json
+++ b/locale/bg/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/bg/freedombone.json b/locale/bg/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/bg/freedombone.json
+++ b/locale/bg/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone-backup-local.json b/locale/bs/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/bs/freedombone-backup-local.json
+++ b/locale/bs/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/bs/freedombone-backup-remote.json b/locale/bs/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/bs/freedombone-backup-remote.json
+++ b/locale/bs/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/bs/freedombone-client.json b/locale/bs/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/bs/freedombone-client.json
+++ b/locale/bs/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone-controlpanel-user.json b/locale/bs/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/bs/freedombone-controlpanel-user.json
+++ b/locale/bs/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/bs/freedombone-restore-local.json b/locale/bs/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/bs/freedombone-restore-local.json
+++ b/locale/bs/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/bs/freedombone-restore-remote.json b/locale/bs/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/bs/freedombone-restore-remote.json
+++ b/locale/bs/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/bs/freedombone-sec.json b/locale/bs/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/bs/freedombone-sec.json
+++ b/locale/bs/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/bs/freedombone.json b/locale/bs/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/bs/freedombone.json
+++ b/locale/bs/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone-backup-local.json b/locale/ca/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ca/freedombone-backup-local.json
+++ b/locale/ca/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ca/freedombone-backup-remote.json b/locale/ca/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ca/freedombone-backup-remote.json
+++ b/locale/ca/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ca/freedombone-client.json b/locale/ca/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ca/freedombone-client.json
+++ b/locale/ca/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone-controlpanel-user.json b/locale/ca/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ca/freedombone-controlpanel-user.json
+++ b/locale/ca/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ca/freedombone-restore-local.json b/locale/ca/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ca/freedombone-restore-local.json
+++ b/locale/ca/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ca/freedombone-restore-remote.json b/locale/ca/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ca/freedombone-restore-remote.json
+++ b/locale/ca/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ca/freedombone-sec.json b/locale/ca/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ca/freedombone-sec.json
+++ b/locale/ca/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ca/freedombone.json b/locale/ca/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ca/freedombone.json
+++ b/locale/ca/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone-backup-local.json b/locale/cs/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/cs/freedombone-backup-local.json
+++ b/locale/cs/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/cs/freedombone-backup-remote.json b/locale/cs/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/cs/freedombone-backup-remote.json
+++ b/locale/cs/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/cs/freedombone-client.json b/locale/cs/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/cs/freedombone-client.json
+++ b/locale/cs/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone-controlpanel-user.json b/locale/cs/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/cs/freedombone-controlpanel-user.json
+++ b/locale/cs/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/cs/freedombone-restore-local.json b/locale/cs/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/cs/freedombone-restore-local.json
+++ b/locale/cs/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/cs/freedombone-restore-remote.json b/locale/cs/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/cs/freedombone-restore-remote.json
+++ b/locale/cs/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/cs/freedombone-sec.json b/locale/cs/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/cs/freedombone-sec.json
+++ b/locale/cs/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/cs/freedombone.json b/locale/cs/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/cs/freedombone.json
+++ b/locale/cs/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone-backup-local.json b/locale/da/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/da/freedombone-backup-local.json
+++ b/locale/da/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/da/freedombone-backup-remote.json b/locale/da/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/da/freedombone-backup-remote.json
+++ b/locale/da/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/da/freedombone-client.json b/locale/da/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/da/freedombone-client.json
+++ b/locale/da/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone-controlpanel-user.json b/locale/da/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/da/freedombone-controlpanel-user.json
+++ b/locale/da/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/da/freedombone-restore-local.json b/locale/da/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/da/freedombone-restore-local.json
+++ b/locale/da/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/da/freedombone-restore-remote.json b/locale/da/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/da/freedombone-restore-remote.json
+++ b/locale/da/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/da/freedombone-sec.json b/locale/da/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/da/freedombone-sec.json
+++ b/locale/da/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/da/freedombone.json b/locale/da/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/da/freedombone.json
+++ b/locale/da/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-backup-local.json b/locale/de/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/de/freedombone-backup-local.json
+++ b/locale/de/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/de/freedombone-backup-remote.json b/locale/de/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/de/freedombone-backup-remote.json
+++ b/locale/de/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/de/freedombone-client.json b/locale/de/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/de/freedombone-client.json
+++ b/locale/de/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-controlpanel-user.json b/locale/de/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/de/freedombone-controlpanel-user.json
+++ b/locale/de/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/de/freedombone-restore-local.json b/locale/de/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/de/freedombone-restore-local.json
+++ b/locale/de/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/de/freedombone-restore-remote.json b/locale/de/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/de/freedombone-restore-remote.json
+++ b/locale/de/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/de/freedombone-sec.json b/locale/de/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/de/freedombone-sec.json
+++ b/locale/de/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone.json b/locale/de/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/de/freedombone.json
+++ b/locale/de/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone-backup-local.json b/locale/de_du/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/de_du/freedombone-backup-local.json
+++ b/locale/de_du/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/de_du/freedombone-backup-remote.json b/locale/de_du/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/de_du/freedombone-backup-remote.json
+++ b/locale/de_du/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/de_du/freedombone-client.json b/locale/de_du/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/de_du/freedombone-client.json
+++ b/locale/de_du/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone-controlpanel-user.json b/locale/de_du/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/de_du/freedombone-controlpanel-user.json
+++ b/locale/de_du/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/de_du/freedombone-restore-local.json b/locale/de_du/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/de_du/freedombone-restore-local.json
+++ b/locale/de_du/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/de_du/freedombone-restore-remote.json b/locale/de_du/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/de_du/freedombone-restore-remote.json
+++ b/locale/de_du/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/de_du/freedombone-sec.json b/locale/de_du/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/de_du/freedombone-sec.json
+++ b/locale/de_du/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/de_du/freedombone.json b/locale/de_du/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/de_du/freedombone.json
+++ b/locale/de_du/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone-backup-local.json b/locale/el/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/el/freedombone-backup-local.json
+++ b/locale/el/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/el/freedombone-backup-remote.json b/locale/el/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/el/freedombone-backup-remote.json
+++ b/locale/el/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/el/freedombone-client.json b/locale/el/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/el/freedombone-client.json
+++ b/locale/el/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone-controlpanel-user.json b/locale/el/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/el/freedombone-controlpanel-user.json
+++ b/locale/el/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/el/freedombone-restore-local.json b/locale/el/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/el/freedombone-restore-local.json
+++ b/locale/el/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/el/freedombone-restore-remote.json b/locale/el/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/el/freedombone-restore-remote.json
+++ b/locale/el/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/el/freedombone-sec.json b/locale/el/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/el/freedombone-sec.json
+++ b/locale/el/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/el/freedombone.json b/locale/el/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/el/freedombone.json
+++ b/locale/el/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone-backup-local.json b/locale/en_us/freedombone-backup-local.json
index 9aadc479a402935d431d32e5ce2ed23dc077170d..9c081fbfb05b1b81c431ce0e827b30f1849dca8f 100644
--- a/locale/en_us/freedombone-backup-local.json
+++ b/locale/en_us/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "Backing up fin files for $USERNAME",
     "Backing up syncthing files for $USERNAME": "Backing up syncthing files for $USERNAME",
     "Backing up config files for $USERNAME": "Backing up config files for $USERNAME",
+    "Backing up monkeysphere files for $USERNAME": "Backing up monkeysphere files for $USERNAME",
     "Backing up local files for $USERNAME": "Backing up local files for $USERNAME",
     "Backing up Mutt settings for $USERNAME": "Backing up Mutt settings for $USERNAME",
     "Creating an email archive for $USERNAME": "Creating an email archive for $USERNAME",
diff --git a/locale/en_us/freedombone-backup-remote.json b/locale/en_us/freedombone-backup-remote.json
index 4319b76d5d0b8274abfce0cf817e6e5829ce5d7b..0b65fa1dc6b3e552602b0245edb2d6cad2b1c9b1 100644
--- a/locale/en_us/freedombone-backup-remote.json
+++ b/locale/en_us/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "Backing up ssh keys for $USERNAME",
     "Backing up syncthing files for $USERNAME": "Backing up syncthing files for $USERNAME",
     "Backing up config files for $USERNAME": "Backing up config files for $USERNAME",
+    "Backing up monkeysphere files for $USERNAME": "Backing up monkeysphere files for $USERNAME",
     "Backing up fin files for $USERNAME": "Backing up fin files for $USERNAME",
     "Backing up local files for $USERNAME": "Backing up local files for $USERNAME",
     "Backing up Mutt settings for $USERNAME": "Backing up Mutt settings for $USERNAME",
diff --git a/locale/en_us/freedombone-client.json b/locale/en_us/freedombone-client.json
index df5c00ade7cb95d97656e7a49514b83cb44f97a1..6ea6a7f705fd27c65917c781e48e3ac1c2f5f179 100644
--- a/locale/en_us/freedombone-client.json
+++ b/locale/en_us/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": "${PROJECT_NAME}-client"
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone-controlpanel-user.json b/locale/en_us/freedombone-controlpanel-user.json
index 1c57652242b41012deb17b0a4ee2b016f576e3b4..a1d0b7836315fef7790982bdb33d95a2bf64a638 100644
--- a/locale/en_us/freedombone-controlpanel-user.json
+++ b/locale/en_us/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "No subject was given",
     "Email with subject $BLOCK_SUBJECT is now blocked": "Email with subject $BLOCK_SUBJECT is now blocked",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "Email with subject $BLOCK_SUBJECT is now unblocked",
-    "Your PGP/GPG Key": "Your PGP/GPG Key",
+    "My PGP/GPG Key": "My PGP/GPG Key",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE",
     "Publish your PGP/GPG key": "Publish your PGP/GPG key",
     "Your key has now been published": "Your key has now been published",
+    "Refresh PGP/GPG keys": "Refresh PGP/GPG keys",
+    "Your keys have been refreshed": "Your keys have been refreshed",
     "Add someone's PGP/GPG key": "Add someone's PGP/GPG key",
     "Enter their email address below": "Enter their email address below",
     "This doesn't look like an email address": "This doesn't look like an email address",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "Paste the device ID which is to be removed below",
     "That ID wasn't registered anyway": "That ID wasn't registered anyway",
     "The ID was removed": "The ID was removed",
-    "Your Encryption Keys": "Your Encryption Keys",
+    "Sign a PGP/GPG key": "Sign a PGP/GPG key",
+    "Enter the Key ID, address or domain to be signed": "Enter the Key ID, address or domain to be signed",
+    "$SIGN_ADDRESS was signed": "$SIGN_ADDRESS was signed",
+    "My Encryption Keys": "My Encryption Keys",
     "Choose an operation:": "Choose an operation:",
     "Show your PGP/GPG key": "Show your PGP/GPG key",
     "Publish your PGP/GPG key so that others can find it": "Publish your PGP/GPG key so that others can find it",
+    "Refresh your PGP/GPG keys": "Refresh your PGP/GPG keys",
     "Back to main menu": "Back to main menu",
     "Change Email Filtering Rules": "Change Email Filtering Rules",
     "Add yourself to a mailing list": "Add yourself to a mailing list",
diff --git a/locale/en_us/freedombone-restore-local.json b/locale/en_us/freedombone-restore-local.json
index d921317865c7ef8d05f5206056f4b53fe464ac11..250bcc427c7d664fceff5e3a8f3684208fd4d519 100644
--- a/locale/en_us/freedombone-restore-local.json
+++ b/locale/en_us/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "Restoring IPFS",
     "Restoring ssh keys for $USERNAME": "Restoring ssh keys for $USERNAME",
     "Restoring config files for $USERNAME": "Restoring config files for $USERNAME",
+    "Restoring monkeysphere ids for $USERNAME": "Restoring monkeysphere ids for $USERNAME",
     "Restoring fin files for $USERNAME": "Restoring fin files for $USERNAME",
     "Restoring local files for $USERNAME": "Restoring local files for $USERNAME",
     "Restoring certificates": "Restoring certificates",
diff --git a/locale/en_us/freedombone-restore-remote.json b/locale/en_us/freedombone-restore-remote.json
index df0b9c79c16c105f64b0ee64bdb48b0fd2da89be..fa734d63d2b38a06f1577486d64a5a8a37f976c4 100644
--- a/locale/en_us/freedombone-restore-remote.json
+++ b/locale/en_us/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "Restoring IPFS",
     "Restoring ssh keys for $USERNAME": "Restoring ssh keys for $USERNAME",
     "Restoring config files for $USERNAME": "Restoring config files for $USERNAME",
+    "Restoring monkeysphere ids for $USERNAME": "Restoring monkeysphere ids for $USERNAME",
     "Restoring fin files for $USERNAME": "Restoring fin files for $USERNAME",
     "Restoring local files for $USERNAME": "Restoring local files for $USERNAME",
     "Restoring certificates": "Restoring certificates",
diff --git a/locale/en_us/freedombone-sec.json b/locale/en_us/freedombone-sec.json
index e8ec8f53f38694925f403aea88414456d0e7f664..b044af4b6296215cab0dea84a8d63326644819c2 100644
--- a/locale/en_us/freedombone-sec.json
+++ b/locale/en_us/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "Invalid domain name: $new_domain",
     "Update ciphersuite": "Update ciphersuite",
     "The ciphersuite has been updated to recommended versions": "The ciphersuite has been updated to recommended versions",
+    "GPG based authentication": "GPG based authentication",
+    "\\nEnable GPG based authentication with monkeysphere ?": "\\nEnable GPG based authentication with monkeysphere ?",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids",
+    "GPG based authentication was enabled": "GPG based authentication was enabled",
+    "GPG based authentication was disabled": "GPG based authentication was disabled",
     "Import file $IMPORT_FILE not found": "Import file $IMPORT_FILE not found",
     "Security settings exported to $EXPORT_FILE": "Security settings exported to $EXPORT_FILE"
 }
\ No newline at end of file
diff --git a/locale/en_us/freedombone.json b/locale/en_us/freedombone.json
index fb35e0e04d1a5e7bc0da546d50d01481b289f9e9..5f0c9421b0347855e26d29c6258338044ebeeaed 100644
--- a/locale/en_us/freedombone.json
+++ b/locale/en_us/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "$PUBLIC_MAILING_LIST mailing list",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "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": "\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",
+    "\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": "\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": "Email import directory $IMPORT_MAILDIR not found",
     "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE",
     "Your MariaDB password is: $MARIADB_PASSWORD": "Your MariaDB password is: $MARIADB_PASSWORD",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "Database password: $MARIADB_PASSWORD",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "Gogs admin user password: $GIT_ADMIN_PASSWORD",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "Gogs admin user email: $MY_EMAIL_ADDRESS",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini",
     "Note that there's a usability/security trade-off made here.": "Note that there's a usability/security trade-off made here.",
     "In order to allow git clone via http we don't redirect everything": "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.": "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "SIP server username: $MY_USERNAME",
     "SIP server extension: 201": "SIP server extension: 201",
     "SIP server password: $SIP_SERVER_PASSWORD": "SIP server password: $SIP_SERVER_PASSWORD",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ",
+    "\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": "\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.": "See /home/$MY_USERNAME/README for post-installation instructions."
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-backup-local.json b/locale/es/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/es/freedombone-backup-local.json
+++ b/locale/es/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/es/freedombone-backup-remote.json b/locale/es/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/es/freedombone-backup-remote.json
+++ b/locale/es/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/es/freedombone-client.json b/locale/es/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/es/freedombone-client.json
+++ b/locale/es/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-controlpanel-user.json b/locale/es/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/es/freedombone-controlpanel-user.json
+++ b/locale/es/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/es/freedombone-restore-local.json b/locale/es/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/es/freedombone-restore-local.json
+++ b/locale/es/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/es/freedombone-restore-remote.json b/locale/es/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/es/freedombone-restore-remote.json
+++ b/locale/es/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/es/freedombone-sec.json b/locale/es/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/es/freedombone-sec.json
+++ b/locale/es/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone.json b/locale/es/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/es/freedombone.json
+++ b/locale/es/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone-backup-local.json b/locale/et/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/et/freedombone-backup-local.json
+++ b/locale/et/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/et/freedombone-backup-remote.json b/locale/et/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/et/freedombone-backup-remote.json
+++ b/locale/et/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/et/freedombone-client.json b/locale/et/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/et/freedombone-client.json
+++ b/locale/et/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone-controlpanel-user.json b/locale/et/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/et/freedombone-controlpanel-user.json
+++ b/locale/et/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/et/freedombone-restore-local.json b/locale/et/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/et/freedombone-restore-local.json
+++ b/locale/et/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/et/freedombone-restore-remote.json b/locale/et/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/et/freedombone-restore-remote.json
+++ b/locale/et/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/et/freedombone-sec.json b/locale/et/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/et/freedombone-sec.json
+++ b/locale/et/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/et/freedombone.json b/locale/et/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/et/freedombone.json
+++ b/locale/et/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone-backup-local.json b/locale/eu/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/eu/freedombone-backup-local.json
+++ b/locale/eu/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/eu/freedombone-backup-remote.json b/locale/eu/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/eu/freedombone-backup-remote.json
+++ b/locale/eu/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/eu/freedombone-client.json b/locale/eu/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/eu/freedombone-client.json
+++ b/locale/eu/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone-controlpanel-user.json b/locale/eu/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/eu/freedombone-controlpanel-user.json
+++ b/locale/eu/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/eu/freedombone-restore-local.json b/locale/eu/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/eu/freedombone-restore-local.json
+++ b/locale/eu/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/eu/freedombone-restore-remote.json b/locale/eu/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/eu/freedombone-restore-remote.json
+++ b/locale/eu/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/eu/freedombone-sec.json b/locale/eu/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/eu/freedombone-sec.json
+++ b/locale/eu/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/eu/freedombone.json b/locale/eu/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/eu/freedombone.json
+++ b/locale/eu/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone-backup-local.json b/locale/fa/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fa/freedombone-backup-local.json
+++ b/locale/fa/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fa/freedombone-backup-remote.json b/locale/fa/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fa/freedombone-backup-remote.json
+++ b/locale/fa/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fa/freedombone-client.json b/locale/fa/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fa/freedombone-client.json
+++ b/locale/fa/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone-controlpanel-user.json b/locale/fa/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fa/freedombone-controlpanel-user.json
+++ b/locale/fa/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fa/freedombone-restore-local.json b/locale/fa/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fa/freedombone-restore-local.json
+++ b/locale/fa/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fa/freedombone-restore-remote.json b/locale/fa/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fa/freedombone-restore-remote.json
+++ b/locale/fa/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fa/freedombone-sec.json b/locale/fa/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fa/freedombone-sec.json
+++ b/locale/fa/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fa/freedombone.json b/locale/fa/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fa/freedombone.json
+++ b/locale/fa/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone-backup-local.json b/locale/fi/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fi/freedombone-backup-local.json
+++ b/locale/fi/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fi/freedombone-backup-remote.json b/locale/fi/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fi/freedombone-backup-remote.json
+++ b/locale/fi/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fi/freedombone-client.json b/locale/fi/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fi/freedombone-client.json
+++ b/locale/fi/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone-controlpanel-user.json b/locale/fi/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fi/freedombone-controlpanel-user.json
+++ b/locale/fi/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fi/freedombone-restore-local.json b/locale/fi/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fi/freedombone-restore-local.json
+++ b/locale/fi/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fi/freedombone-restore-remote.json b/locale/fi/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fi/freedombone-restore-remote.json
+++ b/locale/fi/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fi/freedombone-sec.json b/locale/fi/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fi/freedombone-sec.json
+++ b/locale/fi/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fi/freedombone.json b/locale/fi/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fi/freedombone.json
+++ b/locale/fi/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone-backup-local.json b/locale/fil/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fil/freedombone-backup-local.json
+++ b/locale/fil/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fil/freedombone-backup-remote.json b/locale/fil/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fil/freedombone-backup-remote.json
+++ b/locale/fil/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fil/freedombone-client.json b/locale/fil/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fil/freedombone-client.json
+++ b/locale/fil/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone-controlpanel-user.json b/locale/fil/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fil/freedombone-controlpanel-user.json
+++ b/locale/fil/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fil/freedombone-restore-local.json b/locale/fil/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fil/freedombone-restore-local.json
+++ b/locale/fil/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fil/freedombone-restore-remote.json b/locale/fil/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fil/freedombone-restore-remote.json
+++ b/locale/fil/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fil/freedombone-sec.json b/locale/fil/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fil/freedombone-sec.json
+++ b/locale/fil/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fil/freedombone.json b/locale/fil/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fil/freedombone.json
+++ b/locale/fil/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-backup-local.json b/locale/fr/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fr/freedombone-backup-local.json
+++ b/locale/fr/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fr/freedombone-backup-remote.json b/locale/fr/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fr/freedombone-backup-remote.json
+++ b/locale/fr/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fr/freedombone-client.json b/locale/fr/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fr/freedombone-client.json
+++ b/locale/fr/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-controlpanel-user.json b/locale/fr/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fr/freedombone-controlpanel-user.json
+++ b/locale/fr/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fr/freedombone-restore-local.json b/locale/fr/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fr/freedombone-restore-local.json
+++ b/locale/fr/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr/freedombone-restore-remote.json b/locale/fr/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fr/freedombone-restore-remote.json
+++ b/locale/fr/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr/freedombone-sec.json b/locale/fr/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fr/freedombone-sec.json
+++ b/locale/fr/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone.json b/locale/fr/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fr/freedombone.json
+++ b/locale/fr/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-backup-local.json b/locale/fr_BE/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fr_BE/freedombone-backup-local.json
+++ b/locale/fr_BE/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fr_BE/freedombone-backup-remote.json b/locale/fr_BE/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fr_BE/freedombone-backup-remote.json
+++ b/locale/fr_BE/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fr_BE/freedombone-client.json b/locale/fr_BE/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fr_BE/freedombone-client.json
+++ b/locale/fr_BE/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone-controlpanel-user.json b/locale/fr_BE/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fr_BE/freedombone-controlpanel-user.json
+++ b/locale/fr_BE/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fr_BE/freedombone-restore-local.json b/locale/fr_BE/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fr_BE/freedombone-restore-local.json
+++ b/locale/fr_BE/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_BE/freedombone-restore-remote.json b/locale/fr_BE/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fr_BE/freedombone-restore-remote.json
+++ b/locale/fr_BE/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_BE/freedombone-sec.json b/locale/fr_BE/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fr_BE/freedombone-sec.json
+++ b/locale/fr_BE/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fr_BE/freedombone.json b/locale/fr_BE/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fr_BE/freedombone.json
+++ b/locale/fr_BE/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-backup-local.json b/locale/fr_CH/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fr_CH/freedombone-backup-local.json
+++ b/locale/fr_CH/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fr_CH/freedombone-backup-remote.json b/locale/fr_CH/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fr_CH/freedombone-backup-remote.json
+++ b/locale/fr_CH/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fr_CH/freedombone-client.json b/locale/fr_CH/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fr_CH/freedombone-client.json
+++ b/locale/fr_CH/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone-controlpanel-user.json b/locale/fr_CH/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fr_CH/freedombone-controlpanel-user.json
+++ b/locale/fr_CH/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fr_CH/freedombone-restore-local.json b/locale/fr_CH/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fr_CH/freedombone-restore-local.json
+++ b/locale/fr_CH/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_CH/freedombone-restore-remote.json b/locale/fr_CH/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fr_CH/freedombone-restore-remote.json
+++ b/locale/fr_CH/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_CH/freedombone-sec.json b/locale/fr_CH/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fr_CH/freedombone-sec.json
+++ b/locale/fr_CH/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fr_CH/freedombone.json b/locale/fr_CH/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fr_CH/freedombone.json
+++ b/locale/fr_CH/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone-backup-local.json b/locale/fr_ca/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/fr_ca/freedombone-backup-local.json
+++ b/locale/fr_ca/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/fr_ca/freedombone-backup-remote.json b/locale/fr_ca/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/fr_ca/freedombone-backup-remote.json
+++ b/locale/fr_ca/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/fr_ca/freedombone-client.json b/locale/fr_ca/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/fr_ca/freedombone-client.json
+++ b/locale/fr_ca/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone-controlpanel-user.json b/locale/fr_ca/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/fr_ca/freedombone-controlpanel-user.json
+++ b/locale/fr_ca/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/fr_ca/freedombone-restore-local.json b/locale/fr_ca/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/fr_ca/freedombone-restore-local.json
+++ b/locale/fr_ca/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_ca/freedombone-restore-remote.json b/locale/fr_ca/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/fr_ca/freedombone-restore-remote.json
+++ b/locale/fr_ca/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/fr_ca/freedombone-sec.json b/locale/fr_ca/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/fr_ca/freedombone-sec.json
+++ b/locale/fr_ca/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/fr_ca/freedombone.json b/locale/fr_ca/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/fr_ca/freedombone.json
+++ b/locale/fr_ca/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone-backup-local.json b/locale/ga/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ga/freedombone-backup-local.json
+++ b/locale/ga/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ga/freedombone-backup-remote.json b/locale/ga/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ga/freedombone-backup-remote.json
+++ b/locale/ga/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ga/freedombone-client.json b/locale/ga/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ga/freedombone-client.json
+++ b/locale/ga/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone-controlpanel-user.json b/locale/ga/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ga/freedombone-controlpanel-user.json
+++ b/locale/ga/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ga/freedombone-restore-local.json b/locale/ga/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ga/freedombone-restore-local.json
+++ b/locale/ga/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ga/freedombone-restore-remote.json b/locale/ga/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ga/freedombone-restore-remote.json
+++ b/locale/ga/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ga/freedombone-sec.json b/locale/ga/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ga/freedombone-sec.json
+++ b/locale/ga/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ga/freedombone.json b/locale/ga/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ga/freedombone.json
+++ b/locale/ga/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone-backup-local.json b/locale/gl/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/gl/freedombone-backup-local.json
+++ b/locale/gl/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/gl/freedombone-backup-remote.json b/locale/gl/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/gl/freedombone-backup-remote.json
+++ b/locale/gl/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/gl/freedombone-client.json b/locale/gl/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/gl/freedombone-client.json
+++ b/locale/gl/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone-controlpanel-user.json b/locale/gl/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/gl/freedombone-controlpanel-user.json
+++ b/locale/gl/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/gl/freedombone-restore-local.json b/locale/gl/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/gl/freedombone-restore-local.json
+++ b/locale/gl/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/gl/freedombone-restore-remote.json b/locale/gl/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/gl/freedombone-restore-remote.json
+++ b/locale/gl/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/gl/freedombone-sec.json b/locale/gl/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/gl/freedombone-sec.json
+++ b/locale/gl/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/gl/freedombone.json b/locale/gl/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/gl/freedombone.json
+++ b/locale/gl/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone-backup-local.json b/locale/gu/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/gu/freedombone-backup-local.json
+++ b/locale/gu/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/gu/freedombone-backup-remote.json b/locale/gu/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/gu/freedombone-backup-remote.json
+++ b/locale/gu/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/gu/freedombone-client.json b/locale/gu/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/gu/freedombone-client.json
+++ b/locale/gu/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone-controlpanel-user.json b/locale/gu/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/gu/freedombone-controlpanel-user.json
+++ b/locale/gu/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/gu/freedombone-restore-local.json b/locale/gu/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/gu/freedombone-restore-local.json
+++ b/locale/gu/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/gu/freedombone-restore-remote.json b/locale/gu/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/gu/freedombone-restore-remote.json
+++ b/locale/gu/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/gu/freedombone-sec.json b/locale/gu/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/gu/freedombone-sec.json
+++ b/locale/gu/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/gu/freedombone.json b/locale/gu/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/gu/freedombone.json
+++ b/locale/gu/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone-backup-local.json b/locale/he/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/he/freedombone-backup-local.json
+++ b/locale/he/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/he/freedombone-backup-remote.json b/locale/he/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/he/freedombone-backup-remote.json
+++ b/locale/he/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/he/freedombone-client.json b/locale/he/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/he/freedombone-client.json
+++ b/locale/he/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone-controlpanel-user.json b/locale/he/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/he/freedombone-controlpanel-user.json
+++ b/locale/he/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/he/freedombone-restore-local.json b/locale/he/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/he/freedombone-restore-local.json
+++ b/locale/he/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/he/freedombone-restore-remote.json b/locale/he/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/he/freedombone-restore-remote.json
+++ b/locale/he/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/he/freedombone-sec.json b/locale/he/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/he/freedombone-sec.json
+++ b/locale/he/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/he/freedombone.json b/locale/he/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/he/freedombone.json
+++ b/locale/he/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone-backup-local.json b/locale/hi/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/hi/freedombone-backup-local.json
+++ b/locale/hi/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/hi/freedombone-backup-remote.json b/locale/hi/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/hi/freedombone-backup-remote.json
+++ b/locale/hi/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/hi/freedombone-client.json b/locale/hi/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/hi/freedombone-client.json
+++ b/locale/hi/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone-controlpanel-user.json b/locale/hi/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/hi/freedombone-controlpanel-user.json
+++ b/locale/hi/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/hi/freedombone-restore-local.json b/locale/hi/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/hi/freedombone-restore-local.json
+++ b/locale/hi/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hi/freedombone-restore-remote.json b/locale/hi/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/hi/freedombone-restore-remote.json
+++ b/locale/hi/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hi/freedombone-sec.json b/locale/hi/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/hi/freedombone-sec.json
+++ b/locale/hi/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/hi/freedombone.json b/locale/hi/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/hi/freedombone.json
+++ b/locale/hi/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone-backup-local.json b/locale/hr/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/hr/freedombone-backup-local.json
+++ b/locale/hr/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/hr/freedombone-backup-remote.json b/locale/hr/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/hr/freedombone-backup-remote.json
+++ b/locale/hr/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/hr/freedombone-client.json b/locale/hr/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/hr/freedombone-client.json
+++ b/locale/hr/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone-controlpanel-user.json b/locale/hr/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/hr/freedombone-controlpanel-user.json
+++ b/locale/hr/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/hr/freedombone-restore-local.json b/locale/hr/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/hr/freedombone-restore-local.json
+++ b/locale/hr/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hr/freedombone-restore-remote.json b/locale/hr/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/hr/freedombone-restore-remote.json
+++ b/locale/hr/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hr/freedombone-sec.json b/locale/hr/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/hr/freedombone-sec.json
+++ b/locale/hr/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/hr/freedombone.json b/locale/hr/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/hr/freedombone.json
+++ b/locale/hr/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone-backup-local.json b/locale/hu/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/hu/freedombone-backup-local.json
+++ b/locale/hu/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/hu/freedombone-backup-remote.json b/locale/hu/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/hu/freedombone-backup-remote.json
+++ b/locale/hu/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/hu/freedombone-client.json b/locale/hu/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/hu/freedombone-client.json
+++ b/locale/hu/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone-controlpanel-user.json b/locale/hu/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/hu/freedombone-controlpanel-user.json
+++ b/locale/hu/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/hu/freedombone-restore-local.json b/locale/hu/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/hu/freedombone-restore-local.json
+++ b/locale/hu/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hu/freedombone-restore-remote.json b/locale/hu/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/hu/freedombone-restore-remote.json
+++ b/locale/hu/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/hu/freedombone-sec.json b/locale/hu/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/hu/freedombone-sec.json
+++ b/locale/hu/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/hu/freedombone.json b/locale/hu/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/hu/freedombone.json
+++ b/locale/hu/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone-backup-local.json b/locale/id/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/id/freedombone-backup-local.json
+++ b/locale/id/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/id/freedombone-backup-remote.json b/locale/id/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/id/freedombone-backup-remote.json
+++ b/locale/id/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/id/freedombone-client.json b/locale/id/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/id/freedombone-client.json
+++ b/locale/id/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone-controlpanel-user.json b/locale/id/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/id/freedombone-controlpanel-user.json
+++ b/locale/id/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/id/freedombone-restore-local.json b/locale/id/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/id/freedombone-restore-local.json
+++ b/locale/id/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/id/freedombone-restore-remote.json b/locale/id/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/id/freedombone-restore-remote.json
+++ b/locale/id/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/id/freedombone-sec.json b/locale/id/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/id/freedombone-sec.json
+++ b/locale/id/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/id/freedombone.json b/locale/id/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/id/freedombone.json
+++ b/locale/id/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone-backup-local.json b/locale/is/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/is/freedombone-backup-local.json
+++ b/locale/is/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/is/freedombone-backup-remote.json b/locale/is/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/is/freedombone-backup-remote.json
+++ b/locale/is/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/is/freedombone-client.json b/locale/is/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/is/freedombone-client.json
+++ b/locale/is/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone-controlpanel-user.json b/locale/is/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/is/freedombone-controlpanel-user.json
+++ b/locale/is/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/is/freedombone-restore-local.json b/locale/is/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/is/freedombone-restore-local.json
+++ b/locale/is/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/is/freedombone-restore-remote.json b/locale/is/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/is/freedombone-restore-remote.json
+++ b/locale/is/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/is/freedombone-sec.json b/locale/is/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/is/freedombone-sec.json
+++ b/locale/is/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/is/freedombone.json b/locale/is/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/is/freedombone.json
+++ b/locale/is/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone-backup-local.json b/locale/it/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/it/freedombone-backup-local.json
+++ b/locale/it/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/it/freedombone-backup-remote.json b/locale/it/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/it/freedombone-backup-remote.json
+++ b/locale/it/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/it/freedombone-client.json b/locale/it/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/it/freedombone-client.json
+++ b/locale/it/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone-controlpanel-user.json b/locale/it/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/it/freedombone-controlpanel-user.json
+++ b/locale/it/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/it/freedombone-restore-local.json b/locale/it/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/it/freedombone-restore-local.json
+++ b/locale/it/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/it/freedombone-restore-remote.json b/locale/it/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/it/freedombone-restore-remote.json
+++ b/locale/it/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/it/freedombone-sec.json b/locale/it/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/it/freedombone-sec.json
+++ b/locale/it/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/it/freedombone.json b/locale/it/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/it/freedombone.json
+++ b/locale/it/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone-backup-local.json b/locale/ja/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ja/freedombone-backup-local.json
+++ b/locale/ja/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ja/freedombone-backup-remote.json b/locale/ja/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ja/freedombone-backup-remote.json
+++ b/locale/ja/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ja/freedombone-client.json b/locale/ja/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ja/freedombone-client.json
+++ b/locale/ja/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone-controlpanel-user.json b/locale/ja/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ja/freedombone-controlpanel-user.json
+++ b/locale/ja/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ja/freedombone-restore-local.json b/locale/ja/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ja/freedombone-restore-local.json
+++ b/locale/ja/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ja/freedombone-restore-remote.json b/locale/ja/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ja/freedombone-restore-remote.json
+++ b/locale/ja/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ja/freedombone-sec.json b/locale/ja/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ja/freedombone-sec.json
+++ b/locale/ja/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ja/freedombone.json b/locale/ja/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ja/freedombone.json
+++ b/locale/ja/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone-backup-local.json b/locale/ka/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ka/freedombone-backup-local.json
+++ b/locale/ka/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ka/freedombone-backup-remote.json b/locale/ka/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ka/freedombone-backup-remote.json
+++ b/locale/ka/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ka/freedombone-client.json b/locale/ka/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ka/freedombone-client.json
+++ b/locale/ka/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone-controlpanel-user.json b/locale/ka/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ka/freedombone-controlpanel-user.json
+++ b/locale/ka/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ka/freedombone-restore-local.json b/locale/ka/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ka/freedombone-restore-local.json
+++ b/locale/ka/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ka/freedombone-restore-remote.json b/locale/ka/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ka/freedombone-restore-remote.json
+++ b/locale/ka/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ka/freedombone-sec.json b/locale/ka/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ka/freedombone-sec.json
+++ b/locale/ka/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ka/freedombone.json b/locale/ka/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ka/freedombone.json
+++ b/locale/ka/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone-backup-local.json b/locale/km/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/km/freedombone-backup-local.json
+++ b/locale/km/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/km/freedombone-backup-remote.json b/locale/km/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/km/freedombone-backup-remote.json
+++ b/locale/km/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/km/freedombone-client.json b/locale/km/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/km/freedombone-client.json
+++ b/locale/km/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone-controlpanel-user.json b/locale/km/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/km/freedombone-controlpanel-user.json
+++ b/locale/km/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/km/freedombone-restore-local.json b/locale/km/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/km/freedombone-restore-local.json
+++ b/locale/km/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/km/freedombone-restore-remote.json b/locale/km/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/km/freedombone-restore-remote.json
+++ b/locale/km/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/km/freedombone-sec.json b/locale/km/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/km/freedombone-sec.json
+++ b/locale/km/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/km/freedombone.json b/locale/km/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/km/freedombone.json
+++ b/locale/km/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone-backup-local.json b/locale/kn/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/kn/freedombone-backup-local.json
+++ b/locale/kn/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/kn/freedombone-backup-remote.json b/locale/kn/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/kn/freedombone-backup-remote.json
+++ b/locale/kn/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/kn/freedombone-client.json b/locale/kn/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/kn/freedombone-client.json
+++ b/locale/kn/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone-controlpanel-user.json b/locale/kn/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/kn/freedombone-controlpanel-user.json
+++ b/locale/kn/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/kn/freedombone-restore-local.json b/locale/kn/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/kn/freedombone-restore-local.json
+++ b/locale/kn/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/kn/freedombone-restore-remote.json b/locale/kn/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/kn/freedombone-restore-remote.json
+++ b/locale/kn/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/kn/freedombone-sec.json b/locale/kn/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/kn/freedombone-sec.json
+++ b/locale/kn/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/kn/freedombone.json b/locale/kn/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/kn/freedombone.json
+++ b/locale/kn/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone-backup-local.json b/locale/ko/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ko/freedombone-backup-local.json
+++ b/locale/ko/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ko/freedombone-backup-remote.json b/locale/ko/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ko/freedombone-backup-remote.json
+++ b/locale/ko/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ko/freedombone-client.json b/locale/ko/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ko/freedombone-client.json
+++ b/locale/ko/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone-controlpanel-user.json b/locale/ko/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ko/freedombone-controlpanel-user.json
+++ b/locale/ko/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ko/freedombone-restore-local.json b/locale/ko/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ko/freedombone-restore-local.json
+++ b/locale/ko/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ko/freedombone-restore-remote.json b/locale/ko/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ko/freedombone-restore-remote.json
+++ b/locale/ko/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ko/freedombone-sec.json b/locale/ko/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ko/freedombone-sec.json
+++ b/locale/ko/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ko/freedombone.json b/locale/ko/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ko/freedombone.json
+++ b/locale/ko/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone-backup-local.json b/locale/lo/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/lo/freedombone-backup-local.json
+++ b/locale/lo/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/lo/freedombone-backup-remote.json b/locale/lo/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/lo/freedombone-backup-remote.json
+++ b/locale/lo/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/lo/freedombone-client.json b/locale/lo/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/lo/freedombone-client.json
+++ b/locale/lo/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone-controlpanel-user.json b/locale/lo/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/lo/freedombone-controlpanel-user.json
+++ b/locale/lo/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/lo/freedombone-restore-local.json b/locale/lo/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/lo/freedombone-restore-local.json
+++ b/locale/lo/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lo/freedombone-restore-remote.json b/locale/lo/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/lo/freedombone-restore-remote.json
+++ b/locale/lo/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lo/freedombone-sec.json b/locale/lo/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/lo/freedombone-sec.json
+++ b/locale/lo/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/lo/freedombone.json b/locale/lo/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/lo/freedombone.json
+++ b/locale/lo/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone-backup-local.json b/locale/lt/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/lt/freedombone-backup-local.json
+++ b/locale/lt/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/lt/freedombone-backup-remote.json b/locale/lt/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/lt/freedombone-backup-remote.json
+++ b/locale/lt/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/lt/freedombone-client.json b/locale/lt/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/lt/freedombone-client.json
+++ b/locale/lt/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone-controlpanel-user.json b/locale/lt/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/lt/freedombone-controlpanel-user.json
+++ b/locale/lt/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/lt/freedombone-restore-local.json b/locale/lt/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/lt/freedombone-restore-local.json
+++ b/locale/lt/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lt/freedombone-restore-remote.json b/locale/lt/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/lt/freedombone-restore-remote.json
+++ b/locale/lt/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lt/freedombone-sec.json b/locale/lt/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/lt/freedombone-sec.json
+++ b/locale/lt/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/lt/freedombone.json b/locale/lt/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/lt/freedombone.json
+++ b/locale/lt/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone-backup-local.json b/locale/lv/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/lv/freedombone-backup-local.json
+++ b/locale/lv/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/lv/freedombone-backup-remote.json b/locale/lv/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/lv/freedombone-backup-remote.json
+++ b/locale/lv/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/lv/freedombone-client.json b/locale/lv/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/lv/freedombone-client.json
+++ b/locale/lv/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone-controlpanel-user.json b/locale/lv/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/lv/freedombone-controlpanel-user.json
+++ b/locale/lv/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/lv/freedombone-restore-local.json b/locale/lv/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/lv/freedombone-restore-local.json
+++ b/locale/lv/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lv/freedombone-restore-remote.json b/locale/lv/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/lv/freedombone-restore-remote.json
+++ b/locale/lv/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/lv/freedombone-sec.json b/locale/lv/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/lv/freedombone-sec.json
+++ b/locale/lv/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/lv/freedombone.json b/locale/lv/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/lv/freedombone.json
+++ b/locale/lv/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone-backup-local.json b/locale/mi_tn/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/mi_tn/freedombone-backup-local.json
+++ b/locale/mi_tn/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/mi_tn/freedombone-backup-remote.json b/locale/mi_tn/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/mi_tn/freedombone-backup-remote.json
+++ b/locale/mi_tn/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/mi_tn/freedombone-client.json b/locale/mi_tn/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/mi_tn/freedombone-client.json
+++ b/locale/mi_tn/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone-controlpanel-user.json b/locale/mi_tn/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/mi_tn/freedombone-controlpanel-user.json
+++ b/locale/mi_tn/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/mi_tn/freedombone-restore-local.json b/locale/mi_tn/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/mi_tn/freedombone-restore-local.json
+++ b/locale/mi_tn/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mi_tn/freedombone-restore-remote.json b/locale/mi_tn/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/mi_tn/freedombone-restore-remote.json
+++ b/locale/mi_tn/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mi_tn/freedombone-sec.json b/locale/mi_tn/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/mi_tn/freedombone-sec.json
+++ b/locale/mi_tn/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/mi_tn/freedombone.json b/locale/mi_tn/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/mi_tn/freedombone.json
+++ b/locale/mi_tn/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone-backup-local.json b/locale/mi_wwow/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/mi_wwow/freedombone-backup-local.json
+++ b/locale/mi_wwow/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/mi_wwow/freedombone-backup-remote.json b/locale/mi_wwow/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/mi_wwow/freedombone-backup-remote.json
+++ b/locale/mi_wwow/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/mi_wwow/freedombone-client.json b/locale/mi_wwow/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/mi_wwow/freedombone-client.json
+++ b/locale/mi_wwow/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone-controlpanel-user.json b/locale/mi_wwow/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/mi_wwow/freedombone-controlpanel-user.json
+++ b/locale/mi_wwow/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/mi_wwow/freedombone-restore-local.json b/locale/mi_wwow/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/mi_wwow/freedombone-restore-local.json
+++ b/locale/mi_wwow/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mi_wwow/freedombone-restore-remote.json b/locale/mi_wwow/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/mi_wwow/freedombone-restore-remote.json
+++ b/locale/mi_wwow/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mi_wwow/freedombone-sec.json b/locale/mi_wwow/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/mi_wwow/freedombone-sec.json
+++ b/locale/mi_wwow/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/mi_wwow/freedombone.json b/locale/mi_wwow/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/mi_wwow/freedombone.json
+++ b/locale/mi_wwow/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone-backup-local.json b/locale/ml/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ml/freedombone-backup-local.json
+++ b/locale/ml/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ml/freedombone-backup-remote.json b/locale/ml/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ml/freedombone-backup-remote.json
+++ b/locale/ml/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ml/freedombone-client.json b/locale/ml/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ml/freedombone-client.json
+++ b/locale/ml/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone-controlpanel-user.json b/locale/ml/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ml/freedombone-controlpanel-user.json
+++ b/locale/ml/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ml/freedombone-restore-local.json b/locale/ml/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ml/freedombone-restore-local.json
+++ b/locale/ml/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ml/freedombone-restore-remote.json b/locale/ml/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ml/freedombone-restore-remote.json
+++ b/locale/ml/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ml/freedombone-sec.json b/locale/ml/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ml/freedombone-sec.json
+++ b/locale/ml/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ml/freedombone.json b/locale/ml/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ml/freedombone.json
+++ b/locale/ml/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone-backup-local.json b/locale/mn/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/mn/freedombone-backup-local.json
+++ b/locale/mn/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/mn/freedombone-backup-remote.json b/locale/mn/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/mn/freedombone-backup-remote.json
+++ b/locale/mn/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/mn/freedombone-client.json b/locale/mn/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/mn/freedombone-client.json
+++ b/locale/mn/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone-controlpanel-user.json b/locale/mn/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/mn/freedombone-controlpanel-user.json
+++ b/locale/mn/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/mn/freedombone-restore-local.json b/locale/mn/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/mn/freedombone-restore-local.json
+++ b/locale/mn/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mn/freedombone-restore-remote.json b/locale/mn/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/mn/freedombone-restore-remote.json
+++ b/locale/mn/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/mn/freedombone-sec.json b/locale/mn/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/mn/freedombone-sec.json
+++ b/locale/mn/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/mn/freedombone.json b/locale/mn/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/mn/freedombone.json
+++ b/locale/mn/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone-backup-local.json b/locale/ms/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ms/freedombone-backup-local.json
+++ b/locale/ms/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ms/freedombone-backup-remote.json b/locale/ms/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ms/freedombone-backup-remote.json
+++ b/locale/ms/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ms/freedombone-client.json b/locale/ms/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ms/freedombone-client.json
+++ b/locale/ms/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone-controlpanel-user.json b/locale/ms/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ms/freedombone-controlpanel-user.json
+++ b/locale/ms/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ms/freedombone-restore-local.json b/locale/ms/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ms/freedombone-restore-local.json
+++ b/locale/ms/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ms/freedombone-restore-remote.json b/locale/ms/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ms/freedombone-restore-remote.json
+++ b/locale/ms/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ms/freedombone-sec.json b/locale/ms/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ms/freedombone-sec.json
+++ b/locale/ms/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ms/freedombone.json b/locale/ms/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ms/freedombone.json
+++ b/locale/ms/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone-backup-local.json b/locale/nl/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/nl/freedombone-backup-local.json
+++ b/locale/nl/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/nl/freedombone-backup-remote.json b/locale/nl/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/nl/freedombone-backup-remote.json
+++ b/locale/nl/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/nl/freedombone-client.json b/locale/nl/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/nl/freedombone-client.json
+++ b/locale/nl/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone-controlpanel-user.json b/locale/nl/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/nl/freedombone-controlpanel-user.json
+++ b/locale/nl/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/nl/freedombone-restore-local.json b/locale/nl/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/nl/freedombone-restore-local.json
+++ b/locale/nl/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/nl/freedombone-restore-remote.json b/locale/nl/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/nl/freedombone-restore-remote.json
+++ b/locale/nl/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/nl/freedombone-sec.json b/locale/nl/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/nl/freedombone-sec.json
+++ b/locale/nl/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/nl/freedombone.json b/locale/nl/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/nl/freedombone.json
+++ b/locale/nl/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone-backup-local.json b/locale/nn/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/nn/freedombone-backup-local.json
+++ b/locale/nn/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/nn/freedombone-backup-remote.json b/locale/nn/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/nn/freedombone-backup-remote.json
+++ b/locale/nn/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/nn/freedombone-client.json b/locale/nn/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/nn/freedombone-client.json
+++ b/locale/nn/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone-controlpanel-user.json b/locale/nn/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/nn/freedombone-controlpanel-user.json
+++ b/locale/nn/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/nn/freedombone-restore-local.json b/locale/nn/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/nn/freedombone-restore-local.json
+++ b/locale/nn/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/nn/freedombone-restore-remote.json b/locale/nn/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/nn/freedombone-restore-remote.json
+++ b/locale/nn/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/nn/freedombone-sec.json b/locale/nn/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/nn/freedombone-sec.json
+++ b/locale/nn/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/nn/freedombone.json b/locale/nn/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/nn/freedombone.json
+++ b/locale/nn/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone-backup-local.json b/locale/no/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/no/freedombone-backup-local.json
+++ b/locale/no/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/no/freedombone-backup-remote.json b/locale/no/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/no/freedombone-backup-remote.json
+++ b/locale/no/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/no/freedombone-client.json b/locale/no/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/no/freedombone-client.json
+++ b/locale/no/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone-controlpanel-user.json b/locale/no/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/no/freedombone-controlpanel-user.json
+++ b/locale/no/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/no/freedombone-restore-local.json b/locale/no/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/no/freedombone-restore-local.json
+++ b/locale/no/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/no/freedombone-restore-remote.json b/locale/no/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/no/freedombone-restore-remote.json
+++ b/locale/no/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/no/freedombone-sec.json b/locale/no/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/no/freedombone-sec.json
+++ b/locale/no/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/no/freedombone.json b/locale/no/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/no/freedombone.json
+++ b/locale/no/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone-backup-local.json b/locale/no_gr/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/no_gr/freedombone-backup-local.json
+++ b/locale/no_gr/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/no_gr/freedombone-backup-remote.json b/locale/no_gr/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/no_gr/freedombone-backup-remote.json
+++ b/locale/no_gr/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/no_gr/freedombone-client.json b/locale/no_gr/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/no_gr/freedombone-client.json
+++ b/locale/no_gr/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone-controlpanel-user.json b/locale/no_gr/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/no_gr/freedombone-controlpanel-user.json
+++ b/locale/no_gr/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/no_gr/freedombone-restore-local.json b/locale/no_gr/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/no_gr/freedombone-restore-local.json
+++ b/locale/no_gr/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/no_gr/freedombone-restore-remote.json b/locale/no_gr/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/no_gr/freedombone-restore-remote.json
+++ b/locale/no_gr/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/no_gr/freedombone-sec.json b/locale/no_gr/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/no_gr/freedombone-sec.json
+++ b/locale/no_gr/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/no_gr/freedombone.json b/locale/no_gr/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/no_gr/freedombone.json
+++ b/locale/no_gr/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone-backup-local.json b/locale/pl/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/pl/freedombone-backup-local.json
+++ b/locale/pl/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/pl/freedombone-backup-remote.json b/locale/pl/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/pl/freedombone-backup-remote.json
+++ b/locale/pl/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/pl/freedombone-client.json b/locale/pl/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/pl/freedombone-client.json
+++ b/locale/pl/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone-controlpanel-user.json b/locale/pl/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/pl/freedombone-controlpanel-user.json
+++ b/locale/pl/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/pl/freedombone-restore-local.json b/locale/pl/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/pl/freedombone-restore-local.json
+++ b/locale/pl/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pl/freedombone-restore-remote.json b/locale/pl/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/pl/freedombone-restore-remote.json
+++ b/locale/pl/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pl/freedombone-sec.json b/locale/pl/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/pl/freedombone-sec.json
+++ b/locale/pl/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/pl/freedombone.json b/locale/pl/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/pl/freedombone.json
+++ b/locale/pl/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone-backup-local.json b/locale/pt/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/pt/freedombone-backup-local.json
+++ b/locale/pt/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/pt/freedombone-backup-remote.json b/locale/pt/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/pt/freedombone-backup-remote.json
+++ b/locale/pt/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/pt/freedombone-client.json b/locale/pt/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/pt/freedombone-client.json
+++ b/locale/pt/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone-controlpanel-user.json b/locale/pt/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/pt/freedombone-controlpanel-user.json
+++ b/locale/pt/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/pt/freedombone-restore-local.json b/locale/pt/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/pt/freedombone-restore-local.json
+++ b/locale/pt/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pt/freedombone-restore-remote.json b/locale/pt/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/pt/freedombone-restore-remote.json
+++ b/locale/pt/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pt/freedombone-sec.json b/locale/pt/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/pt/freedombone-sec.json
+++ b/locale/pt/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/pt/freedombone.json b/locale/pt/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/pt/freedombone.json
+++ b/locale/pt/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone-backup-local.json b/locale/pt_br/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/pt_br/freedombone-backup-local.json
+++ b/locale/pt_br/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/pt_br/freedombone-backup-remote.json b/locale/pt_br/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/pt_br/freedombone-backup-remote.json
+++ b/locale/pt_br/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/pt_br/freedombone-client.json b/locale/pt_br/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/pt_br/freedombone-client.json
+++ b/locale/pt_br/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone-controlpanel-user.json b/locale/pt_br/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/pt_br/freedombone-controlpanel-user.json
+++ b/locale/pt_br/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/pt_br/freedombone-restore-local.json b/locale/pt_br/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/pt_br/freedombone-restore-local.json
+++ b/locale/pt_br/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pt_br/freedombone-restore-remote.json b/locale/pt_br/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/pt_br/freedombone-restore-remote.json
+++ b/locale/pt_br/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/pt_br/freedombone-sec.json b/locale/pt_br/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/pt_br/freedombone-sec.json
+++ b/locale/pt_br/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/pt_br/freedombone.json b/locale/pt_br/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/pt_br/freedombone.json
+++ b/locale/pt_br/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone-backup-local.json b/locale/ro/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ro/freedombone-backup-local.json
+++ b/locale/ro/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ro/freedombone-backup-remote.json b/locale/ro/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ro/freedombone-backup-remote.json
+++ b/locale/ro/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ro/freedombone-client.json b/locale/ro/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ro/freedombone-client.json
+++ b/locale/ro/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone-controlpanel-user.json b/locale/ro/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ro/freedombone-controlpanel-user.json
+++ b/locale/ro/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ro/freedombone-restore-local.json b/locale/ro/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ro/freedombone-restore-local.json
+++ b/locale/ro/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ro/freedombone-restore-remote.json b/locale/ro/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ro/freedombone-restore-remote.json
+++ b/locale/ro/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ro/freedombone-sec.json b/locale/ro/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ro/freedombone-sec.json
+++ b/locale/ro/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ro/freedombone.json b/locale/ro/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ro/freedombone.json
+++ b/locale/ro/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone-backup-local.json b/locale/ru/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ru/freedombone-backup-local.json
+++ b/locale/ru/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ru/freedombone-backup-remote.json b/locale/ru/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ru/freedombone-backup-remote.json
+++ b/locale/ru/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ru/freedombone-client.json b/locale/ru/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ru/freedombone-client.json
+++ b/locale/ru/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone-controlpanel-user.json b/locale/ru/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ru/freedombone-controlpanel-user.json
+++ b/locale/ru/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ru/freedombone-restore-local.json b/locale/ru/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ru/freedombone-restore-local.json
+++ b/locale/ru/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ru/freedombone-restore-remote.json b/locale/ru/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ru/freedombone-restore-remote.json
+++ b/locale/ru/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ru/freedombone-sec.json b/locale/ru/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ru/freedombone-sec.json
+++ b/locale/ru/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ru/freedombone.json b/locale/ru/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ru/freedombone.json
+++ b/locale/ru/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone-backup-local.json b/locale/sk/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sk/freedombone-backup-local.json
+++ b/locale/sk/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sk/freedombone-backup-remote.json b/locale/sk/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sk/freedombone-backup-remote.json
+++ b/locale/sk/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sk/freedombone-client.json b/locale/sk/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sk/freedombone-client.json
+++ b/locale/sk/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone-controlpanel-user.json b/locale/sk/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sk/freedombone-controlpanel-user.json
+++ b/locale/sk/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sk/freedombone-restore-local.json b/locale/sk/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sk/freedombone-restore-local.json
+++ b/locale/sk/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sk/freedombone-restore-remote.json b/locale/sk/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sk/freedombone-restore-remote.json
+++ b/locale/sk/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sk/freedombone-sec.json b/locale/sk/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sk/freedombone-sec.json
+++ b/locale/sk/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sk/freedombone.json b/locale/sk/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sk/freedombone.json
+++ b/locale/sk/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone-backup-local.json b/locale/sl/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sl/freedombone-backup-local.json
+++ b/locale/sl/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sl/freedombone-backup-remote.json b/locale/sl/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sl/freedombone-backup-remote.json
+++ b/locale/sl/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sl/freedombone-client.json b/locale/sl/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sl/freedombone-client.json
+++ b/locale/sl/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone-controlpanel-user.json b/locale/sl/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sl/freedombone-controlpanel-user.json
+++ b/locale/sl/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sl/freedombone-restore-local.json b/locale/sl/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sl/freedombone-restore-local.json
+++ b/locale/sl/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sl/freedombone-restore-remote.json b/locale/sl/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sl/freedombone-restore-remote.json
+++ b/locale/sl/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sl/freedombone-sec.json b/locale/sl/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sl/freedombone-sec.json
+++ b/locale/sl/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sl/freedombone.json b/locale/sl/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sl/freedombone.json
+++ b/locale/sl/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone-backup-local.json b/locale/sm/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sm/freedombone-backup-local.json
+++ b/locale/sm/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sm/freedombone-backup-remote.json b/locale/sm/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sm/freedombone-backup-remote.json
+++ b/locale/sm/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sm/freedombone-client.json b/locale/sm/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sm/freedombone-client.json
+++ b/locale/sm/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone-controlpanel-user.json b/locale/sm/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sm/freedombone-controlpanel-user.json
+++ b/locale/sm/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sm/freedombone-restore-local.json b/locale/sm/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sm/freedombone-restore-local.json
+++ b/locale/sm/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sm/freedombone-restore-remote.json b/locale/sm/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sm/freedombone-restore-remote.json
+++ b/locale/sm/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sm/freedombone-sec.json b/locale/sm/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sm/freedombone-sec.json
+++ b/locale/sm/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sm/freedombone.json b/locale/sm/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sm/freedombone.json
+++ b/locale/sm/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone-backup-local.json b/locale/so/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/so/freedombone-backup-local.json
+++ b/locale/so/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/so/freedombone-backup-remote.json b/locale/so/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/so/freedombone-backup-remote.json
+++ b/locale/so/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/so/freedombone-client.json b/locale/so/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/so/freedombone-client.json
+++ b/locale/so/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone-controlpanel-user.json b/locale/so/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/so/freedombone-controlpanel-user.json
+++ b/locale/so/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/so/freedombone-restore-local.json b/locale/so/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/so/freedombone-restore-local.json
+++ b/locale/so/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/so/freedombone-restore-remote.json b/locale/so/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/so/freedombone-restore-remote.json
+++ b/locale/so/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/so/freedombone-sec.json b/locale/so/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/so/freedombone-sec.json
+++ b/locale/so/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/so/freedombone.json b/locale/so/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/so/freedombone.json
+++ b/locale/so/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone-backup-local.json b/locale/sq/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sq/freedombone-backup-local.json
+++ b/locale/sq/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sq/freedombone-backup-remote.json b/locale/sq/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sq/freedombone-backup-remote.json
+++ b/locale/sq/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sq/freedombone-client.json b/locale/sq/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sq/freedombone-client.json
+++ b/locale/sq/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone-controlpanel-user.json b/locale/sq/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sq/freedombone-controlpanel-user.json
+++ b/locale/sq/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sq/freedombone-restore-local.json b/locale/sq/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sq/freedombone-restore-local.json
+++ b/locale/sq/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sq/freedombone-restore-remote.json b/locale/sq/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sq/freedombone-restore-remote.json
+++ b/locale/sq/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sq/freedombone-sec.json b/locale/sq/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sq/freedombone-sec.json
+++ b/locale/sq/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sq/freedombone.json b/locale/sq/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sq/freedombone.json
+++ b/locale/sq/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone-backup-local.json b/locale/sr/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sr/freedombone-backup-local.json
+++ b/locale/sr/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sr/freedombone-backup-remote.json b/locale/sr/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sr/freedombone-backup-remote.json
+++ b/locale/sr/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sr/freedombone-client.json b/locale/sr/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sr/freedombone-client.json
+++ b/locale/sr/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone-controlpanel-user.json b/locale/sr/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sr/freedombone-controlpanel-user.json
+++ b/locale/sr/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sr/freedombone-restore-local.json b/locale/sr/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sr/freedombone-restore-local.json
+++ b/locale/sr/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sr/freedombone-restore-remote.json b/locale/sr/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sr/freedombone-restore-remote.json
+++ b/locale/sr/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sr/freedombone-sec.json b/locale/sr/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sr/freedombone-sec.json
+++ b/locale/sr/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sr/freedombone.json b/locale/sr/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sr/freedombone.json
+++ b/locale/sr/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone-backup-local.json b/locale/sv/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/sv/freedombone-backup-local.json
+++ b/locale/sv/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/sv/freedombone-backup-remote.json b/locale/sv/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/sv/freedombone-backup-remote.json
+++ b/locale/sv/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/sv/freedombone-client.json b/locale/sv/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/sv/freedombone-client.json
+++ b/locale/sv/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone-controlpanel-user.json b/locale/sv/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/sv/freedombone-controlpanel-user.json
+++ b/locale/sv/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/sv/freedombone-restore-local.json b/locale/sv/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/sv/freedombone-restore-local.json
+++ b/locale/sv/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sv/freedombone-restore-remote.json b/locale/sv/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/sv/freedombone-restore-remote.json
+++ b/locale/sv/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/sv/freedombone-sec.json b/locale/sv/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/sv/freedombone-sec.json
+++ b/locale/sv/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/sv/freedombone.json b/locale/sv/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/sv/freedombone.json
+++ b/locale/sv/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone-backup-local.json b/locale/ta/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/ta/freedombone-backup-local.json
+++ b/locale/ta/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/ta/freedombone-backup-remote.json b/locale/ta/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/ta/freedombone-backup-remote.json
+++ b/locale/ta/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/ta/freedombone-client.json b/locale/ta/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/ta/freedombone-client.json
+++ b/locale/ta/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone-controlpanel-user.json b/locale/ta/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/ta/freedombone-controlpanel-user.json
+++ b/locale/ta/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/ta/freedombone-restore-local.json b/locale/ta/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/ta/freedombone-restore-local.json
+++ b/locale/ta/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ta/freedombone-restore-remote.json b/locale/ta/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/ta/freedombone-restore-remote.json
+++ b/locale/ta/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/ta/freedombone-sec.json b/locale/ta/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/ta/freedombone-sec.json
+++ b/locale/ta/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/ta/freedombone.json b/locale/ta/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/ta/freedombone.json
+++ b/locale/ta/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone-backup-local.json b/locale/th/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/th/freedombone-backup-local.json
+++ b/locale/th/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/th/freedombone-backup-remote.json b/locale/th/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/th/freedombone-backup-remote.json
+++ b/locale/th/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/th/freedombone-client.json b/locale/th/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/th/freedombone-client.json
+++ b/locale/th/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone-controlpanel-user.json b/locale/th/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/th/freedombone-controlpanel-user.json
+++ b/locale/th/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/th/freedombone-restore-local.json b/locale/th/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/th/freedombone-restore-local.json
+++ b/locale/th/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/th/freedombone-restore-remote.json b/locale/th/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/th/freedombone-restore-remote.json
+++ b/locale/th/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/th/freedombone-sec.json b/locale/th/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/th/freedombone-sec.json
+++ b/locale/th/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/th/freedombone.json b/locale/th/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/th/freedombone.json
+++ b/locale/th/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone-backup-local.json b/locale/tl/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/tl/freedombone-backup-local.json
+++ b/locale/tl/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/tl/freedombone-backup-remote.json b/locale/tl/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/tl/freedombone-backup-remote.json
+++ b/locale/tl/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/tl/freedombone-client.json b/locale/tl/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/tl/freedombone-client.json
+++ b/locale/tl/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone-controlpanel-user.json b/locale/tl/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/tl/freedombone-controlpanel-user.json
+++ b/locale/tl/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/tl/freedombone-restore-local.json b/locale/tl/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/tl/freedombone-restore-local.json
+++ b/locale/tl/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/tl/freedombone-restore-remote.json b/locale/tl/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/tl/freedombone-restore-remote.json
+++ b/locale/tl/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/tl/freedombone-sec.json b/locale/tl/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/tl/freedombone-sec.json
+++ b/locale/tl/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/tl/freedombone.json b/locale/tl/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/tl/freedombone.json
+++ b/locale/tl/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone-backup-local.json b/locale/to/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/to/freedombone-backup-local.json
+++ b/locale/to/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/to/freedombone-backup-remote.json b/locale/to/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/to/freedombone-backup-remote.json
+++ b/locale/to/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/to/freedombone-client.json b/locale/to/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/to/freedombone-client.json
+++ b/locale/to/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone-controlpanel-user.json b/locale/to/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/to/freedombone-controlpanel-user.json
+++ b/locale/to/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/to/freedombone-restore-local.json b/locale/to/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/to/freedombone-restore-local.json
+++ b/locale/to/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/to/freedombone-restore-remote.json b/locale/to/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/to/freedombone-restore-remote.json
+++ b/locale/to/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/to/freedombone-sec.json b/locale/to/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/to/freedombone-sec.json
+++ b/locale/to/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/to/freedombone.json b/locale/to/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/to/freedombone.json
+++ b/locale/to/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone-backup-local.json b/locale/tr/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/tr/freedombone-backup-local.json
+++ b/locale/tr/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/tr/freedombone-backup-remote.json b/locale/tr/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/tr/freedombone-backup-remote.json
+++ b/locale/tr/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/tr/freedombone-client.json b/locale/tr/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/tr/freedombone-client.json
+++ b/locale/tr/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone-controlpanel-user.json b/locale/tr/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/tr/freedombone-controlpanel-user.json
+++ b/locale/tr/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/tr/freedombone-restore-local.json b/locale/tr/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/tr/freedombone-restore-local.json
+++ b/locale/tr/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/tr/freedombone-restore-remote.json b/locale/tr/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/tr/freedombone-restore-remote.json
+++ b/locale/tr/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/tr/freedombone-sec.json b/locale/tr/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/tr/freedombone-sec.json
+++ b/locale/tr/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/tr/freedombone.json b/locale/tr/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/tr/freedombone.json
+++ b/locale/tr/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone-backup-local.json b/locale/uk/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/uk/freedombone-backup-local.json
+++ b/locale/uk/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/uk/freedombone-backup-remote.json b/locale/uk/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/uk/freedombone-backup-remote.json
+++ b/locale/uk/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/uk/freedombone-client.json b/locale/uk/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/uk/freedombone-client.json
+++ b/locale/uk/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone-controlpanel-user.json b/locale/uk/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/uk/freedombone-controlpanel-user.json
+++ b/locale/uk/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/uk/freedombone-restore-local.json b/locale/uk/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/uk/freedombone-restore-local.json
+++ b/locale/uk/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/uk/freedombone-restore-remote.json b/locale/uk/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/uk/freedombone-restore-remote.json
+++ b/locale/uk/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/uk/freedombone-sec.json b/locale/uk/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/uk/freedombone-sec.json
+++ b/locale/uk/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/uk/freedombone.json b/locale/uk/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/uk/freedombone.json
+++ b/locale/uk/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone-backup-local.json b/locale/vi/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/vi/freedombone-backup-local.json
+++ b/locale/vi/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/vi/freedombone-backup-remote.json b/locale/vi/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/vi/freedombone-backup-remote.json
+++ b/locale/vi/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/vi/freedombone-client.json b/locale/vi/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/vi/freedombone-client.json
+++ b/locale/vi/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone-controlpanel-user.json b/locale/vi/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/vi/freedombone-controlpanel-user.json
+++ b/locale/vi/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/vi/freedombone-restore-local.json b/locale/vi/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/vi/freedombone-restore-local.json
+++ b/locale/vi/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/vi/freedombone-restore-remote.json b/locale/vi/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/vi/freedombone-restore-remote.json
+++ b/locale/vi/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/vi/freedombone-sec.json b/locale/vi/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/vi/freedombone-sec.json
+++ b/locale/vi/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/vi/freedombone.json b/locale/vi/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/vi/freedombone.json
+++ b/locale/vi/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone-backup-local.json b/locale/zh_cn/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/zh_cn/freedombone-backup-local.json
+++ b/locale/zh_cn/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/zh_cn/freedombone-backup-remote.json b/locale/zh_cn/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/zh_cn/freedombone-backup-remote.json
+++ b/locale/zh_cn/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/zh_cn/freedombone-client.json b/locale/zh_cn/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/zh_cn/freedombone-client.json
+++ b/locale/zh_cn/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone-controlpanel-user.json b/locale/zh_cn/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/zh_cn/freedombone-controlpanel-user.json
+++ b/locale/zh_cn/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/zh_cn/freedombone-restore-local.json b/locale/zh_cn/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/zh_cn/freedombone-restore-local.json
+++ b/locale/zh_cn/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/zh_cn/freedombone-restore-remote.json b/locale/zh_cn/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/zh_cn/freedombone-restore-remote.json
+++ b/locale/zh_cn/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/zh_cn/freedombone-sec.json b/locale/zh_cn/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/zh_cn/freedombone-sec.json
+++ b/locale/zh_cn/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/zh_cn/freedombone.json b/locale/zh_cn/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/zh_cn/freedombone.json
+++ b/locale/zh_cn/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone-backup-local.json b/locale/zh_tw/freedombone-backup-local.json
index 82a2f7b72b210e84ee1f6c4edf58f1b9f8e26476..a4390eea3010def82385293b299c862ac00cca70 100644
--- a/locale/zh_tw/freedombone-backup-local.json
+++ b/locale/zh_tw/freedombone-backup-local.json
@@ -17,6 +17,7 @@
     "Backing up fin files for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
     "Creating an email archive for $USERNAME": "",
diff --git a/locale/zh_tw/freedombone-backup-remote.json b/locale/zh_tw/freedombone-backup-remote.json
index 854e5216cc135cf78008222c7024ff4037f0c4dc..5e00669cf97ddc8eed0739813350074b9c88c556 100644
--- a/locale/zh_tw/freedombone-backup-remote.json
+++ b/locale/zh_tw/freedombone-backup-remote.json
@@ -11,6 +11,7 @@
     "Backing up ssh keys for $USERNAME": "",
     "Backing up syncthing files for $USERNAME": "",
     "Backing up config files for $USERNAME": "",
+    "Backing up monkeysphere files for $USERNAME": "",
     "Backing up fin files for $USERNAME": "",
     "Backing up local files for $USERNAME": "",
     "Backing up Mutt settings for $USERNAME": "",
diff --git a/locale/zh_tw/freedombone-client.json b/locale/zh_tw/freedombone-client.json
index adad53c5781b4763115215168f07d3f59d3e09da..6ba2b546f2bd3a7de92fdff69d68c7fb4b02edbc 100644
--- a/locale/zh_tw/freedombone-client.json
+++ b/locale/zh_tw/freedombone-client.json
@@ -1,3 +1,3 @@
 {
-    "${PROJECT_NAME}-client": ""
+    "${PROJECT_NAME}-client --mesh [yes|no] --monkeysphere [yes|no]": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone-controlpanel-user.json b/locale/zh_tw/freedombone-controlpanel-user.json
index cc97ed07f162fa0d5f65a83add40a3177c56966d..ca7898d51b5ca57501726252960e6c9079bd9cf7 100644
--- a/locale/zh_tw/freedombone-controlpanel-user.json
+++ b/locale/zh_tw/freedombone-controlpanel-user.json
@@ -37,10 +37,12 @@
     "No subject was given": "",
     "Email with subject $BLOCK_SUBJECT is now blocked": "",
     "Email with subject $BLOCK_SUBJECT is now unblocked": "",
-    "Your PGP/GPG Key": "",
+    "My PGP/GPG Key": "",
     "Email Address: $MY_EMAIL_ADDRESS\\n\\nKey ID: $GPG_ID\\n\\nFingerprint: $GPG_FINGERPRINT\\n\\nCreated: $GPG_DATE": "",
     "Publish your PGP/GPG key": "",
     "Your key has now been published": "",
+    "Refresh PGP/GPG keys": "",
+    "Your keys have been refreshed": "",
     "Add someone's PGP/GPG key": "",
     "Enter their email address below": "",
     "This doesn't look like an email address": "",
@@ -81,10 +83,14 @@
     "Paste the device ID which is to be removed below": "",
     "That ID wasn't registered anyway": "",
     "The ID was removed": "",
-    "Your Encryption Keys": "",
+    "Sign a PGP/GPG key": "",
+    "Enter the Key ID, address or domain to be signed": "",
+    "$SIGN_ADDRESS was signed": "",
+    "My Encryption Keys": "",
     "Choose an operation:": "",
     "Show your PGP/GPG key": "",
     "Publish your PGP/GPG key so that others can find it": "",
+    "Refresh your PGP/GPG keys": "",
     "Back to main menu": "",
     "Change Email Filtering Rules": "",
     "Add yourself to a mailing list": "",
diff --git a/locale/zh_tw/freedombone-restore-local.json b/locale/zh_tw/freedombone-restore-local.json
index 7941ffcc13e20d5c9b8d55c9da7289a4a246bd21..833227c89fc7cf1eead1362a03134d9dc94bbe3e 100644
--- a/locale/zh_tw/freedombone-restore-local.json
+++ b/locale/zh_tw/freedombone-restore-local.json
@@ -30,6 +30,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/zh_tw/freedombone-restore-remote.json b/locale/zh_tw/freedombone-restore-remote.json
index 153baafb095353c07d0fa3abf9d60bed2d505595..fbe522f8c2c82314ab5a9c4e701807eb80182ad0 100644
--- a/locale/zh_tw/freedombone-restore-remote.json
+++ b/locale/zh_tw/freedombone-restore-remote.json
@@ -23,6 +23,7 @@
     "Restoring IPFS": "",
     "Restoring ssh keys for $USERNAME": "",
     "Restoring config files for $USERNAME": "",
+    "Restoring monkeysphere ids for $USERNAME": "",
     "Restoring fin files for $USERNAME": "",
     "Restoring local files for $USERNAME": "",
     "Restoring certificates": "",
diff --git a/locale/zh_tw/freedombone-sec.json b/locale/zh_tw/freedombone-sec.json
index a95e9be504e8afdbf2d21fb00dd4a0797db932f7..59ccef4bc07c32a042166dfc4de9b6b674022cc1 100644
--- a/locale/zh_tw/freedombone-sec.json
+++ b/locale/zh_tw/freedombone-sec.json
@@ -24,6 +24,11 @@
     "Invalid domain name: $new_domain": "",
     "Update ciphersuite": "",
     "The ciphersuite has been updated to recommended versions": "",
+    "GPG based authentication": "",
+    "\\nEnable GPG based authentication with monkeysphere ?": "",
+    "$MY_USERNAME does not currently have any ids within ~/.monkeysphere/authorized_user_ids": "",
+    "GPG based authentication was enabled": "",
+    "GPG based authentication was disabled": "",
     "Import file $IMPORT_FILE not found": "",
     "Security settings exported to $EXPORT_FILE": ""
 }
\ No newline at end of file
diff --git a/locale/zh_tw/freedombone.json b/locale/zh_tw/freedombone.json
index 91cd0528b63628d1f946bebcd44258b1116766bd..2b3ad3a485f5ff601ac824b4c9cd331c5b594ff5 100644
--- a/locale/zh_tw/freedombone.json
+++ b/locale/zh_tw/freedombone.json
@@ -81,7 +81,7 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
-    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
+    "\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": "",
@@ -91,6 +91,7 @@
     "Database password: $MARIADB_PASSWORD": "",
     "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
     "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
+    "After the initial install edit ${GOPATH}/src/github.com/gogits/gogs/custom/conf/app.ini": "",
     "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.": "",
@@ -141,6 +142,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
-    "\n    *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n    HTTP     80\n    HTTPS    443\n    SSH      2222\n    DLNA     1900\n    DLNA     8200\n    XMPP     5222-5223\n    XMPP     5269\n    XMPP     5280-5281\n    IRC      6697\n    Git      9418\n    Email    25\n    Email    587\n    Email    465\n    Email    993\n    VoIP     64738\n    VoIP     5060\n    Tox      33445\n    ": "",
+    "\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.": ""
 }
\ No newline at end of file