diff --git a/locale/de/freedombone-controlpanel.json b/locale/de/freedombone-controlpanel.json
index f1e26866d248ad633b190f0c82de9df26c326c9e..d8392be0bb8d2a53a3d34d6cea3988550327b002 100644
--- a/locale/de/freedombone-controlpanel.json
+++ b/locale/de/freedombone-controlpanel.json
@@ -3,6 +3,9 @@
     "Check for updates": "",
     "Upgrade script was not found": "",
     "Freedombone Control Panel": "",
+    "Main Repository": "",
+    "Set the main repository:": "",
+    "Main repository set to $PROJECT_REPO": "",
     "Add new user": "",
     "Username:": "",
     "ssh public key (optional):": "",
@@ -172,6 +175,7 @@
     "Logging on/off": "",
     "Ping enable/disable": "",
     "Security Settings": "",
+    "Set the main repository": "",
     "Media menu": "",
     "IRC menu": ""
 }
\ No newline at end of file
diff --git a/locale/de/freedombone-restore-gogs.json b/locale/de/freedombone-restore-gogs.json
new file mode 100644
index 0000000000000000000000000000000000000000..c182fba9a8f1034d5f1549087610f8beee5b07cc
--- /dev/null
+++ b/locale/de/freedombone-restore-gogs.json
@@ -0,0 +1,19 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Setting permissions": "",
+    "Unmount encrypted USB": "",
+    "No backup directory found on the USB drive.": "",
+    "Checking that admin user exists": "",
+    "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
+    "Restoring Gogs settings": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restore Gogs from USB drive is complete. You can now unplug it.": ""
+}
\ No newline at end of file
diff --git a/locale/de/freedombone-trove.json b/locale/de/freedombone-trove.json
new file mode 100644
index 0000000000000000000000000000000000000000..e880474d6031d000420bd41a19d7591767a2263a
--- /dev/null
+++ b/locale/de/freedombone-trove.json
@@ -0,0 +1,8 @@
+{
+    "${PROJECT_NAME}-trove --sync [domain/url] -p [password]": "",
+    "  -p|--password [yes|no]      Friend's trove user password": "",
+    "  -m|--mypassword [yes|no]    Local trove user password": "",
+    "     --port [number]          Friend's server ssh port number": "",
+    "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "WARNING: failed to mirror repo ${repo_url}": ""
+}
\ No newline at end of file
diff --git a/locale/de/freedombone-trove.mo b/locale/de/freedombone-trove.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3610c81e08242a042867b8965da3279fb745f5dd
Binary files /dev/null and b/locale/de/freedombone-trove.mo differ
diff --git a/locale/de/freedombone.json b/locale/de/freedombone.json
index bfa5452b58b073db5405fa1cfd63daf8407e35db..593343bb1106820bc78f936b7d28f564dfb4378b 100644
--- a/locale/de/freedombone.json
+++ b/locale/de/freedombone.json
@@ -9,7 +9,7 @@
     "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The command ${PROJECT_NAME}-config was not found": "",
-    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
+    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
     "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",
diff --git a/locale/es/freedombone-controlpanel.json b/locale/es/freedombone-controlpanel.json
index f1e26866d248ad633b190f0c82de9df26c326c9e..d8392be0bb8d2a53a3d34d6cea3988550327b002 100644
--- a/locale/es/freedombone-controlpanel.json
+++ b/locale/es/freedombone-controlpanel.json
@@ -3,6 +3,9 @@
     "Check for updates": "",
     "Upgrade script was not found": "",
     "Freedombone Control Panel": "",
+    "Main Repository": "",
+    "Set the main repository:": "",
+    "Main repository set to $PROJECT_REPO": "",
     "Add new user": "",
     "Username:": "",
     "ssh public key (optional):": "",
@@ -172,6 +175,7 @@
     "Logging on/off": "",
     "Ping enable/disable": "",
     "Security Settings": "",
+    "Set the main repository": "",
     "Media menu": "",
     "IRC menu": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-restore-gogs.json b/locale/es/freedombone-restore-gogs.json
new file mode 100644
index 0000000000000000000000000000000000000000..c182fba9a8f1034d5f1549087610f8beee5b07cc
--- /dev/null
+++ b/locale/es/freedombone-restore-gogs.json
@@ -0,0 +1,19 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Setting permissions": "",
+    "Unmount encrypted USB": "",
+    "No backup directory found on the USB drive.": "",
+    "Checking that admin user exists": "",
+    "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
+    "Restoring Gogs settings": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restore Gogs from USB drive is complete. You can now unplug it.": ""
+}
\ No newline at end of file
diff --git a/locale/es/freedombone-trove.json b/locale/es/freedombone-trove.json
new file mode 100644
index 0000000000000000000000000000000000000000..e880474d6031d000420bd41a19d7591767a2263a
--- /dev/null
+++ b/locale/es/freedombone-trove.json
@@ -0,0 +1,8 @@
+{
+    "${PROJECT_NAME}-trove --sync [domain/url] -p [password]": "",
+    "  -p|--password [yes|no]      Friend's trove user password": "",
+    "  -m|--mypassword [yes|no]    Local trove user password": "",
+    "     --port [number]          Friend's server ssh port number": "",
+    "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "WARNING: failed to mirror repo ${repo_url}": ""
+}
\ No newline at end of file
diff --git a/locale/es/freedombone-trove.mo b/locale/es/freedombone-trove.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3610c81e08242a042867b8965da3279fb745f5dd
Binary files /dev/null and b/locale/es/freedombone-trove.mo differ
diff --git a/locale/es/freedombone.json b/locale/es/freedombone.json
index bfa5452b58b073db5405fa1cfd63daf8407e35db..593343bb1106820bc78f936b7d28f564dfb4378b 100644
--- a/locale/es/freedombone.json
+++ b/locale/es/freedombone.json
@@ -9,7 +9,7 @@
     "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The command ${PROJECT_NAME}-config was not found": "",
-    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
+    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
     "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",
diff --git a/locale/fr/freedombone-controlpanel.json b/locale/fr/freedombone-controlpanel.json
index f1e26866d248ad633b190f0c82de9df26c326c9e..d8392be0bb8d2a53a3d34d6cea3988550327b002 100644
--- a/locale/fr/freedombone-controlpanel.json
+++ b/locale/fr/freedombone-controlpanel.json
@@ -3,6 +3,9 @@
     "Check for updates": "",
     "Upgrade script was not found": "",
     "Freedombone Control Panel": "",
+    "Main Repository": "",
+    "Set the main repository:": "",
+    "Main repository set to $PROJECT_REPO": "",
     "Add new user": "",
     "Username:": "",
     "ssh public key (optional):": "",
@@ -172,6 +175,7 @@
     "Logging on/off": "",
     "Ping enable/disable": "",
     "Security Settings": "",
+    "Set the main repository": "",
     "Media menu": "",
     "IRC menu": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-restore-gogs.json b/locale/fr/freedombone-restore-gogs.json
new file mode 100644
index 0000000000000000000000000000000000000000..c182fba9a8f1034d5f1549087610f8beee5b07cc
--- /dev/null
+++ b/locale/fr/freedombone-restore-gogs.json
@@ -0,0 +1,19 @@
+{
+    "Please attach a USB drive": "",
+    "There was a problem mounting the USB drive to $USB_MOUNT": "",
+    "Unable to unmount the drive. This means that the backup did not work": "",
+    "Setting permissions": "",
+    "Unmount encrypted USB": "",
+    "No backup directory found on the USB drive.": "",
+    "Checking that admin user exists": "",
+    "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "",
+    "Copying GPG keys from admin user to root": "",
+    "Restoring ${1} database": "",
+    "Unable to restore ${1} database": "",
+    "Restoring ${1} installation": "",
+    "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "",
+    "Restoring Gogs settings": "",
+    "Restoring Gogs repos": "",
+    "Restoring Gogs authorized_keys": "",
+    "Restore Gogs from USB drive is complete. You can now unplug it.": ""
+}
\ No newline at end of file
diff --git a/locale/fr/freedombone-trove.json b/locale/fr/freedombone-trove.json
new file mode 100644
index 0000000000000000000000000000000000000000..e880474d6031d000420bd41a19d7591767a2263a
--- /dev/null
+++ b/locale/fr/freedombone-trove.json
@@ -0,0 +1,8 @@
+{
+    "${PROJECT_NAME}-trove --sync [domain/url] -p [password]": "",
+    "  -p|--password [yes|no]      Friend's trove user password": "",
+    "  -m|--mypassword [yes|no]    Local trove user password": "",
+    "     --port [number]          Friend's server ssh port number": "",
+    "  -s|--sync [domain]          Friend's server domain to sync with": "",
+    "WARNING: failed to mirror repo ${repo_url}": ""
+}
\ No newline at end of file
diff --git a/locale/fr/freedombone-trove.mo b/locale/fr/freedombone-trove.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4d2fd94bdf26bb1964259b2868d65f3d688faf77
Binary files /dev/null and b/locale/fr/freedombone-trove.mo differ
diff --git a/locale/fr/freedombone.json b/locale/fr/freedombone.json
index bfa5452b58b073db5405fa1cfd63daf8407e35db..593343bb1106820bc78f936b7d28f564dfb4378b 100644
--- a/locale/fr/freedombone.json
+++ b/locale/fr/freedombone.json
@@ -9,7 +9,7 @@
     "The domain $TEST_DOMAIN_NAME has too many subdomains. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
     "The command ${PROJECT_NAME}-config was not found": "",
-    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
+    "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
     "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",