diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index bea21291d..62eaa476a 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -66,7 +66,9 @@
             "showLogs": "Show Logs",
             "delete": "Delete",
             "remove": "Remove",
-            "edit": "Edit"
+            "edit": "Edit",
+            "add": "Add",
+            "next": "Next"
         },
         "clipboard": {
             "copied": "Copied to clipboard",
@@ -648,7 +650,8 @@
             "encryptFilenames": "Encrypt Filenames",
             "preserveAttributesLabel": "Preserve file attributes",
             "name": "Name",
-            "encryptionHint": "Encryption Password Hint"
+            "encryptionHint": "Encryption Password Hint",
+            "usesEncryption": "Backup uses encryption"
         },
         "check": {
             "noop": "Cloudron backups are disabled. Please ensure this server is backed up using alternate means. See https://docs.cloudron.io/backups/#storage-providers for more information.",
@@ -682,6 +685,11 @@
             "description": "This will install {{appId}} at the specified location with backup from {{creationTime}}.",
             "restoreAction": "Restore",
             "restoreActionOverwrite": "Restore and overwrite DNS"
+        },
+        "target": {
+            "addDialog": {
+                "title": "Add Backup Storage"
+            }
         }
     },
     "branding": {
@@ -1320,7 +1328,13 @@
         "backAction": "Back to Email",
         "config": {
             "title": "Email configuration {{ domain }}",
-            "clientConfiguration": "Configuring Email Clients"
+            "clientConfiguration": "Configuring Email Clients",
+            "sending": {
+                "title": "Sending"
+            },
+            "receiving": {
+                "title": "Receiving"
+            }
         },
         "incoming": {
             "title": "Incoming Email",
@@ -1580,6 +1594,9 @@
                 "setAction": "Scale",
                 "title": "CPU Limit",
                 "description": "Maximum percent of CPU app can use"
+            },
+            "devices": {
+                "label": "Devices"
             }
         },
         "storage": {
@@ -2072,5 +2089,19 @@
         "listing": {
             "placeholder": "No app archives"
         }
+    },
+    "backup": {
+        "target": {
+            "removeDialog": {
+                "title": "Really remove this backup target?",
+                "description": "This will also remove any backups linked to this target"
+            },
+            "title": "Backup Storage",
+            "label": "Storage"
+        },
+        "updateTarget": {
+            "title": "Backup Configuration for Updates",
+            "description": "For backups created during automatic or manual app and platform updates."
+        }
     }
 }
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index 751731739..727e5e7e9 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -62,7 +62,10 @@
         "action": {
             "reboot": "Herstart",
             "logs": "Logbestanden",
-            "showLogs": "Toon logbestanden"
+            "showLogs": "Toon logbestanden",
+            "delete": "Verwijder",
+            "remove": "Verwijder",
+            "edit": "Bewerk"
         },
         "clipboard": {
             "copied": "Gekopieerd naar klembord",
@@ -920,7 +923,7 @@
         "domainWellKnown": {
             "title": "Well-Known locaties van {{ domain }}"
         },
-        "tooltipWellKnown": "Well-Known Locaties instellen",
+        "tooltipWellKnown": "Well-Known Locaties",
         "count": "Totaal domeinen: {{ count }}"
     },
     "app": {
@@ -1292,7 +1295,8 @@
             "description": "Hiermee wordt de app gedeïnstalleerd en wordt de laatste app backup van {{date}} bewaard in het App Archief."
         },
         "updateAvailableTooltip": "Update beschikbaar",
-        "configureTooltip": "Configureer"
+        "configureTooltip": "Configureer",
+        "forumAction": "Forum"
     },
     "network": {
         "title": "Netwerk",
diff --git a/dashboard/src/components/AppImportDialog.vue b/dashboard/src/components/AppImportDialog.vue
index 0da6ee446..daee7e75d 100644
--- a/dashboard/src/components/AppImportDialog.vue
+++ b/dashboard/src/components/AppImportDialog.vue
@@ -245,8 +245,7 @@ defineExpose({
               :form-error="formError"
               :import-only="true" />
 
-            <!-- TODO translate -->
-            <Checkbox style="padding-top: 12px" v-model="encrypted" label="Backup uses encryption"/>
+            <Checkbox style="padding-top: 12px" v-model="encrypted" :label="$t('backups.configureBackupStorage.usesEncryption')"/>
             <FormGroup v-if="encrypted">
               <label for="encryptionPassswordInput">{{ $t('backups.configureBackupStorage.encryptionPassword') }}</label>
               <PasswordInput id="encryptionPassswordInput" v-model="encryptionPassword" :placeholder="$t('backups.configureBackupStorage.encryptionPasswordPlaceholder')" required/>
diff --git a/dashboard/src/components/BackupTargetAddDialog.vue b/dashboard/src/components/BackupTargetAddDialog.vue
index 0d564ea5c..152ff20f4 100644
--- a/dashboard/src/components/BackupTargetAddDialog.vue
+++ b/dashboard/src/components/BackupTargetAddDialog.vue
@@ -248,8 +248,7 @@ defineExpose({
 </script>
 
 <template>
-  <!-- TODO translate -->
-  <Dialog ref="dialog" title="Add Backup Storage">
+  <Dialog ref="dialog" :title="$t('backups.target.addDialog.title')">
     <div>
       <div v-if="step === 'storage'">
         <form @submit.prevent="onSubmit()" autocomplete="off" ref="form">
@@ -308,8 +307,7 @@ defineExpose({
 
               <div style="display: flex; gap: 6px; align-items: end;">
                 <Button secondary :disabled="busy" @click="onCancel()">{{ $t('main.dialog.cancel') }}</Button>
-                <!-- TODO translation -->
-                <Button primary :disabled="busy" :loading="busy" @click="onSubmit()">{{ useEncryption ? 'Next' : $t('main.dialog.save') }}</Button>
+                <Button primary :disabled="busy" :loading="busy" @click="onSubmit()">{{ useEncryption ? $t('main.action.next') : $t('main.dialog.save') }}</Button>
               </div>
             </div>
           </fieldset>
@@ -334,7 +332,6 @@ defineExpose({
               <div class="error-label" v-if="encryptionPasswordRepeat && encryptionPassword !== encryptionPasswordRepeat">{{ $t('profile.changePassword.errorPasswordsDontMatch') }}</div>
             </FormGroup>
             <FormGroup>
-              <!-- TODO translate -->
               <label for="encryptionPassswordHintInput">{{ $t('backups.configureBackupStorage.encryptionHint') }}</label>
               <TextInput id="encryptionPassswordHintInput" v-model="encryptionPasswordHint" />
             </FormGroup>
diff --git a/dashboard/src/components/PrivateRegistry.vue b/dashboard/src/components/PrivateRegistry.vue
index 80d0e8a6e..4376d9b26 100644
--- a/dashboard/src/components/PrivateRegistry.vue
+++ b/dashboard/src/components/PrivateRegistry.vue
@@ -90,8 +90,7 @@ onMounted(async () => {
     <DockerRegistryDialog ref="dialog" @success="refresh()"/>
 
     <template #header-buttons>
-      <!-- TODO translate -->
-      <Button icon="fa-solid fa-plus" @click="onEditOrAdd()">Add</Button>
+      <Button icon="fa-solid fa-plus" @click="onEditOrAdd()">{{ $t('main.action.add') }}</Button>
     </template>
 
     <p v-html="$t('settings.privateDockerRegistry.description', { customAppsLink: 'https://docs.cloudron.io/custom-apps/tutorial/' })"></p>
diff --git a/dashboard/src/components/app/Resources.vue b/dashboard/src/components/app/Resources.vue
index 6f1a64db5..8a3d77bfa 100644
--- a/dashboard/src/components/app/Resources.vue
+++ b/dashboard/src/components/app/Resources.vue
@@ -145,13 +145,12 @@ onMounted(async () => {
       <fieldset :disabled="devicesBusy || (!app.error && !devicesChanged) || (app.error && app.error.details.installationState !== ISTATES.PENDING_RECREATE_CONTAINER) || app.taskId">
         <input style="display: none;" type="submit"/>
         <FormGroup>
-          <!-- TODO translate -->
-          <label for="devicesInput">Devices <sup><a href="https://docs.cloudron.io/apps/#devices" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+          <label for="devicesInput">{{ $t('app.resources.devices.label') }} <sup><a href="https://docs.cloudron.io/apps/#devices" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
           <TagInput id="devicesInput" v-model="devices" placeholder="/dev/ttyUSB0, /dev/hidraw0, ..."/>
           <div class="text-danger" v-if="devicesError">{{ devicesError }}</div>
         </FormGroup>
       </fieldset>
     </form>
-    <Button @click="onSubmitDevices()" :loading="devicesBusy" :disabled="devicesBusy || (!app.error && !devicesChanged) || (app.error && app.error.details.installationState !== ISTATES.PENDING_RECREATE_CONTAINER) || app.taskId">Set Devices</Button>
+    <Button @click="onSubmitDevices()" :loading="devicesBusy" :disabled="devicesBusy || (!app.error && !devicesChanged) || (app.error && app.error.details.installationState !== ISTATES.PENDING_RECREATE_CONTAINER) || app.taskId">{{ $t('main.dialog.save') }}</Button>
   </div>
 </template>
\ No newline at end of file
diff --git a/dashboard/src/views/BackupListView.vue b/dashboard/src/views/BackupListView.vue
index a4474e9de..0df7d5ace 100644
--- a/dashboard/src/views/BackupListView.vue
+++ b/dashboard/src/views/BackupListView.vue
@@ -58,8 +58,7 @@ const actionMenuElement = useTemplateRef('actionMenuElement');
 function onActionMenu(backup, event) {
   actionMenuModel.value = [{
     icon: 'fa-solid fa-circle-info',
-    // TODO translate
-    label: 'Info',
+    label: t('backups.archives.info'),
     action: onInfo.bind(null, backup),
   }, {
     icon: 'fa-solid fa-pencil-alt',
diff --git a/dashboard/src/views/BackupTargetsView.vue b/dashboard/src/views/BackupTargetsView.vue
index 269f20500..66ef7e15a 100644
--- a/dashboard/src/views/BackupTargetsView.vue
+++ b/dashboard/src/views/BackupTargetsView.vue
@@ -61,10 +61,9 @@ function onEditSchedule(target) {
 }
 
 async function onRemoveTarget(target) {
-  // TODO translate
   const yes = await inputDialog.value.confirm({
-    title: 'Really remove this backup target?',
-    message: 'This will also remove any backups linked to this target',
+    title: t('backup.target.removeDialog.title'),
+    message: t('backup.target.removeDialog.description'),
     confirmLabel: t('main.dialog.yes'),
     confirmStyle: 'danger',
     rejectLabel: t('main.dialog.cancel'),
@@ -96,7 +95,6 @@ const actionMenuModel = ref([]);
 
 const actionMenuElement = useTemplateRef('actionMenuElement');
 function onActionMenu(target, event) {
-  // TODO translate
   actionMenuModel.value = [{
     icon: 'fa-solid fa-sync-alt',
     label: t('backups.location.remount'),
@@ -187,10 +185,9 @@ onMounted(async () => {
     <BackupTargetEditDialog ref="backupTargetEditDialog" @success="refresh()"/>
     <BackupScheduleDialog ref="backupScheduleDialog" @success="refresh()"/>
 
-    <!-- TODO translate -->
-    <Section title="Backup Storage">
+    <Section :title="$t('backup.target.title')">
       <template #header-buttons>
-        <Button @click="onAdd()" icon="fa-solid fa-plus"> Add Storage</Button>
+        <Button @click="onAdd()" icon="fa-solid fa-plus"> {{ $t('main.action.add') }}</Button>
       </template>
 
       <TableView :columns="columns" :model="targets" :busy="busy">
@@ -201,7 +198,6 @@ onMounted(async () => {
         </template>
 
         <template #name="target">
-          <!-- TODO translate -->
           {{ target.name }} <span v-if="target.primary" class="text-muted">- used for updates</span>
         </template>
 
@@ -221,11 +217,11 @@ onMounted(async () => {
       </TableView>
     </Section>
 
-    <Section title="Backup Configuration for Updates">
+    <Section :title="$t('backup.updateTarget.title')">
       <SettingsItem>
         <div>
-          <label>Storage</label>
-          <div>For backups created during automatic or manual app and platform updates.</div>
+          <label>{{ $t('backup.target.label') }}</label>
+          <div>{{ $t('backup.updateTarget.description') }}</div>
         </div>
         <div style="display: flex; align-items: center">
           <SingleSelect style="min-width: 160px" :disabled="primaryTargetChangeBusy" v-model="primaryTargetId" :searchThreshold="10" :options="targets" option-key="id" option-label="name" @select="onPrimaryTargetChanged" />
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index 092f020c8..3f23791a7 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -316,7 +316,7 @@ onMounted(async () => {
     </Section>
 
     <!-- TODO translation -->
-    <Section title="Sending" :padding="false" v-if="!busyRefresh">
+    <Section :title="$t('email.config.sending.title')" :padding="false" v-if="!busyRefresh">
       <template #header-buttons>
         <Button @click="onSendTestMail">{{ $t('emails.domains.testEmailTooltip') }}</Button>
       </template>
@@ -342,8 +342,7 @@ onMounted(async () => {
       </SettingsItem>
     </Section>
 
-    <!-- TODO translation -->
-    <Section title="Receiving" :padding="false" v-if="!busyRefresh" :title-badge="!features.emailServer ? 'Upgrade' : ''">
+    <Section :title="$t('email.config.receiving.title')" :padding="false" v-if="!busyRefresh" :title-badge="!features.emailServer ? 'Upgrade' : ''">
       <SettingsItem>
         <FormGroup>
           <label>{{ $t('email.incoming.title') }}</label>
diff --git a/dashboard/src/views/RestoreView.vue b/dashboard/src/views/RestoreView.vue
index f71c80ead..ce67d4fd8 100644
--- a/dashboard/src/views/RestoreView.vue
+++ b/dashboard/src/views/RestoreView.vue
@@ -355,8 +355,7 @@ onMounted(async () => {
               :import-only="true" />
 
             <div v-show="showAdvanced">
-              <!-- TODO translate -->
-              <Checkbox style="padding-top: 12px" v-model="encrypted" label="Backup uses encryption"/>
+              <Checkbox style="padding-top: 12px" v-model="encrypted" :label="$t('backups.configureBackupStorage.usesEncryption')"/>
               <FormGroup v-if="encrypted">
                 <label for="encryptionPassswordInput">{{ $t('backups.configureBackupStorage.encryptionPassword') }}</label>
                 <PasswordInput id="encryptionPassswordInput" v-model="encryptionPassword" :placeholder="$t('backups.configureBackupStorage.encryptionPasswordPlaceholder')" required/>