diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index e343e0824..c1ac15a63 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -44,7 +44,9 @@
             "close": "Close",
             "no": "No",
             "yes": "Yes",
-            "delete": "Delete"
+            "delete": "Delete",
+            "edit": "Edit",
+            "done": "Done"
         },
         "username": "Username",
         "displayName": "Display name",
@@ -1724,7 +1726,9 @@
             "firstTimeTitle": "First Time Usage",
             "firstTimeCollapseHeader": "First time setup instructions",
             "customAppUpdateWarning": "This is a custom app and not installed from the App Store and will not receive updates. See the <a target=\"_blank\" href=\"{{ docsLink }}\">Documentation</a> on how to update a custom app.",
-            "checklist": "Admin Checklist"
+            "checklist": "Admin Checklist",
+            "checklistShow": "Show Checklist",
+            "checklistHide": "Hide Checklist"
         },
         "uninstallDialog": {
             "title": "Uninstall {{ app }}",
diff --git a/dashboard/src/components/BackupDialog.vue b/dashboard/src/components/BackupDialog.vue
index 65c11fb9e..af64370de 100644
--- a/dashboard/src/components/BackupDialog.vue
+++ b/dashboard/src/components/BackupDialog.vue
@@ -3,7 +3,6 @@
 import { ref, useTemplateRef, onMounted, computed, watch } from 'vue';
 import { Button, InputGroup, Dialog, Dropdown, FormGroup, TextInput, Checkbox, PasswordInput, NumberInput } from 'pankow';
 import { prettyBinarySize } from 'pankow/utils';
-// TODO REGIONS_UPCLOUD is not used??
 import { BACKUP_FORMATS, STORAGE_PROVIDERS, REGIONS_CONTABO, REGIONS_VULTR, REGIONS_UPCLOUD, REGIONS_IONOS, REGIONS_OVH, REGIONS_LINODE, REGIONS_SCALEWAY, REGIONS_EXOSCALE, REGIONS_DIGITALOCEAN, REGIONS_HETZNER, REGIONS_WASABI, REGIONS_S3 } from '../constants.js';
 import BackupsModel from '../models/BackupsModel.js';
 import SystemModel from '../models/SystemModel.js';
diff --git a/dashboard/src/components/Firewall.vue b/dashboard/src/components/Firewall.vue
index 99714757a..0afbd9aa1 100644
--- a/dashboard/src/components/Firewall.vue
+++ b/dashboard/src/components/Firewall.vue
@@ -160,8 +160,7 @@ onMounted(async () => {
           <div>{{ $t('network.firewall.blocklist', { blockCount: blocklistLength }) }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
-          <!-- TODO -->
-          <Button tool plain @click="onBlocklistConfigure()">Edit</Button>
+          <Button tool plain @click="onBlocklistConfigure()">{{ $t('main.dialog.edit') }}</Button>
         </div>
       </SettingsItem>
 
@@ -171,8 +170,7 @@ onMounted(async () => {
           <div>{{ $t('network.trustedIps.summary', { trustCount: trustedIpsLength }) }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
-          <!-- TODO -->
-          <Button tool plain @click="onTrustedIpsConfigure()">Edit</Button>
+          <Button tool plain @click="onTrustedIpsConfigure()">{{ $t('main.dialog.edit') }}</Button>
         </div>
       </SettingsItem>
     </Section>
diff --git a/dashboard/src/components/Headerbar.vue b/dashboard/src/components/Headerbar.vue
index f7cd14162..384e42cd9 100644
--- a/dashboard/src/components/Headerbar.vue
+++ b/dashboard/src/components/Headerbar.vue
@@ -66,8 +66,7 @@ onMounted(async () => {
           <div class="notification-item" v-for="notification in notifications" :key="notification.id">
             <div class="notification-item-title" @click="notification.isCollapsed = !notification.isCollapsed">
               {{ notification.title }}
-              <!-- TODO translate -->
-              <Button plain small tool :loading="notification.busy" :disabled="notification.busy" class="notification-read-button" @click.stop="onMarkNotificationRead(notification)">Read</Button>
+              <Button plain small tool :loading="notification.busy" :disabled="notification.busy" class="notification-read-button" @click.stop="onMarkNotificationRead(notification)">{{ $t('notifications.dismissTooltip') }}</Button>
             </div>
             <div class="notification-item-body" v-if="!notification.isCollapsed">
               <pre v-if="notification.messageJson" style="cursor: auto">{{ JSON.stringify(notification.messageJson, null, 4) }}</pre>
@@ -75,8 +74,7 @@ onMounted(async () => {
             </div>
           </div>
         </div>
-        <!-- TODO translate -->
-        <Button @click="onMarkAllNotificationRead()" :loading="notificationsAllBusy" :disabled="notificationsAllBusy">Mark all as read</Button>
+        <Button @click="onMarkAllNotificationRead()" :loading="notificationsAllBusy" :disabled="notificationsAllBusy">{{ $t('notifications.markAllAsRead') }}</Button>
       </div>
     </Popover>
 
diff --git a/dashboard/src/components/MailRelaySettingsItem.vue b/dashboard/src/components/MailRelaySettingsItem.vue
index b36955abd..51756d2ef 100644
--- a/dashboard/src/components/MailRelaySettingsItem.vue
+++ b/dashboard/src/components/MailRelaySettingsItem.vue
@@ -195,8 +195,7 @@ async function onSubmit() {
         <div v-html="$t('email.outbound.description')"></div>
       </FormGroup>
       <div style="display: flex; align-items: center">
-        <!-- TODO translate -->
-        <Button tool plain @click="onShowDialog()">Edit</Button>
+        <Button tool plain @click="onShowDialog()">{{ $t('main.dialog.edit') }}</Button>
       </div>
     </SettingsItem>
   </div>
diff --git a/dashboard/src/components/app/Info.vue b/dashboard/src/components/app/Info.vue
index 2e3ec2d29..66e908102 100644
--- a/dashboard/src/components/app/Info.vue
+++ b/dashboard/src/components/app/Info.vue
@@ -109,16 +109,14 @@ onMounted(() => {
     <br/>
 
     <div style="display: flex; justify-content: end; align-items: center;">
-      <!-- TODO translate -->
-      <div class="actionable" @click="showDoneChecklist = true" v-show="hasOldChecklist && !showDoneChecklist">Show Checklist</div>
-      <div class="actionable" @click="showDoneChecklist = false" v-show="showDoneChecklist">Hide Checklist</div>
+      <div class="actionable" @click="showDoneChecklist = true" v-show="hasOldChecklist && !showDoneChecklist">{{ $t(' app.appInfo.checklistShow') }}</div>
+      <div class="actionable" @click="showDoneChecklist = false" v-show="showDoneChecklist">{{ $t('app.appInfo.checklistHide') }}</div>
     </div>
 
     <div v-for="(item, key) in checklist" :key="key">
       <div class="checklist-item" v-if="!item.acknowledged">
         <span v-html="marked.parse(item.message)"></span>
-        <!-- TODO translate -->
-        <Button small plain tool style="margin-left: 10px;" @click="onAckChecklistItem(item, key)">Done</Button>
+        <Button small plain tool style="margin-left: 10px;" @click="onAckChecklistItem(item, key)">{{ $t('main.dialog.done') }}</Button>
       </div>
     </div>
 
diff --git a/dashboard/src/utils.js b/dashboard/src/utils.js
index 46aca44de..e34abdc23 100644
--- a/dashboard/src/utils.js
+++ b/dashboard/src/utils.js
@@ -29,7 +29,6 @@ function s3like(provider) {
     || provider === 'contabo-objectstorage';
 }
 
-// TODO not sure what appIdContext is good for
 function eventlogDetails(eventLog, app = null, appIdContext = '') {
   const ACTION_ACTIVATE = 'cloudron.activate';
   const ACTION_PROVISION = 'cloudron.provision';
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index de0a292a2..96498db8c 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -265,8 +265,7 @@ onMounted(async () => {
           <div v-html="$t('email.signature.description')"></div>
         </FormGroup>
         <div style="display: flex; align-items: center">
-          <!-- TODO translate -->
-          <Button tool plain @click="onShowSignatureDialog()">Edit</Button>
+          <Button tool plain @click="onShowSignatureDialog()">{{ $t('main.dialog.edit') }}</Button>
         </div>
       </SettingsItem>
     </Section>
diff --git a/dashboard/src/views/EmailView.vue b/dashboard/src/views/EmailView.vue
index 4bd284905..3401dedcb 100644
--- a/dashboard/src/views/EmailView.vue
+++ b/dashboard/src/views/EmailView.vue
@@ -482,8 +482,7 @@ onMounted(async () => {
           <div>{{ $t('emails.settings.aclOverview', { dnsblZonesCount: dnsblZones.length }) }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
-          <!-- TODO translate -->
-          <Button tool plain @click="onShowAclDialog()">Edit</Button>
+          <Button tool plain @click="onShowAclDialog()">{{ $t('main.dialog.edit') }}</Button>
         </div>
       </SettingsItem>
 
@@ -493,8 +492,7 @@ onMounted(async () => {
           <div>{{ $t('emails.settings.spamFilterOverview', { blacklistCount: blocklist.length }) }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
-          <!-- TODO translate -->
-          <Button tool plain @click="onShowSpamFilterDialog()">Edit</Button>
+          <Button tool plain @click="onShowSpamFilterDialog()">{{ $t('main.dialog.edit') }}</Button>
         </div>
       </SettingsItem>
 
diff --git a/dashboard/src/views/ProfileView.vue b/dashboard/src/views/ProfileView.vue
index e9c29a792..634263b57 100644
--- a/dashboard/src/views/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -306,8 +306,7 @@ onMounted(async () => {
               <div>{{ user.displayName }}</div>
             </FormGroup>
             <div style="display: flex; align-items: center">
-              <!-- TODO translate -->
-              <Button tool plain @click="onChangeDisplayName(user.displayName)" v-show="!user.source && !config.profileLocked">Edit</Button>
+              <Button tool plain @click="onChangeDisplayName(user.displayName)" v-show="!user.source && !config.profileLocked">{{ $t('main.dialog.edit') }}</Button>
             </div>
           </SettingsItem>
 
@@ -317,8 +316,7 @@ onMounted(async () => {
               <div>{{ user.email }}</div>
             </FormGroup>
             <div style="display: flex; align-items: center">
-              <!-- TODO translate -->
-              <Button tool plain @click="onChangeEmail(user.email)" v-show="!user.source && !config.profileLocked">Edit</Button>
+              <Button tool plain @click="onChangeEmail(user.email)" v-show="!user.source && !config.profileLocked">{{ $t('main.dialog.edit') }}</Button>
             </div>
           </SettingsItem>
 
@@ -328,8 +326,7 @@ onMounted(async () => {
               <div>{{ user.fallbackEmail || 'unset' }}</div>
             </FormGroup>
             <div style="display: flex; align-items: center">
-              <!-- TODO translate -->
-              <Button tool plain @click="onChangeFallbackEmail(user.fallbackEmail)" v-show="!user.source && !config.profileLocked">Edit</Button>
+              <Button tool plain @click="onChangeFallbackEmail(user.fallbackEmail)" v-show="!user.source && !config.profileLocked">{{ $t('main.dialog.edit') }}</Button>
             </div>
           </SettingsItem>
 
diff --git a/dashboard/src/views/UsersView.vue b/dashboard/src/views/UsersView.vue
index cbb9d800f..55f15ce51 100644
--- a/dashboard/src/views/UsersView.vue
+++ b/dashboard/src/views/UsersView.vue
@@ -49,7 +49,6 @@ const groupsColumns = {
   actions: {}
 };
 
-// TODO maybe replace with app.provide and inject
 const profile = ref({});
 const busy = ref(true);
 const filterOptions = ref([