diff --git a/src/translation/en.json b/src/translation/en.json
index 91131393b..f1ee6652c 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -148,6 +148,65 @@
             "title": "Logs",
             "description": "Please be careful when uploading these logs to a public server since they may contain sensitive information.",
             "showLogs": "Show Logs"
+        },
+        "backupDetails": {
+            "title": "Backup Details",
+            "id": "Id",
+            "date": "Date",
+            "version": "Version",
+            "format": "Format",
+            "list": "References backups of {{ backup.contents.length }} apps"
+        },
+        "backupFailed": {
+            "title": "Unable to create backup"
+        },
+        "cleanupBackups": {
+            "title": "Cleanup Backups",
+            "description": "Backups are automatically cleaned up daily based on the retention policy. This action will trigger an immediate removal of backups.",
+            "cleanupNow": "Cleanup now"
+        },
+        "configureBackupSchedule": {
+            "title": "Configure Backup Schedule and Retention",
+            "schedule": "Schedule",
+            "scheduleDescription": "Select the days and hours during which Cloudron will backup. Please take care to not overlap this schedule with the <a href=\"/#/settings\">update schedule</a>.",
+            "days": "Days",
+            "hours": "Hours",
+            "retentionPolicy": "Retention Policy"
+        },
+        "configureBackupStorage": {
+            "title": "Configure Backup Storage",
+            "provider": "Storage provider",
+            "noopNote": "This option breaks the backup and restore functionality of Cloudron and should only be used for testing. Please make sure the server is completely backed up using alternate means.",
+            "mountPoint": "Mount point",
+            "mountPointDescription": "The mount point has to be setup manually. See <a ng-href=\"https://docs.cloudron.io/backups/#{{ provider }}\" target=\"_blank\">docs</a>.",
+            "localDirectory": "Local backup directory",
+            "ext4Label": "Backup directory is an external EXT4 Disk",
+            "hardlinksLabel": "Use hardlinks",
+            "s3Endpoint": "Endpoint",
+            "acceptSelfSignedCerts": "Accept Self-signed certificate",
+            "bucketName": "Bucket name",
+            "prefix": "Prefix",
+            "region": "Region",
+            "s3AccessKeyId": "Access key id",
+            "s3SecretAccessKey": "Secret access key",
+            "gcsServiceKey": "Service Account Key",
+            "format": "Storage Format",
+            "formatChangeNote": "Previous backups using the old storage format have to be removed manually.",
+            "s3LikeNote": "Please remove any object expiration lifecycle rules since it will corrupt rsync backups.",
+            "encryptionPassword": "Encryption Password (optional)",
+            "encryptionDescription": "Save this passphrase in a safe place. Cloudron does not store this password. Backups cannot be decrypted without the passphrase",
+            "advancedSettings": "Advanced settings...",
+            "memoryLimit": "Memory Limit",
+            "memoryLimitDescription": "Memory limit for the backup task. Adjust this if you increase the concurrency values from their defaults.",
+            "uploadPartSize": "Upload Part Size",
+            "uploadPartSizeDescription": "Multi-part upload part size. Up to 3 parts are uploaded in parallel and requires as much memory.",
+            "downloadConcurrency": "Download Concurrency",
+            "downloadConcurrencyDescription": "Number of files to download in parallel when restoring",
+            "uploadConcurrency": "Upload Concurrency",
+            "uploadConcurrencyDescription": "Number of files to upload in parallel when backing up",
+            "copyConcurrency": "Copy Concurrency",
+            "copyConcurrencyDescription": "Number of remote file copies in parallel when backing up.",
+            "copyConcurrencyDigitalOceanNote": "DigitalOcean Spaces rate limits at 20."
         }
     },
     "branding": {
diff --git a/src/views/backups.html b/src/views/backups.html
index 565aa9d7e..cad72e95c 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -3,33 +3,33 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Backup Details</h4>
+        <h4 class="modal-title">{{ 'backups.backupDetails.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <div class="row">
-          <div class="col-xs-3 text-muted">Id:</div>
+          <div class="col-xs-3 text-muted">{{ 'backups.backupDetails.id' | tr }}:</div>
           <div class="col-xs-9 text-right">{{ backupDetails.backup.id }}</div>
         </div>
         <div class="row">
-          <div class="col-xs-3 text-muted">Date:</div>
+          <div class="col-xs-3 text-muted">{{ 'backups.backupDetails.date' | tr }}:</div>
           <div class="col-xs-9 text-right">{{ backupDetails.backup.creationTime | prettyLongDate }}</div>
         </div>
         <div class="row">
-          <div class="col-xs-3 text-muted">Version:</div>
+          <div class="col-xs-3 text-muted">{{ 'backups.backupDetails.version' | tr }}:</div>
           <div class="col-xs-9 text-right">v{{ backupDetails.backup.packageVersion }}</div>
         </div>
         <div class="row">
-          <div class="col-xs-3 text-muted">Format:</div>
+          <div class="col-xs-3 text-muted">{{ 'backups.backupDetails.format' | tr }}:</div>
           <div class="col-xs-9 text-right">{{ backupDetails.backup.format }}</div>
         </div>
         <br/>
-        <p class="text-muted">References backups of {{ backupDetails.backup.contents.length }} apps:</p>
+        <p class="text-muted">{{ 'backups.backupDetails.list' | tr:backupDetails }}:</p>
         <span ng-repeat="app in backupDetails.backup.contents | orderBy:['label','fqdn']">
-          <a ng-href="/#/app/{{app.id}}/backups">{{app.label || app.fqdn}}</a><span ng-hide="$last">,</span>
+          <a ng-href="/#/app/{{app.id}}/backups">{{ app.label || app.fqdn }}</a><span ng-hide="$last">,</span>
         </span>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
       </div>
     </div>
   </div>
@@ -40,13 +40,13 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Unable to create backup</h4>
+        <h4 class="modal-title">{{ 'backups.backupFailed.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         {{ createBackup.errorMessage }}
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-success" data-dismiss="modal">OK</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
       </div>
     </div>
   </div>
@@ -57,15 +57,12 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Cleanup Backups</h4>
-      </div>
-      <div class="modal-body">
-        Backups are automatically cleaned up daily based on the retention policy. This action will trigger an immediate removal
-        of backups.
+        <h4 class="modal-title">{{ 'backups.cleanupBackups.title' | tr }}</h4>
       </div>
+      <div class="modal-body">{{ 'backups.cleanupBackups.description' | tr }}</div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="createBackup.startCleanup()">Cleanup now</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="createBackup.startCleanup()">{{ 'backups.cleanupBackups.cleanupNow' | tr }}</button>
       </div>
     </div>
   </div>
@@ -76,41 +73,36 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Configure Backup Schedule and Retention</h4>
+        <h4 class="modal-title">{{ 'backups.configureBackupSchedule.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="configureScheduleAndRetentionForm" role="form" novalidate ng-submit="configureScheduleAndRetention.submit()" autocomplete="off">
-          <fieldset>
-            <p class="has-error text-center" ng-show="configureScheduleAndRetention.error">{{ configureScheduleAndRetention.error.generic }}</p>
+          <p class="has-error text-center" ng-show="configureScheduleAndRetention.error">{{ configureScheduleAndRetention.error.generic }}</p>
 
-            <div class="form-group">
-              <label class="control-label" for="backupSchedule">Schedule</label>
-              <p>Select the days and hours during which Cloudron will backup. Please take care to not overlap this schedule with the
-                <a href="/#/settings">update schedule</a>.
-              </p>
+          <div class="form-group">
+            <label class="control-label" for="backupSchedule">{{ 'backups.configureBackupSchedule.schedule' | tr }}</label>
+            <p ng-bind-html="'backups.configureBackupSchedule.scheduleDescription' | tr"></p>
 
-              <div class="row" style="margin-left: 20px;">
-                <div class="col-md-5">
-                  Days: <multiselect id="backupSchedule" class="input-sm stretch" ng-model="configureScheduleAndRetention.days" options="a.name for a in cronDays" data-multiple="true"></multiselect>
-                </div>
+            <div class="row" style="margin-left: 20px;">
+              <div class="col-md-5">
+                {{ 'backups.configureBackupSchedule.days' | tr }}: <multiselect id="backupSchedule" class="input-sm stretch" ng-model="configureScheduleAndRetention.days" options="a.name for a in cronDays" data-multiple="true"></multiselect>
+              </div>
 
-                <div class="col-md-5">
-                  Hours: <multiselect class="input-sm stretch" ng-model="configureScheduleAndRetention.hours" options="a.name for a in cronHours" data-multiple="true"></multiselect>
-                </div>
+              <div class="col-md-5">
+                {{ 'backups.configureBackupSchedule.hours' | tr }}: <multiselect class="input-sm stretch" ng-model="configureScheduleAndRetention.hours" options="a.name for a in cronHours" data-multiple="true"></multiselect>
               </div>
             </div>
+          </div>
 
-            <div class="form-group">
-              <label class="control-label" for="backupRetention">Retention Policy</label>
-              <select class="form-control" id="backupRetention" ng-model="configureScheduleAndRetention.retentionPolicy" ng-options="a.value as a.name for a in retentionPolicies"></select>
-            </div>
-
-          </fieldset>
+          <div class="form-group">
+            <label class="control-label" for="backupRetention">{{ 'backups.configureBackupSchedule.retentionPolicy' | tr }}</label>
+            <select class="form-control" id="backupRetention" ng-model="configureScheduleAndRetention.retentionPolicy" ng-options="a.value as a.name for a in retentionPolicies"></select>
+          </div>
         </form>
       </div>
       <div class="modal-footer ">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureScheduleAndRetention.submit()" ng-disabled="configureScheduleAndRetention.$invalid || configureScheduleAndRetention.busy"><i class="fa fa-circle-notch fa-spin" ng-show="configureScheduleAndRetention.busy"></i><span> Save</span></button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureScheduleAndRetention.submit()" ng-disabled="configureScheduleAndRetention.$invalid || configureScheduleAndRetention.busy"><i class="fa fa-circle-notch fa-spin" ng-show="configureScheduleAndRetention.busy"></i><span> {{ 'main.dialog.save' | tr }}</span></button>
       </div>
     </div>
   </div>
@@ -121,205 +113,201 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Configure Backup Storage</h4>
+        <h4 class="modal-title">{{ 'backups.configureBackupStorage.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <form name="configureBackupForm" role="form" novalidate ng-submit="configureBackup.submit()" autocomplete="off">
-          <fieldset>
-            <p class="has-error text-center" ng-show="configureBackup.error">{{ configureBackup.error.generic }}</p>
+          <p class="has-error text-center" ng-show="configureBackup.error">{{ configureBackup.error.generic }}</p>
+
+          <div class="form-group">
+            <label class="control-label" for="storageProviderProvider">{{ 'backups.configureBackupStorage.provider' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#storage-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <p class="small text-info" ng-show="backupConfig.provider !== configureBackup.provider">Backups in the old storage location have to be removed manually.</p>
+            <select class="form-control" id="storageProviderProvider" ng-model="configureBackup.provider" ng-options="a.value as a.name for a in storageProvider" ng-change=configureBackup.clearProviderFields()></select>
+          </div>
+
+          <!-- Noop -->
+          <div class="form-group" ng-show="configureBackup.provider === 'noop'">
+            <p class="has-error">{{ 'backups.configureBackupStorage.noopNote' | tr }}</p>
+          </div>
+
+          <!-- SSHFS/CIFS/NFS -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.mountPoint || (configureBackupForm.mountPoint.$dirty && !configureBackup.mountPoint) }" ng-show="mountlike(configureBackup.provider)">
+            <label class="control-label" for="inputConfigureMountPoint">{{ 'backups.configureBackupStorage.mountPoint' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="configureBackup.busy" placeholder="Folder where filesystem is mounted" ng-required="mountlike(configureBackup.provider)">
+            <p ng-bind-html="'backups.configureBackupStorage.mountPointDescription' | tr:configureBackup"></p>
+          </div>
+
+          <!-- Filesystem -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.backupFolder || !configureBackup.backupFolder }" ng-show="configureBackup.provider === 'filesystem'">
+            <label class="control-label" for="inputConfigureBackupFolder">{{ 'backups.configureBackupStorage.localDirectory' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.backupFolder" id="inputConfigureBackupFolder" name="backupFolder" ng-disabled="configureBackup.busy" placeholder="Directory for backups" ng-required="configureBackup.provider === 'filesystem'">
+          </div>
+
+          <div class="checkbox" ng-show="configureBackup.provider === 'filesystem'">
+            <label>
+              <input type="checkbox" ng-model="configureBackup.externalDisk">{{ 'backups.configureBackupStorage.ext4Label' | tr }}</input>
+            </label>
+          </div>
+
+          <!-- Filesystem/SSHFS/CIFS/NFS -->
+          <div class="checkbox" ng-show="configureBackup.provider === 'filesystem' || mountlike(configureBackup.provider)">
+            <label>
+              <input type="checkbox" ng-model="configureBackup.useHardlinks">{{ 'backups.configureBackupStorage.hardlinksLabel' | tr }}</input>
+            </label>
+          </div>
+
+          <!-- S3/Minio/SOS/GCS -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
+            <label class="control-label" for="inputConfigureBackupEndpoint">{{ 'backups.configureBackupStorage.s3Endpoint' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
+          </div>
+
+          <div class="checkbox" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'" >
+            <label>
+              <input type="checkbox" ng-model="configureBackup.acceptSelfSignedCerts">{{ 'backups.configureBackupStorage.acceptSelfSignedCerts' | tr }}</input>
+            </label>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="s3like(configureBackup.provider) || configureBackup.provider === 'gcs'">
+            <label class="control-label" for="inputConfigureBackupBucket">{{ 'backups.configureBackupStorage.bucketName' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
+          </div>
+
+          <!-- S3/Minio/SOS/GCS/SSHFS/CIFS/NFS/B2 -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.prefix }" ng-show="configureBackup.provider !== 'filesystem' && configureBackup.provider !== 'noop'">
+            <label class="control-label" for="inputConfigureBackupPrefix">{{ 'backups.configureBackupStorage.prefix' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" placeholder="Prefix for backup file names">
+          </div>
+
+          <!-- S3/Minio/SOS/GCS -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 's3'">
+            <label class="control-label" for="inputConfigureBackupS3Region">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupS3Region" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 's3-v4-compat'">
+            <label class="control-label" for="inputConfigureBackupS3V4CompatRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <input class="form-control" type="text" name="region" id="inputConfigureBackupS3V4CompatRegion" ng-model="configureBackup.region" ng-disabled="configureBackup.busy" placeholder="Leave empty to use us-east-1 as default"></input>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'digitalocean-spaces'">
+            <label class="control-label" for="inputConfigureBackupDORegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupDORegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in doSpacesRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'digitalocean-spaces'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'exoscale-sos'">
+            <label class="control-label" for="inputConfigureBackupExoscaleRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupExoscaleRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in exoscaleSosRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'exoscale-sos'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'wasabi'">
+            <label class="control-label" for="inputConfigureBackupWasabiRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupWasabiRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in wasabiRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'wasabi'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'scaleway-objectstorage'">
+            <label class="control-label" for="inputConfigureBackupScalewayRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupScalewayRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in scalewayRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'scaleway-objectstorage'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'linode-objectstorage'">
+            <label class="control-label" for="inputConfigureBackupLinodeRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupLinodeRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in linodeRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'linode-objectstorage'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'ovh-objectstorage'">
+            <label class="control-label" for="inputConfigureBackupOvhRegion">{{ 'backups.configureBackupStorage.region' | tr }}</label>
+            <select class="form-control" name="region" id="inputConfigureBackupOvhRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in ovhRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'ovh-objectstorage'"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }" ng-show="s3like(configureBackup.provider)">
+            <label class="control-label" for="inputConfigureBackupAccessKeyId">{{ 'backups.configureBackupStorage.s3AccessKeyId' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.secretAccessKey }" ng-show="s3like(configureBackup.provider)">
+            <label class="control-label" for="inputConfigureBackupSecretAccessKey">{{ 'backups.configureBackupStorage.s3SecretAccessKey' | tr }}</label>
+            <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.gcsKeyInput }" ng-show="configureBackup.provider === 'gcs'">
+            <label class="control-label" for="gcsKeyInput">{{ 'backups.configureBackupStorage.gcsServiceKey' | tr }}</label>
+
+            <div class="input-group">
+              <input type="file" id="gcsKeyFileInput" style="display:none"/>
+              <input type="text" class="form-control" placeholder="Service Account Key" ng-model="configureBackup.gcsKey.keyFileName" id="gcsKeyInput" name="cert" onclick="getElementById('gcsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'gcs'">
+              <span class="input-group-addon">
+                <i class="fa fa-upload" onclick="getElementById('gcsKeyFileInput').click();"></i>
+              </span>
+            </div>
+          </div>
+
+          <div class="form-group" ng-show="configureBackup.provider !== 'noop'">
+            <label class="control-label" for="storageFormat">{{ 'backups.configureBackupStorage.format' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#backup-formats" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <p class="small text-info" ng-show="backupConfig.format !== configureBackup.format">{{ 'backups.configureBackupStorage.formatChangeNote' | tr }}</p>
+            <p class="small text-info" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">{{ 'backups.configureBackupStorage.s3LikeNote' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#amazon-s3" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></p>
+            <select class="form-control" id="storageFormat" ng-model="configureBackup.format" ng-options="a.value as a.name for a in formats"></select>
+          </div>
+
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.password }" ng-show="configureBackup.provider !== 'noop'">
+            <label class="control-label" for="inputConfigureBackupPassword">{{ 'backups.configureBackupStorage.encryptionPassword' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#encryption" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <p class="small">{{ 'backups.configureBackupStorage.encryptionDescription' | tr }}</p>
+            <input type="text" class="form-control" name="password" ng-model="configureBackup.password" id="inputConfigureBackupPassword" name="prefix" ng-disabled="configureBackup.busy" placeholder="Passphrase used to encrypt the backups">
+          </div>
+
+          <a href="" ng-click="configureBackup.advancedVisible = true" ng-hide="configureBackup.advancedVisible">{{ 'backups.configureBackupStorage.advancedSettings' | tr }}</a>
+          <div  uib-collapse="!configureBackup.advancedVisible">
 
             <div class="form-group">
-              <label class="control-label" for="storageProviderProvider">Storage provider <sup><a ng-href="https://docs.cloudron.io/backups/#storage-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <p class="small text-info" ng-show="backupConfig.provider !== configureBackup.provider">Backups in the old storage location have to be removed manually.</p>
-              <select class="form-control" id="storageProviderProvider" ng-model="configureBackup.provider" ng-options="a.value as a.name for a in storageProvider" ng-change=configureBackup.clearProviderFields()></select>
+              <label class="control-label">{{ 'backups.configureBackupStorage.memoryLimit' | tr }}: <b>{{ configureBackup.memoryLimit | prettyByteSize:'Default (400 MB)' }}</b></label>
+              <p class="small">{{ 'backups.configureBackupStorage.memoryLimitDescription' | tr }}</p>
+              <div style="padding: 0 10px;">
+                <slider id="sliderConfigureBackupMemoryLimit" ng-model="configureBackup.memoryLimit" step="134217728" tooltip="hide" ticks="configureBackup.memoryTicks" ticks-snap-bounds="67108864"></slider>
+              </div>
             </div>
 
-            <!-- Noop -->
-            <div class="form-group" ng-show="configureBackup.provider === 'noop'">
-              <p class="has-error">
-                This option breaks the backup and restore functionality of Cloudron and should only be used for testing. Please make sure the server is completely backed up using alternate means.
+            <div class="form-group">
+              <label class="control-label" ng-show="s3like(configureBackup.provider)">{{ 'backups.configureBackupStorage.uploadPartSize' | tr }}: <b>{{ configureBackup.uploadPartSize | prettyByteSize:'Default (50 MB)' }}</b></label>
+              <p class="small">{{ 'backups.configureBackupStorage.uploadPartSizeDescription' | tr }}</p>
+              <div style="padding: 0 10px;">
+                <slider id="sliderConfigureBackupUploadPartSize" ng-model="configureBackup.uploadPartSize" step="1048576" tooltip="hide" ticks="configureBackup.uploadPartSizeTicks" ticks-snap-bounds="2097152"></slider>
+              </div>
+            </div>
+
+            <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
+              <label class="control-label">{{ 'backups.configureBackupStorage.uploadConcurrency' | tr }}: <b>{{ configureBackup.syncConcurrency }}</b></label>
+              <p class="small">{{ 'backups.configureBackupStorage.uploadConcurrencyDescription' | tr }}</p>
+              <div style="padding: 0 10px;">
+                <slider id="sliderConfigureBackupSyncConcurrency" ng-model="configureBackup.syncConcurrency" tooltip="hide" min="10" max="200" step="10"></slider>
+              </div>
+            </div>
+
+            <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
+              <label class="control-label">{{ 'backups.configureBackupStorage.downloadConcurrency' | tr }}: <b>{{ configureBackup.downloadConcurrency }}</b></label>
+              <p class="small">{{ 'backups.configureBackupStorage.downloadConcurrencyDescription' | tr }}</p>
+              <div style="padding: 0 10px;">
+                <slider id="sliderConfigureBackupCopyConcurrency" ng-model="configureBackup.downloadConcurrency" tooltip="hide" min="10" max="200" step="10"></slider>
+              </div>
+            </div>
+
+            <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
+              <label class="control-label">{{ 'backups.configureBackupStorage.copyConcurrency' | tr }}: <b>{{ configureBackup.copyConcurrency }}</b></label>
+              <p class="small">{{ 'backups.configureBackupStorage.copyConcurrencyDescription' | tr }}
+                <span ng-show="configureBackup.provider === 'digitalocean-spaces'">{{ 'backups.configureBackupStorage.copyConcurrencyDigitalOceanNote' | tr }}</span>
               </p>
-            </div>
-
-            <!-- SSHFS/CIFS/NFS -->
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.mountPoint || (configureBackupForm.mountPoint.$dirty && !configureBackup.mountPoint) }" ng-show="mountlike(configureBackup.provider)">
-              <label class="control-label" for="inputConfigureMountPoint">Mount point</label>
-              <input type="text" class="form-control" ng-model="configureBackup.mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="configureBackup.busy" placeholder="Folder where filesystem is mounted" ng-required="mountlike(configureBackup.provider)">
-              <p>The mount point has to be setup manually. See <a ng-href="https://docs.cloudron.io/backups/#{{ configureBackup.provider }}" target="_blank">docs</a>.</p>
-            </div>
-
-            <!-- Filesystem -->
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.backupFolder || !configureBackup.backupFolder }" ng-show="configureBackup.provider === 'filesystem'">
-              <label class="control-label" for="inputConfigureBackupFolder">Local backup directory</label>
-              <input type="text" class="form-control" ng-model="configureBackup.backupFolder" id="inputConfigureBackupFolder" name="backupFolder" ng-disabled="configureBackup.busy" placeholder="Directory for backups" ng-required="configureBackup.provider === 'filesystem'">
-            </div>
-
-            <div class="checkbox" ng-show="configureBackup.provider === 'filesystem'">
-              <label>
-                <input type="checkbox" ng-model="configureBackup.externalDisk" id="inputConfigureExternalDisk">Backup directory is an external EXT4 Disk</input>
-              </label>
-            </div>
-
-            <!-- Filesystem/SSHFS/CIFS/NFS -->
-            <div class="checkbox" ng-show="configureBackup.provider === 'filesystem' || mountlike(configureBackup.provider)">
-              <label>
-                <input type="checkbox" ng-model="configureBackup.useHardlinks" id="inputConfigureUseHardlinks">Use hardlinks</input>
-              </label>
-            </div>
-
-            <!-- S3/Minio/SOS/GCS -->
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
-              <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint</label>
-              <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
-            </div>
-
-            <div class="checkbox" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'" >
-              <label>
-                <input type="checkbox" ng-model="configureBackup.acceptSelfSignedCerts" id="inputConfigureBackupSelfSigned">Accept Self-signed certificate</input>
-              </label>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="s3like(configureBackup.provider) || configureBackup.provider === 'gcs'">
-              <label class="control-label" for="inputConfigureBackupBucket">Bucket name</label>
-              <input type="text" class="form-control" ng-model="configureBackup.bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
-            </div>
-
-            <!-- S3/Minio/SOS/GCS/SSHFS/CIFS/NFS/B2 -->
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.prefix }" ng-show="configureBackup.provider !== 'filesystem' && configureBackup.provider !== 'noop'">
-              <label class="control-label" for="inputConfigureBackupPrefix">Prefix</label>
-              <input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" placeholder="Prefix for backup file names">
-            </div>
-
-            <!-- S3/Minio/SOS/GCS -->
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 's3'">
-              <label class="control-label" for="inputConfigureBackupS3Region">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupS3Region" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 's3-v4-compat'">
-              <label class="control-label" for="inputConfigureBackupS3V4CompatRegion">Region</label>
-              <input class="form-control" type="text" name="region" id="inputConfigureBackupS3V4CompatRegion" ng-model="configureBackup.region" ng-disabled="configureBackup.busy" placeholder="Leave empty to use us-east-1 as default"></input>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'digitalocean-spaces'">
-              <label class="control-label" for="inputConfigureBackupDORegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupDORegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in doSpacesRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'digitalocean-spaces'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'exoscale-sos'">
-              <label class="control-label" for="inputConfigureBackupExoscaleRegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupExoscaleRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in exoscaleSosRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'exoscale-sos'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'wasabi'">
-              <label class="control-label" for="inputConfigureBackupWasabiRegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupWasabiRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in wasabiRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'wasabi'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'scaleway-objectstorage'">
-              <label class="control-label" for="inputConfigureBackupScalewayRegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupScalewayRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in scalewayRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'scaleway-objectstorage'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'linode-objectstorage'">
-              <label class="control-label" for="inputConfigureBackupLinodeRegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupLinodeRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in linodeRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'linode-objectstorage'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 'ovh-objectstorage'">
-              <label class="control-label" for="inputConfigureBackupOvhRegion">Region</label>
-              <select class="form-control" name="region" id="inputConfigureBackupOvhRegion" ng-model="configureBackup.endpoint" ng-options="a.value as a.name for a in ovhRegions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'ovh-objectstorage'"></select>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }" ng-show="s3like(configureBackup.provider)">
-              <label class="control-label" for="inputConfigureBackupAccessKeyId">Access key id</label>
-              <input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.secretAccessKey }" ng-show="s3like(configureBackup.provider)">
-              <label class="control-label" for="inputConfigureBackupSecretAccessKey">Secret access key</label>
-              <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.gcsKeyInput }" ng-show="configureBackup.provider === 'gcs'">
-              <label class="control-label" for="gcsKeyInput">Service Account Key</label>
-
-              <div class="input-group">
-                <input type="file" id="gcsKeyFileInput" style="display:none"/>
-                <input type="text" class="form-control" placeholder="Service Account Key" ng-model="configureBackup.gcsKey.keyFileName" id="gcsKeyInput" name="cert" onclick="getElementById('gcsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 'gcs'">
-                <span class="input-group-addon">
-                  <i class="fa fa-upload" onclick="getElementById('gcsKeyFileInput').click();"></i>
-                </span>
+              <div style="padding: 0 10px;">
+                <slider id="sliderConfigureBackupCopyConcurrency" ng-model="configureBackup.copyConcurrency" tooltip="hide" min="10" max="500" step="10"></slider>
               </div>
             </div>
 
-            <div class="form-group" ng-show="configureBackup.provider !== 'noop'">
-              <label class="control-label" for="storageFormat">Storage Format  <sup><a ng-href="https://docs.cloudron.io/backups/#backup-formats" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <p class="small text-info" ng-show="backupConfig.format !== configureBackup.format">Previous backups using the old storage format have to be removed manually.</p>
-              <p class="small text-info" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">Please remove any object expiration lifecycle rules since it will corrupt rsync backups. <sup><a ng-href="https://docs.cloudron.io/backups/#amazon-s3" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></p>
-              <select class="form-control" id="storageFormat" ng-model="configureBackup.format" ng-options="a.value as a.name for a in formats"></select>
-            </div>
+          </div> <!-- advanced -->
 
-            <div class="form-group" ng-class="{ 'has-error': configureBackup.error.password }" ng-show="configureBackup.provider !== 'noop'">
-              <label class="control-label" for="inputConfigureBackupPassword">Encryption Password (optional) <sup><a ng-href="https://docs.cloudron.io/backups/#encryption" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <p class="small">Save this passphrase in a safe place. Cloudron does not store this password. Backups cannot be decrypted without the passphrase</p>
-              <input type="text" class="form-control" name="password" ng-model="configureBackup.password" id="inputConfigureBackupPassword" name="prefix" ng-disabled="configureBackup.busy" placeholder="Passphrase used to encrypt the backups">
-            </div>
-
-            <a href="" ng-click="configureBackup.advancedVisible = true" ng-hide="configureBackup.advancedVisible">Advanced settings...</a>
-            <div  uib-collapse="!configureBackup.advancedVisible">
-
-              <div class="form-group">
-                <label class="control-label" for="memoryLimit">Memory Limit : <b>{{ configureBackup.memoryLimit | prettyByteSize:'Default (400 MB)' }}</b></label>
-                <p class="small">Memory limit for the backup task. Adjust this if you increase the concurrency values from their defaults.</p>
-                <div style="padding: 0 10px;">
-                  <slider id="sliderConfigureBackupMemoryLimit" ng-model="configureBackup.memoryLimit" step="134217728" tooltip="hide" ticks="configureBackup.memoryTicks" ticks-snap-bounds="67108864"></slider>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label class="control-label" for="memoryLimit" ng-show="s3like(configureBackup.provider)">Upload Part Size : <b>{{ configureBackup.uploadPartSize | prettyByteSize:'Default (50 MB)' }}</b></label>
-                <p class="small">Multi-part upload part size. Upto 3 parts are uploaded in parallel and requires as much memory.</p>
-                <div style="padding: 0 10px;">
-                  <slider id="sliderConfigureBackupUploadPartSize" ng-model="configureBackup.uploadPartSize" step="1048576" tooltip="hide" ticks="configureBackup.uploadPartSizeTicks" ticks-snap-bounds="2097152"></slider>
-                </div>
-              </div>
-
-              <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
-                <label class="control-label">Upload Concurrency : <b>{{ configureBackup.syncConcurrency }}</b></label>
-                <p class="small">Number of files to upload in parallel when backing up</p>
-                <div style="padding: 0 10px;">
-                  <slider id="sliderConfigureBackupSyncConcurrency" ng-model="configureBackup.syncConcurrency" tooltip="hide" min="10" max="200" step="10"></slider>
-                </div>
-              </div>
-
-              <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
-                <label class="control-label">Download Concurrency : <b>{{ configureBackup.downloadConcurrency }}</b></label>
-                <p class="small">Number of files to download in parallel when restoring</p>
-                <div style="padding: 0 10px;">
-                  <slider id="sliderConfigureBackupCopyConcurrency" ng-model="configureBackup.downloadConcurrency" tooltip="hide" min="10" max="200" step="10"></slider>
-                </div>
-              </div>
-
-              <div class="form-group" ng-show="configureBackup.format === 'rsync' && (s3like(configureBackup.provider) || configureBackup.provider === 'gcs')">
-                <label class="control-label">Copy Concurrency : <b>{{ configureBackup.copyConcurrency }}</b></label>
-                <p class="small">Number of remote file copies in parallel when backing up.
-                  <span ng-show="configureBackup.provider === 'digitalocean-spaces'">DigitalOcean Spaces rate limits at 20.</span>
-                </p>
-                <div style="padding: 0 10px;">
-                  <slider id="sliderConfigureBackupCopyConcurrency" ng-model="configureBackup.copyConcurrency" tooltip="hide" min="10" max="500" step="10"></slider>
-                </div>
-              </div>
-
-            </div> <!-- advanced -->
-
-            <input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid"/>
-          </fieldset>
+          <input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid"/>
         </form>
       </div>
       <div class="modal-footer ">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureBackup.submit()" ng-disabled="configureBackupForm.$invalid || configureBackup.busy"><i class="fa fa-circle-notch fa-spin" ng-show="configureBackup.busy"></i><span> Save</span></button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="configureBackup.submit()" ng-disabled="configureBackupForm.$invalid || configureBackup.busy"><i class="fa fa-circle-notch fa-spin" ng-show="configureBackup.busy"></i><span> {{ 'main.dialog.save' | tr }}</span></button>
       </div>
     </div>
   </div>
@@ -420,7 +408,7 @@
     <br/>
     <div class="row">
       <div class="col-md-12 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-show="user.role === 'owner'" ng-click="configureScheduleAndRetention.show()">{ 'backups.schedule.configure' | tr }}</button>
+        <button class="btn btn-outline btn-primary pull-right" ng-show="user.role === 'owner'" ng-click="configureScheduleAndRetention.show()">{{ 'backups.schedule.configure' | tr }}</button>
       </div>
     </div>
   </div>