From 301a5184bdc3b69099f0b2af188c8a728584718b Mon Sep 17 00:00:00 2001
From: stitch1 <elger.jonker@gmail.com>
Date: Mon, 11 Nov 2024 12:32:14 +0100
Subject: [PATCH] centralize all translations

---
 src/components/FieldTranslations.vue          |   92 -
 src/components/account/VisibleMetrics.vue     |    4 -
 src/components/charts/chart_mixin.vue         |    4 -
 src/components/charts/donut.vue               |    5 -
 src/components/domains/domain/edit.vue        |  176 -
 src/components/domains/domain/editDomain.vue  |   42 +-
 .../domains/list/DiscoverSubdomainsModal.vue  |   75 +-
 src/components/home/PublicReports.vue         |   31 +-
 .../home/PublicReportsPerAccount.vue          |   49 +-
 src/components/home/PublicReportsTable.vue    |   35 +-
 src/components/reports/AppliedTags.vue        |   13 +-
 .../reports/DifferencesToCurrentList.vue      |   43 +-
 src/components/reports/NestedReportCharts.vue |   14 +-
 src/components/reports/Report.vue             |   34 +-
 src/components/reports/ReportCharts.vue       |   42 +-
 src/components/reports/ReportDownload.vue     |   26 +-
 src/components/reports/ReportHeader.vue       |   34 +-
 .../ReportImprovementAndRegressions.vue       |   79 +-
 .../ReportImprovementAndRegressionsTable.vue  |   43 +-
 src/components/reports/ReportPasswords.vue    |   44 +-
 src/components/reports/ReportSelection.vue    |   21 +-
 src/components/reports/ReportTableLegend.vue  |  100 +-
 .../reports/ReportTableVirtualList.vue        |  108 +-
 .../reports/ReportTableVirtualListRecord.vue  |   69 +-
 src/components/reports/ReportTagFilter.vue    |   22 +-
 src/components/reports/SharedReport.vue       |   28 +-
 .../reports/SharingConfiguration.vue          |   82 +-
 src/components/reports/report_mixin.vue       |    9 +-
 src/locales/dashboard-frontend.babel          | 3296 +++++++----------
 src/locales/de.json                           |  271 +-
 src/locales/en.json                           |  271 +-
 src/locales/fr.json                           |  271 +-
 src/locales/mapping.md                        |   15 +-
 src/locales/nl.json                           |  271 +-
 34 files changed, 2064 insertions(+), 3655 deletions(-)
 delete mode 100644 src/components/FieldTranslations.vue
 delete mode 100644 src/components/domains/domain/edit.vue

diff --git a/src/components/FieldTranslations.vue b/src/components/FieldTranslations.vue
deleted file mode 100644
index 8a97033..0000000
--- a/src/components/FieldTranslations.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<script>
-// This file is in the repository as part of documentation about what fields match the internet.nl translations.
-// So it's clear what translations need to be updated in the babel file.
-const internet_nl_field_mapping = {};
-
-const additional_mapping = {
-  test_title: 'faqs_report_test_title',
-  test_good: 'faqs_report_test_good',
-  test_bad: 'faqs_report_test_bad',
-  test_warning: 'faqs_report_test_warning',
-  test_info: 'faqs_report_test_info',
-  subtest_title: 'faqs_report_subtest_title',
-  subtest_good: 'faqs_report_subtest_good',
-  subtest_bad: 'faqs_report_subtest_bad',
-  subtest_warning: 'faqs_report_subtest_warning',
-  subtest_info: 'faqs_report_subtest_info',
-}
-
-
-// categories are translated with _passed_summary or _failed_summary. The rest with their label. Should be in
-// the retrieved translations anyway.
-function import_field_translations(internet_nl_messages, language) {
-  let mapping = {};
-  for (let key of Object.keys(internet_nl_field_mapping)) {
-    mapping[key] = internet_nl_messages[language].internet_nl[internet_nl_field_mapping[key] + '_label']
-  }
-  for (let key of Object.keys(additional_mapping)) {
-    mapping[key] = internet_nl_messages[language].internet_nl[additional_mapping[key]]
-  }
-  return mapping;
-}
-
-function interpolate_translations(internet_nl_messages) {
-  let translation = {
-    'en': {
-      fields: {
-        forum_standardistation: {
-          category_label: 'Extra Fields',
-          measurements_on_agreed_security_standards: 'Extra Fields',
-          ipv6_monitor: 'IPv6 monitor',
-          status_fields: 'Status Fields',
-        },
-        additional_fields: {
-          label: 'Additional fields',
-        },
-      },
-
-
-      pct_ok: "passed",
-      pct_low: "info",
-      pct_medium: "warning",
-      pct_high: "failed",
-      pct_not_applicable: "not applicable",
-      pct_not_testable: "not testable",
-      pct_error_in_test: "test error"
-    }, 'nl': {
-
-      fields: {
-        forum_standardistation: {
-          category_label: 'Extra Velden',
-          measurements_on_agreed_security_standards: 'Extra Velden',
-          ipv6_monitor: 'IPv6 monitor',
-          status_fields: 'Status Velden'
-        },
-        additional_fields: {
-          label: 'Additionele velden',
-        },
-      },
-
-      pct_ok: "geslaagd",
-      pct_low: "info",
-      pct_medium: "waarschuwing",
-      pct_high: "gezakt",
-      pct_not_applicable: "niet van toepassing",
-      pct_not_testable: "niet testbaar",
-      pct_error_in_test: "testfout"
-
-    }
-  };
-
-  translation.nl = Object.assign(translation.nl, import_field_translations(internet_nl_messages, 'nl'));
-  translation.en = Object.assign(translation.en, import_field_translations(internet_nl_messages, 'en'));
-
-  return translation;
-}
-
-import internet_nl_messages from './translations/internet_nl.js'
-
-const sharedMessages = interpolate_translations(internet_nl_messages);
-export default sharedMessages;
-</script>
\ No newline at end of file
diff --git a/src/components/account/VisibleMetrics.vue b/src/components/account/VisibleMetrics.vue
index 6757a1c..14d588d 100644
--- a/src/components/account/VisibleMetrics.vue
+++ b/src/components/account/VisibleMetrics.vue
@@ -71,16 +71,12 @@
 </template>
 
 <script>
-import field_translations from '../FieldTranslations'
 import {mapState} from 'vuex'
 import http from "@/httpclient";
 import report_mixin from "@/components/reports/report_mixin"
 
 export default {
   mixins: [report_mixin],
-  i18n: {
-    sharedMessages: field_translations,
-  },
   name: "VisibleMetrics",
   props: {
     report_type: {
diff --git a/src/components/charts/chart_mixin.vue b/src/components/charts/chart_mixin.vue
index 1b17c07..2c84952 100644
--- a/src/components/charts/chart_mixin.vue
+++ b/src/components/charts/chart_mixin.vue
@@ -1,7 +1,6 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <script>
 import {debounce} from "debounce";
-import field_translations from "@/components/FieldTranslations";
 import ChartDataLabels from 'chartjs-plugin-datalabels';
 
 import {
@@ -52,9 +51,6 @@ let tooltip_configuration = {
 }
 
 export default {
-  i18n: {
-    sharedMessages: field_translations,
-  },
   mixins: [report_mixin],
   props: {
     chart_data: {type: Array, required: true},
diff --git a/src/components/charts/donut.vue b/src/components/charts/donut.vue
index ecea9a6..fb38566 100644
--- a/src/components/charts/donut.vue
+++ b/src/components/charts/donut.vue
@@ -90,13 +90,8 @@ Chart.register(DoughnutController, ArcElement,  Tooltip);
 
 import donutChart from './../charts/donutChart'
 // import DownloadData from './../charts/DownloadData'
-import field_translations from '../FieldTranslations'
 
 export default {
-  i18n: {
-    sharedMessages: field_translations,
-  },
-
   components: {donutChart},
 
   props: {
diff --git a/src/components/domains/domain/edit.vue b/src/components/domains/domain/edit.vue
deleted file mode 100644
index a1c4019..0000000
--- a/src/components/domains/domain/edit.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-<style scoped>
-.inline-edit input {
-    margin-bottom: 0 !important;
-}
-
-.inline-edit button {
-    font-size: 0.7em !important;
-    margin: 0 !important;
-    height: 23px;
-}
-</style>
-
-<template>
-    <div v-if="visible">
-
-        <format-scan-eligibility :scan_type="list.scan_type" :url="url" />
-        &nbsp;
-        <button v-if="!is_edited" class="inline-edit"
-                :title='$t("start_editing_url", [edited_url_value])'
-                @click="start_url_editing()" aria-expanded="false">
-            🖊
-            <span class="visuallyhidden">{{ $t("start_editing_url", [edited_url_value]) }}</span>
-        </button>
-        <button v-if="is_edited" class="inline-edit"
-                :title='$t("cancel_editing_url", [edited_url_value])'
-                @click="cancel_edit_url()" aria-expanded="true">
-            🖊
-            <span class="visuallyhidden">{{ $t("cancel_editing_url", [edited_url_value]) }}</span>
-        </button>
-        &nbsp;
-        <template v-if="displayed_url.subdomain">
-            <a v-if="!is_edited" @click="start_url_editing()">
-                {{ displayed_url.subdomain }}.<b>{{ displayed_url.domain }}.{{ displayed_url.suffix }}</b>
-            </a>
-        </template>
-        <template v-if="!displayed_url.subdomain">
-            <a v-if="!is_edited" @click="start_url_editing()">
-                <b>{{ displayed_url.domain }}.{{ displayed_url.suffix }}</b>
-            </a>
-        </template>
-
-        <tag v-for="tag in this.displayed_url.tags" :key="tag" :value="tag" />
-
-        <span class="inline-edit" v-if="is_edited">
-            <input autofocus :placeholder="edited_url_value" v-model="edited_url_value">&nbsp;
-            <button @click="save_edit_url()" :title='$t("save_edited_url", [edited_url_value])'>
-                {{ $t("button_labels.save") }}
-                <span class="visuallyhidden">{{ $t("save_edited_url", [edited_url_value]) }}</span>
-            </button>&nbsp;
-            <button @click="cancel_edit_url()" :title='$t("cancel_editing_url", [edited_url_value])'>
-                {{ $t("button_labels.cancel") }}
-                <span class="visuallyhidden">{{ $t("cancel_editing_url", [edited_url_value]) }}</span>
-            </button>&nbsp;
-            <button @click="remove_edit_url(list.id, url.id)" :title='$t("delete_edited_url", [edited_url_value])'>
-                {{ $t("button_labels.remove") }}
-                <span class="visuallyhidden">{{ $t("delete_edited_url", [edited_url_value]) }}</span>
-            </button>
-        </span>
-
-    </div>
-</template>
-
-<script>
-import http from "@/httpclient";
-import Tag from "@/components/domains/domain/tag";
-import FormatScanEligibility from "@/components/domains/FormatScanEligibility";
-
-export default {
-    name: "edit",
-  components: {FormatScanEligibility, Tag},
-  data: function () {
-        return {
-            is_edited: false,
-            visible: true,
-
-            url_edit: '',
-            original_url_value: '',
-
-            edited_url_value: '',
-            displayed_url: {
-                subdomain: "",
-                domain: "",
-                suffix: "",
-            }
-        }
-    },
-    props: {
-        list: {
-            type: Object
-        },
-        url: {
-            type: Object
-        }
-    },
-    mounted: function () {
-        this.edited_url_value = this.url.url;
-        this.displayed_url.subdomain = this.url.subdomain;
-        this.displayed_url.domain = this.url.domain;
-        this.displayed_url.suffix = this.url.suffix;
-        this.displayed_url.tags = this.url.tags;
-        this.original_url_value = this.url.url;
-    },
-    methods: {
-        start_url_editing: function () {
-            this.is_edited = true;
-
-        },
-        cancel_edit_url: function () {
-            this.edited_url_value = this.original_url_value;
-            this.is_edited = false;
-        },
-        remove_edit_url: function (list_id, url_id) {
-            let data = {'list_id': list_id, 'url_id': url_id};
-            http.post('/data/urllist/url/delete/', data).then(server_response => {
-                this.delete_response = server_response.data;
-
-                if (server_response.data.success) {
-                    this.is_edited = false;
-                    this.$emit('domain_deleted');
-
-                    // hide yourself from the list, instead of destroying yourself.
-                    this.visible = false;
-                }
-            });
-        },
-        save_edit_url: function () {
-            /*
-            * This is not a real 'save' but an add to list and create if it doesn't exist operation.
-            * The save does not 'alter' the existing URL in the database. It will do some list operations.
-            * */
-            let data = {'list_id': this.list.id, 'url_id': this.url.id, 'new_url_string': this.edited_url_value}
-            http.post('/data/urllist/url/save/', data).then(server_response => {
-                if (server_response.data.success === true) {
-                    // now that saving was succesful, undo=ing should be to the newely saved url.
-                    this.original_url_value = this.edited_url_value;
-
-                    // in case the url is the same as the original, do not update it.
-                    this.displayed_url.subdomain = server_response.data.data.created.subdomain;
-                    this.displayed_url.domain = server_response.data.data.created.domain;
-                    this.displayed_url.suffix = server_response.data.data.created.suffix;
-
-                    this.is_edited = false;
-                } else {
-                    this.edited_url_value = this.original_url_value;
-                }
-            });
-        },
-    }
-}
-</script>
-
-<i18n>
-{
-    "en": {
-        "start_editing_url": "Edit {0}.",
-        "cancel_editing_url": "Cancel editing and store the original value: {0}",
-        "save_edited_url": "Save changes, the change will be applied to {0}.",
-        "delete_edited_url": "Delete {0} from this list.",
-        "button_labels": {
-            "save": "Save",
-            "cancel": "Cancel",
-            "remove": "Remove"
-        }
-    },
-    "nl": {
-        "eligeble_mail": "E-mail scannen is mogelijk",
-        "start_editing_url": "Bewerk {0}.",
-        "button_labels": {
-            "save": "Opslaan",
-            "cancel": "Annuleren",
-            "remove": "Verwijderen"
-        }
-    }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/domains/domain/editDomain.vue b/src/components/domains/domain/editDomain.vue
index 82041f9..4dea257 100644
--- a/src/components/domains/domain/editDomain.vue
+++ b/src/components/domains/domain/editDomain.vue
@@ -23,9 +23,9 @@ button {
 
     <span v-if="editing">
       <input autofocus :placeholder="edited_url_value" v-model="edited_url_value">&nbsp;
-      <a @click="save()"><span class="sr-only">{{ $t("button_labels.save") }}</span>✅</a>&nbsp;
-      <a @click="cancel()"><span class="sr-only">{{ $t("button_labels.cancel") }}</span>⏪</a>&nbsp;
-      <a @click="delete_url(list.id, url.id)"><span class="sr-only">{{ $t("button_labels.remove") }}</span>🗑️</a>
+      <a @click="save()"><span class="sr-only">{{ $t("domain.edit-domain.save") }}</span>✅</a>&nbsp;
+      <a @click="cancel()"><span class="sr-only">{{ $t("domain.edit-domain.cancel") }}</span>⏪</a>&nbsp;
+      <a @click="delete_url(list.id, url.id)"><span class="sr-only">{{ $t("domain.edit-domain.remove") }}</span>🗑️</a>
     </span>
 
   </div>
@@ -104,39 +104,3 @@ export default {
   }
 }
 </script>
-
-<i18n>
-{
-  "en": {
-    "start_editing_url": "Edit {0}.",
-    "cancel_editing_url": "Cancel editing and store the original value: {0}",
-    "eligeble_mail": "{0} is eligible for e-mail scans",
-    "unknown_eligeble_mail": "Not yet known if {0} can be mail scanned.",
-    "not_eligeble_mail": "{0} is not eligible for e-mail scans. Will be checked again when starting a scan.",
-    "eligeble_web": "{0} is eligible for web scans",
-    "unknown_eligeble_web": "Not yet known if {0} can be web scanned.",
-    "not_eligeble_web": "{0} is not eligible for web scans. Will be checked again when starting a scan.",
-    "save_edited_url": "Save changes, the change will be applied to {0}.",
-    "delete_edited_url": "Delete {0} from this list.",
-    "button_labels": {
-      "save": "Save",
-      "cancel": "Cancel",
-      "remove": "Remove"
-    }
-  },
-  "nl": {
-    "eligeble_mail": "E-mail scannen is mogelijk",
-    "start_editing_url": "Bewerk {0}.",
-    "unknown_eligeble_mail": "Onbekend of E-mail scannen mogelijk is",
-    "not_eligeble_mail": "Kan geen E-mail scan uitvoeren (wordt opnieuw gecheckt bij het starten van de scan)",
-    "eligeble_web": "Web scan is mogelijk",
-    "unknown_eligeble_web": "Niet bekend of het mogelijk is een web scan uit te voeren",
-    "not_eligeble_web": "Web scan kan niet worden uitgevoerd. Dit wordt opnieuw gecheckt bij het starten van de scan.",
-    "button_labels": {
-      "save": "Opslaan",
-      "cancel": "Annuleren",
-      "remove": "Verwijderen"
-    }
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/domains/list/DiscoverSubdomainsModal.vue b/src/components/domains/list/DiscoverSubdomainsModal.vue
index f6e5a3f..11ea04c 100644
--- a/src/components/domains/list/DiscoverSubdomainsModal.vue
+++ b/src/components/domains/list/DiscoverSubdomainsModal.vue
@@ -2,43 +2,43 @@
 <template>
   <b-modal :visible="visible" @hidden="close()" header-bg-variant="info" header-text-variant="light" no-fade
            scrollable size="lg">
-    <h3 slot="modal-title">📝 {{ $t("title") }}</h3>
+    <h3 slot="modal-title">📝 {{ $t("domain.discover-subdomains.title") }}</h3>
     <div slot="default" style="min-height: 50vh;">
 
-      <label for="domain_name">{{ $t("find_subdomains_header", [list.name]) }}:</label><br>
+      <label for="domain_name">{{ $t("domain.discover-subdomains.find_subdomains_header", [list.name]) }}:</label><br>
 
       <b-input-group class="mb-2">
 
 
-      <b-form-input id="domain_name" type="text" maxlength="120" v-model="input_domain" debounce="400" :placeholder='$t("enter_domain_name")'></b-form-input>
+      <b-form-input id="domain_name" type="text" maxlength="120" v-model="input_domain" debounce="400" :placeholder='$t("domain.discover-subdomains.enter_domain_name")'></b-form-input>
 
       <b-input-group-append>
-        <b-button class="lastbutton" role="link" @click="find_suggestions()" style="min-width: 120px">🔎 {{ $t("search") }} <b-spinner variant="info" label="Spinning" small v-if="loading_suggestions"/></b-button>
+        <b-button class="lastbutton" role="link" @click="find_suggestions()" style="min-width: 120px">🔎 {{ $t("domain.discover-subdomains.search") }} <b-spinner variant="info" label="Spinning" small v-if="loading_suggestions"/></b-button>
       </b-input-group-append>
     </b-input-group>
-      <p class="mb-2">{{$t("will_be_added_to", [list.name])}}</p>
+      <p class="mb-2">{{$t("domain.discover-subdomains.will_be_added_to", [list.name])}}</p>
 
-      <server-response :response="response" v-if="response" :message='$t("" + response.message)'/>
+      <server-response :response="response" v-if="response" :message='$t("domain.discover-subdomains." + response.message)'/>
 
       <b-alert variant="info" show v-if="response.success === true" dismissible>
-        <h4>{{ $t("status_report") }}</h4>
+        <h4>{{ $t("domain.discover-subdomains.status_report") }}</h4>
         <li v-if="response.data.duplicates_removed">
-          {{ $t("removed_n_duplicates", [response.data.duplicates_removed]) }}
+          {{ $t("domain.discover-subdomains.removed_n_duplicates", [response.data.duplicates_removed]) }}
         </li>
-        <li v-if="response.data.already_in_list">{{ $t("ignored_n", [response.data.already_in_list]) }}</li>
-        <li>{{ $t("added_n_to_list", [response.data.added_to_list]) }}
+        <li v-if="response.data.already_in_list">{{ $t("domain.discover-subdomains.ignored_n", [response.data.already_in_list]) }}</li>
+        <li>{{ $t("domain.discover-subdomains.added_n_to_list", [response.data.added_to_list]) }}
         </li>
       </b-alert>
 
 
       <div v-if="suggestions.length > 0">
         <p>
-          {{ $t("domains_found", [suggestions.length]) }}, <a @click="dive_into_archive">{{$t("dive_into_archive", [period + this.extend_period])}}</a>
+          {{ $t("domain.discover-subdomains.domains_found", [suggestions.length]) }}, <a @click="dive_into_archive">{{$t("domain.discover-subdomains.dive_into_archive", [period + this.extend_period])}}</a>
         </p>
 
-      <b-button @click="add_suggestions">{{ $t("add_subdomains_button", [selected_suggestions.length]) }} <b-spinner variant="info" label="Spinning" small v-if="loading_add_suggestions"/></b-button><br><br>
+      <b-button @click="add_suggestions">{{ $t("domain.discover-subdomains.add_subdomains_button", [selected_suggestions.length]) }} <b-spinner variant="info" label="Spinning" small v-if="loading_add_suggestions"/></b-button><br><br>
 
-      <b-button id="select_all" @click="toggle_all" v-model="select_all" size="sm">{{ $t("select_all") }}</b-button><b-button size="sm" @click="clear_selection" class="ml-4">{{ $t("clear_selection") }}</b-button>
+      <b-button id="select_all" @click="toggle_all" v-model="select_all" size="sm">{{ $t("domain.discover-subdomains.select_all") }}</b-button><b-button size="sm" @click="clear_selection" class="ml-4">{{ $t("domain.discover-subdomains.clear_selection") }}</b-button>
       <br><br>
 
       <p>
@@ -55,7 +55,7 @@
         </b-form-checkbox-group>
       </p>
 
-      <b-button @click="add_suggestions">{{ $t("add_subdomains_button", [selected_suggestions.length]) }} <b-spinner variant="info" label="Spinning" small v-if="loading_add_suggestions"/></b-button>
+      <b-button @click="add_suggestions">{{ $t("domain.discover-subdomains.add_subdomains_button", [selected_suggestions.length]) }} <b-spinner variant="info" label="Spinning" small v-if="loading_add_suggestions"/></b-button>
 
       </div>
 
@@ -63,10 +63,10 @@
     </div>
     <div slot="modal-footer">
       <button class="modal-default-button altbutton" @click="cancel()">
-        {{ $t("cancel") }}
+        {{ $t("domain.discover-subdomains.cancel") }}
       </button> &nbsp;
       <button class="modal-default-button defaultbutton" @click="close()">
-        {{ $t("ok") }}
+        {{ $t("domain.discover-subdomains.ok") }}
       </button>
     </div>
   </b-modal>
@@ -196,46 +196,3 @@ export default {
   }
 }
 </script>
-
-<i18n>
-{
-  "en": {
-    "title": "Discover Subdomains",
-    "cancel": "Cancel",
-    "ok": "Done",
-    "find_subdomains_header": "Enter a domain name to find subdomains",
-    "will_be_added_to": "selected subdomains will be added to the list named {0}.",
-    "added_n_to_list": "{0} domains added to this list. Take care: if the new domains are not shown in the list right away, wait a short while and reload the list.",
-    "removed_n_duplicates": "{0} duplicates removed from the input.",
-    "ignored_n": "{0} domains are already in this list.",
-    "add_domains_valid_urls_added": "New domains have processed, see the status report for details.",
-    "status_report": "Status report",
-    "domains_found": "{0} subdomains found",
-    "select_all": "Select all",
-    "clear_selection": "Clear selection",
-    "dive_into_archive": "search for older subdomains, up to {0} days ago.",
-    "add_subdomains_button": "Add {0} selected subdomains",
-    "search": "Search",
-    "enter_domain_name": "Enter a domain name, such as internet.nl to find subdomains..."
-  },
-  "nl": {
-    "title": "Subdomeinen Zoeker",
-    "cancel": "Annuleer",
-    "ok": "Klaar",
-    "find_subdomains_header": "Voer een domeinnaam in om subdomeinen te vinden",
-    "will_be_added_to": "geselecteerde subdomeinen worden toegevoegd aan de lijst genaamd {0}.",
-    "added_n_to_list": "{0} domeinen zijn aan de lijst toegevoegd. Let op: als de nieuwe domeinen niet direct in de lijst staan, wacht dan even en herlaad de lijst.",
-    "removed_n_duplicates": "{0} dubbel ingevoerde domeinen zijn overgeslagen.",
-    "ignored_n": "{0} domeinen zitten al in de lijst.",
-    "add_domains_valid_urls_added": "Nieuwe domeinen zijn verwerkt, zie het statusoverzicht voor details.",
-    "status_report": "Statusoverzicht",
-    "domains_found": "{0} subdomeinen gevonden",
-    "select_all": "Selecteer alles",
-    "clear_selection": "Selectie Wissen",
-    "dive_into_archive": "zoek naar oudere subdomeinen, tot {0} dagen terug.",
-    "add_subdomains_button": "Voeg {0} geselecteerde subdomeinen toe",
-    "search": "Zoek",
-    "enter_domain_name": "Voor een domeinnaam in zoals internet.nl om subdomeinen te vinden..."
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/home/PublicReports.vue b/src/components/home/PublicReports.vue
index 1b64534..d50681f 100644
--- a/src/components/home/PublicReports.vue
+++ b/src/components/home/PublicReports.vue
@@ -5,8 +5,8 @@
 <template>
   <div v-if="reports.length > 0">
     <content-block>
-      <h3>{{ $t("Public reports") }}</h3>
-      <p>{{ $t("introduction") }}</p>
+      <h3>{{ $t("public-reports.page.Public reports") }}</h3>
+      <p>{{ $t("public-reports.page.introduction") }}</p>
       <PublicReportsTable :reports="reports"/>
     </content-block>
   </div>
@@ -43,30 +43,3 @@ export default {
 
 }
 </script>
-<i18n>
-{
-  "en": {
-    "domains": "domains",
-    "View report": "View report",
-    "Public reports": "Public reports created by dashboard staff",
-    "introduction": "These reports are created, curated and shared by the internet.nl dashboard staff",
-    "Score": "Internet.nl score",
-    "Name": "Report",
-    "Published": "Publication date",
-    "View": "View",
-    "Contains": "Contains"
-  },
-  "nl": {
-    "domains": "domeinen",
-    "View report": "Bekijk rapport",
-    "Public reports": "Openbare rapporten samengesteld door dashboard beheerders",
-    "introduction": "Deze rapporten worden gemaakt, samengesteld en gedeeld door het internet.nl dashboard team",
-    "Score": "Internet.nl score",
-    "Name": "Rapport",
-    "Published": "Gepubliceerd op",
-    "View": "Bekijken",
-    "Contains": "Bevat"
-  }
-}
-
-</i18n>
\ No newline at end of file
diff --git a/src/components/home/PublicReportsPerAccount.vue b/src/components/home/PublicReportsPerAccount.vue
index 906d3b3..55be73a 100644
--- a/src/components/home/PublicReportsPerAccount.vue
+++ b/src/components/home/PublicReportsPerAccount.vue
@@ -5,26 +5,26 @@
 <template>
   <div v-if="reportsets.length > 0">
     <content-block>
-      <h1>{{ $t("Recently published reports") }}</h1>
+      <h1>{{ $t("public-reports.per-account.Recently published reports") }}</h1>
     </content-block>
     <div v-for="reportset in reportsets" :key="reportset.list.id">
       <content-block v-if="reportset.reports.length">
         <h4>{{ reportset.list.name }}</h4>
         <p style="float: right">
-          <key-value-badge :k='$t("scan_frequency")' :v="$t(reportset.list.automated_scan_frequency)" v-if="reportset.list.automatically_share_new_reports" />
+          <key-value-badge :k='$t("public-reports.per-account.scan_frequency")' :v="$t('app.frequency' + reportset.list.automated_scan_frequency)" v-if="reportset.list.automatically_share_new_reports" />
 
-          <key-value-badge :k='$t("scan_type")' :v="$t(reportset.list.scan_type)" />
+          <key-value-badge :k='$t("public-reports.per-account.scan_type")' :v="$t('app.scan-type.' + reportset.list.scan_type)" />
         </p>
         <template v-if="reportset.list.scan_type === 'all'">
           <button class="mb-2 mr-2 darklink">
-            <router-link :to="`/latest/${reportset.list.id}/mail/`">{{ $t("View latest mail report") }}</router-link>
+            <router-link :to="`/latest/${reportset.list.id}/mail/`">{{ $t("public-reports.per-account.View latest mail report") }}</router-link>
           </button>
           <button class="mb-2 darklink">
-            <router-link :to="`/latest/${reportset.list.id}/web/`">{{ $t("View latest web report") }}</router-link>
+            <router-link :to="`/latest/${reportset.list.id}/web/`">{{ $t("public-reports.per-account.View latest web report") }}</router-link>
           </button>
         </template>
         <button class="mb-2 darklink" v-if="reportset.list.scan_type === 'web' || reportset.list.scan_type === 'mail'">
-          <router-link :to="`/latest/${reportset.list.id}/`">{{ $t("View latest report") }}</router-link>
+          <router-link :to="`/latest/${reportset.list.id}/`">{{ $t("public-reports.per-account.View latest report") }}</router-link>
         </button>
         <PublicReportsTable :reports="reportset.reports"/>
       </content-block>
@@ -69,40 +69,3 @@ export default {
 
 }
 </script>
-<i18n>
-{
-  "en": {
-    "domains": "domains",
-    "View report": "View report",
-    "Recently published reports": "Public reports",
-    "Score": "Internet.nl score",
-    "Name": "Report",
-    "Published": "Publication date",
-    "View": "View",
-    "Contains": "Contains",
-    "View latest report": "Newest report",
-    "View latest mail report": "Newest mail report",
-    "View latest web report": "Newest web report",
-    "scan_frequency": "Next update",
-    "scan_type": "Measured",
-    "all": "Mail & Web"
-  },
-  "nl": {
-    "domains": "domeinen",
-    "View report": "Bekijk rapport",
-    "Recently published reports": "Openbare rapporten",
-    "Score": "Internet.nl score",
-    "Name": "Rapport",
-    "Published": "Gepubliceerd op",
-    "View": "Bekijken",
-    "Contains": "Bevat",
-    "View latest report": "Nieuwste rapport",
-    "View latest mail report": "Nieuwste mail rapport",
-    "View latest web report": "Nieuwste web rapport",
-    "scan_frequency": "Volgende update",
-    "scan_type": "Gemeten",
-    "all": "Mail & Web"
-  }
-}
-
-</i18n>
\ No newline at end of file
diff --git a/src/components/home/PublicReportsTable.vue b/src/components/home/PublicReportsTable.vue
index 4ef61d4..c6d33ae 100644
--- a/src/components/home/PublicReportsTable.vue
+++ b/src/components/home/PublicReportsTable.vue
@@ -32,7 +32,7 @@
     <template #cell(urllist__name)="data">
       <a :href="`#/shared/report/${data.item.public_report_code}`" target="_blank" rel="nofollow">
        <scan-type-icon :type="data.item.report_type" /> {{data.value}} ({{data.item.report_type}})<br />
-        {{$t("Contains")}} {{data.item.total_urls}} {{$t("domains")}} <b-icon icon="box-arrow-in-up-right"></b-icon>
+        {{$t("public-reports.table.Contains")}} {{data.item.total_urls}} {{$t("public-reports.table.domains")}} <b-icon icon="box-arrow-in-up-right"></b-icon>
       </a>
       <b-badge variant="danger" class="ml-2" v-if="data.has_public_share_code">
         <b-icon icon="lock"></b-icon> Requires password
@@ -75,38 +75,11 @@ export default {
       fields: [
         // tdClass: 'col-3', makes all cells 100% width which does not work in safari, therefore tdStyle is used as
         // a workaround
-        {key: "average_internet_nl_score", sortable: true, label: this.$t("Score"),  tdStyle: "width: 25%;"},
-        {key: "urllist__name", sortable: true, label: this.$t("Name"),  tdStyle: "width: 50%"},
-        {key: "at_when", sortable: true, label: this.$t("Published"), tdStyle: "width: 25%"},
+        {key: "average_internet_nl_score", sortable: true, label: this.$t("public-reports.table.Score"),  tdStyle: "width: 25%;"},
+        {key: "urllist__name", sortable: true, label: this.$t("public-reports.table.Name"),  tdStyle: "width: 50%"},
+        {key: "at_when", sortable: true, label: this.$t("public-reports.table.Published"), tdStyle: "width: 25%"},
       ]
     }
   },
 }
 </script>
-<i18n>
-{
-  "en": {
-    "domains": "domains",
-    "View report": "View report",
-    "Recently published reports": "Recently published reports",
-    "introduction": "These reports are created, curated and shared by the internet.nl dashboard staff",
-    "Score": "Internet.nl score",
-    "Name": "Report",
-    "Published": "Publication date",
-    "View": "View",
-    "Contains": "Contains"
-  },
-  "nl": {
-    "domains": "domeinen",
-    "View report": "Bekijk rapport",
-    "Recently published reports": "Recent gepubliceerde rapporten",
-    "introduction": "Deze rapporten worden gemaakt, samengesteld en gedeeld door het internet.nl dashboard team",
-    "Score": "Internet.nl score",
-    "Name": "Rapport",
-    "Published": "Gepubliceerd op",
-    "View": "Bekijken",
-    "Contains": "Bevat"
-  }
-}
-
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/AppliedTags.vue b/src/components/reports/AppliedTags.vue
index 256cbd3..3a1d8ea 100644
--- a/src/components/reports/AppliedTags.vue
+++ b/src/components/reports/AppliedTags.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-  <p v-if="$store.state.tags.length > 0">{{ $t("info") }}: <tag :value="tag" :key="tag" v-for="tag in $store.state.tags"/></p>
+  <p v-if="$store.state.tags.length > 0">{{ $t("report.applied-tags.info") }}: <tag :value="tag" :key="tag" v-for="tag in $store.state.tags"/></p>
 </div>
 </template>
 
@@ -11,14 +11,3 @@ name: "AppliedTags",
   components: {Tag}
 }
 </script>
-<i18n>
-{
-  "en": {
-    "info": "Applied labels"
-  },
-  "nl": {
-    "info": "Toegepaste labels"
-  }
-}
-
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/DifferencesToCurrentList.vue b/src/components/reports/DifferencesToCurrentList.vue
index 7b00471..7b5fe7d 100644
--- a/src/components/reports/DifferencesToCurrentList.vue
+++ b/src/components/reports/DifferencesToCurrentList.vue
@@ -2,31 +2,31 @@
 <template>
   <p v-if="differences.number_of_urls_in_urllist">
     <template v-if="differences.both_are_equal">
-      {{ $t("equal") }}
-      {{ $t("both_list_contain_n_urls", [differences.number_of_urls_in_urllist]) }}
+      {{ $t("report.differences.equal") }}
+      {{ $t("report.differences.both_list_contain_n_urls", [differences.number_of_urls_in_urllist]) }}
     </template>
     <template v-else>
-      ⚠️ {{ $t("not_equal") }}
+      ⚠️ {{ $t("report.differences.not_equal") }}
       <template v-if="differences.number_of_urls_in_urllist === differences.number_of_urls_in_report">
-        {{ $t("both_list_contain_n_urls", [differences.number_of_urls_in_urllist]) }}
+        {{ $t("report.differences.both_list_contain_n_urls", [differences.number_of_urls_in_urllist]) }}
       </template>
       <template v-if="differences.number_of_urls_in_urllist !== differences.number_of_urls_in_report">
         {{
-          $t("report_contains_n_urllist_contains_n", [differences.number_of_urls_in_report, differences.number_of_urls_in_urllist])
+          $t("report.differences.report_contains_n_urllist_contains_n", [differences.number_of_urls_in_report, differences.number_of_urls_in_urllist])
         }}
       </template>
       <template v-if="differences.in_report_but_not_in_urllist !== ''">
-        {{ $t("in_report_but_not_in_urllist") }}:
+        {{ $t("report.differences.in_report_but_not_in_urllist") }}:
         {{ differences.in_report_but_not_in_urllist }}.
       </template>
       <template v-if="differences.in_urllist_but_not_in_report !== ''">
-        {{ $t("in_urllist_but_not_in_report") }}:
+        {{ $t("report.differences.in_urllist_but_not_in_report") }}:
         {{ differences.in_urllist_but_not_in_report }}.
       </template>
     </template>
   </p>
   <p v-else>
-    {{$t("retrieving_differences")}}
+    {{$t("report.differences.retrieving_differences")}}
   </p>
 </template>
 
@@ -66,30 +66,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
-
-<i18n>
-{
-  "en": {
-    "equal": "The domains in this report are equal to the domains in the associated list of domains.",
-    "not_equal": "The domains in this report differ from the domains in the associated list of domains.",
-    "both_list_contain_n_urls": "Both the report and the associated list of domains contain {0} domains.",
-    "report_contains_n_urllist_contains_n": "This report contains {0} domains, while the associated list contains {1}.",
-    "in_report_but_not_in_urllist": "Domains in this report, but not in the list",
-    "in_urllist_but_not_in_report": "Domains not in this report",
-    "retrieving_differences": "Retrieving differences compared to current list."
-  },
-  "nl": {
-    "equal": "Domeinen in dit rapport zijn gelijk aan de domeinen in de bijbehorende lijst.",
-    "not_equal": "Domeinen in dit rapport wijken af van de domeinen in de bijbehorende lijst.",
-    "both_list_contain_n_urls": "Zowel de rapportage als de bijbehorende lijst bevatten {0} domeinen.",
-    "report_contains_n_urllist_contains_n": "Deze rapportage bevat {0} domeinen terwijl de bijbehorende lijst {1} domeinen bevat.",
-    "in_report_but_not_in_urllist": "Domeinen in het rapport, maar niet in de bijbehorende lijst",
-    "in_urllist_but_not_in_report": "Domeinen niet in het rapport",
-    "retrieving_differences": "Lijst met verschillen aan het ophalen t.o.v. de huidige lijst."
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/NestedReportCharts.vue b/src/components/reports/NestedReportCharts.vue
index 6ef89fd..182e1bf 100644
--- a/src/components/reports/NestedReportCharts.vue
+++ b/src/components/reports/NestedReportCharts.vue
@@ -15,7 +15,7 @@
           <b-table-simple striped hover small responsive v-if="$store.state.rendered_chart_to_table['overall'] !== undefined">
             <b-thead>
               <b-tr>
-                <b-th>{{ $t("category") }}</b-th>
+                <b-th>{{ $t("report.nested-report.charts.category") }}</b-th>
                 <b-th v-for="xAxis in $store.state.rendered_chart_to_table['overall']['datasets']" :key="xAxis.label + 'f'">
                   {{ $t(xAxis.label) }}
                 </b-th>
@@ -165,15 +165,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "category": "Category",
-    "A": "Average"
-  },
-  "nl": {
-    "category": "Categorie",
-    "G": "Gemiddelde"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/Report.vue b/src/components/reports/Report.vue
index d4fe3b6..375e7c4 100644
--- a/src/components/reports/Report.vue
+++ b/src/components/reports/Report.vue
@@ -4,9 +4,9 @@
     <content-block class="do-not-print">
       <h1>
         <b-icon icon="file-bar-graph"/>
-        {{ $t("title") }}
+        {{ $t("report.page.title") }}
       </h1>
-      <p>{{ $t("intro") }}</p>
+      <p>{{ $t("report.page.intro") }}</p>
 
       <report-selection @tags_applied="apply_tags"/>
 
@@ -20,7 +20,7 @@
           <content-block class="do-not-print">
           <b-container>
             <report-download :report="report" v-for="report in shallow_reports" :key="`d${report.id}`" class="mb-2"></report-download>
-            <small>{{$t("patience")}}</small>
+            <small>{{$t("report.page.patience")}}</small>
             </b-container>
             </content-block>
 
@@ -36,7 +36,7 @@
 
       <b-tabs variant="info" nav-class="">
 
-        <b-tab  :title='$t("tab_metrics")' lazy>
+        <b-tab  :title='$t("report.page.tab_metrics")' lazy>
 
 
           <!-- The table can show up to two reports (the first as the source, the second as a comparison). -->
@@ -70,10 +70,10 @@
         </b-tab>
 
 
-        <b-tab :title='$t("tab_graphs")' lazy>
+        <b-tab :title='$t("report.page.tab_graphs")' lazy>
           <ReportCharts :reports="reports" :show_timeline="!tags_applied"/>
         </b-tab>
-        <b-tab :title='$t("tab_changes")' lazy>
+        <b-tab :title='$t("report.page.tab_changes")' lazy>
           <ReportImprovementAndRegressions :report_id="reports[0].id"/>
         </b-tab>
 
@@ -159,25 +159,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "settings": "Select visible metrics",
-    "title": "Reports",
-    "intro": "It is possible to select one or multiple reports. Selecting a single report shows all data of that report, including graphs and a table with detailed results. Selecting two reports, a comparison is made between these reports in the graphs and detailed result. Selecting more than two reports, only graphs are shown.",
-    "tab_metrics": "Metrics table",
-    "tab_graphs": "Graphs",
-    "tab_changes": "Changes",
-    "patience": "Reports with over 1000 domains may take a minute before downloading starts, please be patient."
-  },
-  "nl": {
-    "settings": "Selecteer zichtbare meetwaarden",
-    "title": "Rapporten",
-    "intro": "Het is mogelijk om meerdere rapporten te selecteren. Bij het selecteren van een enkel rapport wordt alle relevante informatie hierover getoond. Bij het selecteren van twee rapporten wordt een vergelijking gemaakt: zowel in de grafieken als in de detail tabel. Bij het selecteren van meer dan twee rapporten zijn alleen de grafieken zichtbaar.",
-    "tab_metrics": "Meetwaardentabel",
-    "tab_graphs": "Grafieken",
-    "tab_changes": "Veranderingen",
-    "patience": "Het kan even duren voordat een download begint van een rapport met meer dan 1000 domeinen. Neem hiervoor even de tijd."
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportCharts.vue b/src/components/reports/ReportCharts.vue
index e4cc272..f478d76 100644
--- a/src/components/reports/ReportCharts.vue
+++ b/src/components/reports/ReportCharts.vue
@@ -7,7 +7,7 @@
     </content-block>
 
     <content-block class="start-on-new-page" v-if='reports.length > 0'>
-      <h2>{{ $t("adoption_circle_chart.title") }}</h2>
+      <h2>{{ $t("report.report-charts.adoption_circle_chart.title") }}</h2>
       <applied-tags/>
 
       <donuts :reports="reports"></donuts>
@@ -15,15 +15,15 @@
     </content-block>
 
     <content-block class="start-on-new-page"  v-if='reports.length > 0'>
-      <h2>{{ $t("adoption_bar_chart.title") }}</h2>
-      <p>{{ $t("adoption_bar_chart.intro") }}</p>
+      <h2>{{ $t("report.report-charts.adoption_bar_chart.title") }}</h2>
+      <p>{{ $t("report.report-charts.adoption_bar_chart.intro") }}</p>
       <applied-tags/>
       <nested-report-charts component="percentage-bar-chart" :reports="reports"></nested-report-charts>
     </content-block>
 
     <content-block class="start-on-new-page"  v-if='reports.length > 1'>
-      <h2>{{ $t("cumulative_adoption_bar_chart.title") }}</h2>
-      <p>{{ $t("cumulative_adoption_bar_chart.intro") }}</p>
+      <h2>{{ $t("report.report-charts.cumulative_adoption_bar_chart.title") }}</h2>
+      <p>{{ $t("report.report-charts.cumulative_adoption_bar_chart.intro") }}</p>
       <applied-tags/>
 
       <nested-report-charts component="cumulative-percentage-bar-chart" :reports="reports"></nested-report-charts>
@@ -59,35 +59,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "how_charts_work": "By clicking on legend labels, it's possible to toggle certain categories. The 'failed' category is disabled by default and can be enabled by clicking on it.",
-    "cumulative_adoption_bar_chart": {
-      "title": "Adoption of standards over multiple reports",
-      "intro": "This graph shows the average adoption per standard averaged over multiple reports."
-    },
-    "adoption_bar_chart": {
-      "title": "Adoption of standards per category",
-      "intro": "This graph shows the average adoption per standard per report."
-    },
-    "adoption_circle_chart": {
-      "title": "Adoption of standards"
-    }
-  },
-  "nl": {
-    "how_charts_work": "Door te klikken op de leganda in deze grafieken, kunnen beoordelingen worden getoond en verborgen. De 'gezakt' categorie wordt standaard altijd verborgen.",
-    "cumulative_adoption_bar_chart": {
-      "title": "Adoptie van standaarden, rapporten opgeteld",
-      "intro": "In deze grafiek worden de geselecteerde rapporten bij elkaar opgeteld, en daar het gemiddelde van getoond."
-    },
-    "adoption_bar_chart": {
-      "title": "Adoptie van standaarden per categorie",
-      "intro": "Deze grafiek toont het percentage adoptie per categorie en onderliggende metingen."
-    },
-    "adoption_circle_chart": {
-      "title": "Adoptie van standaarden"
-    }
-  }
-}
-</i18n>
diff --git a/src/components/reports/ReportDownload.vue b/src/components/reports/ReportDownload.vue
index 3efc6cc..08756c2 100644
--- a/src/components/reports/ReportDownload.vue
+++ b/src/components/reports/ReportDownload.vue
@@ -3,16 +3,16 @@
 
     <b-row>
       <b-col cols="3">
-        ⬇️ {{$t("title", [report.id, report.urllist_name])}}
+        ⬇️ {{$t("report.download.title", [report.id, report.urllist_name])}}
       </b-col>
       <b-col>
-        <b-icon icon="file-earmark-spreadsheet"/> <a :href="make_downloadlink(report.id, 'xlsx')">{{ $t("xlsx") }}</a>
+        <b-icon icon="file-earmark-spreadsheet"/> <a :href="make_downloadlink(report.id, 'xlsx')">{{ $t("report.download.xlsx") }}</a>
       </b-col>
       <b-col>
-        <b-icon icon="file-earmark-spreadsheet"/> <a :href="make_downloadlink(report.id, 'ods')">{{ $t("ods") }}</a>
+        <b-icon icon="file-earmark-spreadsheet"/> <a :href="make_downloadlink(report.id, 'ods')">{{ $t("report.download.ods") }}</a>
       </b-col>
       <b-col>
-       <b-icon icon="file-text"/> <a :href="make_downloadlink(report.id, 'csv')">{{ $t("csv") }}</a>
+       <b-icon icon="file-text"/> <a :href="make_downloadlink(report.id, 'csv')">{{ $t("report.download.csv") }}</a>
       </b-col>
     </b-row>
 
@@ -29,21 +29,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "title": "Download #{0} as",
-    "intro": "Report data is available in the following formats:",
-    "xlsx": "Microsoft Excel (xlsx)",
-    "ods": "Open Spreadsheet (ods)",
-    "csv": "Comma Separated (csv)"
-  },
-  "nl": {
-    "title": "Download #{0} als",
-    "intro": "De data in dit rapport is beschikbaar in de volgende formaten:",
-    "xlsx": "Microsoft Excel (xlsx)",
-    "ods": "Open Document (ods)",
-    "csv": "Kommagescheiden (csv)"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportHeader.vue b/src/components/reports/ReportHeader.vue
index 844dab8..d2dd9ce 100644
--- a/src/components/reports/ReportHeader.vue
+++ b/src/components/reports/ReportHeader.vue
@@ -6,12 +6,12 @@
     </h2>
     <applied-tags/>
     <donut class="mr-2 d-inline-block float-left col-2" :data="{'score': reports[0].average_internet_nl_score, 'rest': 100-reports[0].average_internet_nl_score}" :axis="['score', 'rest']" :tooltip="false" :datalabels="false" :height='600' :elements="['donut']" />
-    <span>{{ $t("type_of_scan_performed") }}:
+    <span>{{ $t("report.header.type_of_scan_performed") }}:
       <scan-type-icon :type="reports[0].report_type" />
 
       {{ reports[0].report_type }}<br>
-      {{ $t("number_of_domains") }}: {{reports[0].total_urls }}<br>
-      {{ $t("data_from") }} {{ humanize_date(reports[0].at_when) }}<br>
+      {{ $t("report.header.number_of_domains") }}: {{reports[0].total_urls }}<br>
+      {{ $t("report.header.data_from") }} {{ humanize_date(reports[0].at_when) }}<br>
         <template v-if="show_application_links">
       📘 <router-link :to="{ name: 'numbered_lists', params: { list: reports[0].urllist_id }}">
         {{reports[0].urllist_name }}
@@ -23,10 +23,10 @@
       <div v-for="report in reports"  class="pl-1" :key="report.id">
         <!-- Skip the first report -->
         <template v-if="report.id !== reports[0].id">
-          <h3>{{ $t("compared_to") }}: <span v-if="show_application_links">#{{ report.id }} - </span>{{ report.urllist_name }}</h3>
+          <h3>{{ $t("report.header.compared_to") }}: <span v-if="show_application_links">#{{ report.id }} - </span>{{ report.urllist_name }}</h3>
           <span>
-            {{ $t("number_of_domains") }}: {{ report.total_urls }}<br>
-            {{ $t("data_from") }}: {{ humanize_date(report.at_when) }}<br>
+            {{ $t("report.header.number_of_domains") }}: {{ report.total_urls }}<br>
+            {{ $t("report.header.data_from") }}: {{ humanize_date(report.at_when) }}<br>
               <template v-if="show_application_links">
             📘 <router-link :to="{ name: 'numbered_lists', params: { list: report.urllist_id }}">
             {{report.urllist_name }}</router-link><br>
@@ -37,7 +37,7 @@
     </template>
 
     <template v-if="reports.length > 2">
-      <p class="pt-2">⚠️ {{ $t("only_graphs") }}</p>
+      <p class="pt-2">⚠️ {{ $t("report.header.only_graphs") }}</p>
     </template>
 
   </div>
@@ -54,24 +54,4 @@ export default {
       show_application_links: {type: Boolean, default: true, required:false}
   },
 }
-
 </script>
-
-<i18n>
-{
-  "en": {
-    "type_of_scan_performed": "Type of rapport",
-    "compared_to": "Compared to",
-    "number_of_domains": "Number of domains",
-    "data_from": "Data from",
-    "only_graphs": "Only showing the timeline and graphs because there are more than two reports selected."
-  },
-  "nl": {
-    "type_of_scan_performed": "Soort rapport",
-    "compared_to": "Vergeleken met",
-    "number_of_domains": "Aantal domeinen",
-    "data_from": "Rapportage van",
-    "only_graphs": "Enkel de tijdlijn en grafieken worden getoond omdat er meer dan twee rapporten zijn geselecteerd."
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportImprovementAndRegressions.vue b/src/components/reports/ReportImprovementAndRegressions.vue
index 907a5a6..6c6d82d 100644
--- a/src/components/reports/ReportImprovementAndRegressions.vue
+++ b/src/components/reports/ReportImprovementAndRegressions.vue
@@ -1,29 +1,29 @@
 <template>
   <content-block>
-    <h2>{{ $t("title") }}</h2>
+    <h2>{{ $t("report.improvement-regressions.title") }}</h2>
     <div v-if="!comparison.previous_report_available">
       <loading :loading="loading"/>
-      {{ $t("no_changes") }}
+      {{ $t("report.improvement-regressions.no_changes") }}
     </div>
     <div v-else>
       <loading :loading="loading"/>
-      <p>{{ $t("days_ago", [comparison.days_between_current_and_previous_report]) }}</p>
+      <p>{{ $t("report.improvement-regressions.days_ago", [comparison.days_between_current_and_previous_report]) }}</p>
 
       <ul>
         <li><img src="/static_frontend/images/report_comparison_improved.png"> {{ comparison.improvement }}
-          {{ $t("improvement") }}
+          {{ $t("report.improvement-regressions.improvement") }}
         </li>
         <li><img src="/static_frontend/images/report_comparison_regressed.png"> {{ comparison.regression }}
-          {{ $t("regression") }}
+          {{ $t("report.improvement-regressions.regression") }}
         </li>
-        <li>• {{ comparison.neutral }} {{ $t("neutral") }}</li>
+        <li>• {{ comparison.neutral }} {{ $t("report.improvement-regressions.neutral") }}</li>
       </ul>
 
       <div v-if="comparison.domains_exclusive_in_current_report.length">
-        <b>{{ $t("domains_exclusive_current") }}</b>: {{ comparison.domains_exclusive_in_current_report.join(", ") }}
+        <b>{{ $t("report.improvement-regressions.domains_exclusive_current") }}</b>: {{ comparison.domains_exclusive_in_current_report.join(", ") }}
       </div>
       <div v-if="comparison.domains_exclusive_in_other_report.length">
-        <b>{{ $t("domain_exclusive_other") }}</b>: {{ comparison.domains_exclusive_in_other_report.join(", ") }}
+        <b>{{ $t("report.improvement-regressions.domain_exclusive_other") }}</b>: {{ comparison.domains_exclusive_in_other_report.join(", ") }}
       </div>
 
       <!-- <ReportImprovementAndRegressionsTable :items="sample_data" /> -->
@@ -32,13 +32,13 @@
         v-if="comparison.comparison_table_improvement.length > 0 || comparison.comparison_table_regression.length > 0">
         <b-tab title="Domeinen met verbeteringen" v-if="comparison.comparison_table_improvement.length > 0">
           <template #title>
-            <img src="/static_frontend/images/report_comparison_improved.png"> {{$t("domains_with_improvements")}}
+            <img src="/static_frontend/images/report_comparison_improved.png"> {{$t("report.improvement-regressions.domains_with_improvements")}}
           </template>
           <ReportImprovementAndRegressionsTable :items="comparison.comparison_table_improvement" />
         </b-tab>
         <b-tab title="Domeinen met verslechteringen" v-if="comparison.comparison_table_regression.length > 0">
           <template #title>
-            <img src="/static_frontend/images/report_comparison_regressed.png"> {{$t("domains_with_regressions")}}
+            <img src="/static_frontend/images/report_comparison_regressed.png"> {{$t("report.improvement-regressions.domains_with_regressions")}}
           </template>
           <ReportImprovementAndRegressionsTable :items="comparison.comparison_table_regression" />
         </b-tab>
@@ -74,11 +74,11 @@ export default {
   data() {
     return {
       sample_data: [{
-        "url": "paulaschoice-eu.com",
+        "url": "example.com",
         "computed_suffix": "com",
-        "computed_domain": "paulaschoice-eu",
+        "computed_domain": "example",
         "computed_subdomain": "",
-        "computed_domain_and_suffix": "paulaschoice-eu.com",
+        "computed_domain_and_suffix": "example.com",
         "test_results_from_internet_nl_available": true,
         "changes": {
           "improvement": 1,
@@ -88,14 +88,14 @@ export default {
           "regressed_metrics": [],
           "neutral_metrics": ["internet_nl_web_ipv6_ws_address", "internet_nl_web_https_tls_cipherorder", "internet_nl_web_https_tls_ciphers", "internet_nl_web_appsecpriv_securitytxt", "internet_nl_web_appsecpriv_csp", "internet_nl_web_appsecpriv_referrer_policy", "internet_nl_web_appsecpriv_x_frame_options", "internet_nl_web_https_dane_exist", "internet_nl_web_dnssec_valid", "internet_nl_web_https_tls_0rtt", "internet_nl_web_https_cert_sig", "internet_nl_web_ipv6_ns_address", "internet_nl_web_dnssec_exist", "internet_nl_web_https_tls_secreneg", "internet_nl_web_https_tls_compress", "internet_nl_web_https_http_redirect", "internet_nl_web_https_http_hsts", "internet_nl_web_https_http_available", "internet_nl_web_https_tls_keyexchange", "internet_nl_web_ns_rpki_exists", "internet_nl_web_https_http_compress", "internet_nl_web_ipv6_ns_reach", "internet_nl_web_ns_rpki_valid", "internet_nl_web_https_cert_domain", "internet_nl_web_https_dane_valid", "internet_nl_web_rpki_exists", "internet_nl_web_https_cert_chain", "internet_nl_web_ipv6_ws_reach", "internet_nl_web_https_tls_clientreneg", "internet_nl_web_https_tls_version", "internet_nl_web_appsecpriv_x_content_type_options", "internet_nl_web_https_tls_keyexchangehash", "internet_nl_web_rpki_valid", "internet_nl_web_https_cert_pubkey", "internet_nl_web_ipv6_ws_similar"]
         },
-        "old": {"report": "https://dev.batch.internet.nl/site/paulaschoice-eu.com/130534/", "score": 79},
-        "new": {"report": "https://dev.batch.internet.nl/site/paulaschoice-eu.com/133548/", "score": 79}
+        "old": {"report": "https://dev.batch.internet.nl/site/example.com/123456/", "score": 79},
+        "new": {"report": "https://dev.batch.internet.nl/site/example.com/654321/", "score": 79}
       }, {
-        "url": "scoupy.com",
+        "url": "test.com",
         "computed_suffix": "com",
-        "computed_domain": "scoupy",
+        "computed_domain": "test",
         "computed_subdomain": "",
-        "computed_domain_and_suffix": "scoupy.com",
+        "computed_domain_and_suffix": "test.com",
         "test_results_from_internet_nl_available": true,
         "changes": {
           "improvement": 3,
@@ -105,8 +105,8 @@ export default {
           "regressed_metrics": ["internet_nl_web_appsecpriv_x_content_type_options", "internet_nl_web_https_http_compress", "internet_nl_web_https_tls_ocsp"],
           "neutral_metrics": ["internet_nl_web_dnssec_exist", "internet_nl_web_https_http_hsts", "internet_nl_web_appsecpriv_securitytxt", "internet_nl_web_appsecpriv_csp", "internet_nl_web_appsecpriv_referrer_policy", "internet_nl_web_appsecpriv_x_frame_options", "internet_nl_web_https_dane_exist", "internet_nl_web_ipv6_ws_address", "internet_nl_web_dnssec_valid", "internet_nl_web_https_cert_sig", "internet_nl_web_ipv6_ns_address", "internet_nl_web_https_tls_secreneg", "internet_nl_web_https_tls_compress", "internet_nl_web_https_http_redirect", "internet_nl_web_https_http_available", "internet_nl_web_https_tls_keyexchange", "internet_nl_web_ns_rpki_exists", "internet_nl_web_ipv6_ns_reach", "internet_nl_web_ns_rpki_valid", "internet_nl_web_https_cert_domain", "internet_nl_web_https_dane_valid", "internet_nl_web_rpki_exists", "internet_nl_web_https_cert_chain", "internet_nl_web_ipv6_ws_reach", "internet_nl_web_https_tls_clientreneg", "internet_nl_web_https_tls_version", "internet_nl_web_https_tls_keyexchangehash", "internet_nl_web_rpki_valid", "internet_nl_web_https_cert_pubkey", "internet_nl_web_ipv6_ws_similar"]
         },
-        "old": {"report": "https://dev.batch.internet.nl/site/scoupy.com/130494/", "score": 66},
-        "new": {"report": "https://dev.batch.internet.nl/site/scoupy.com/133519/", "score": 70}
+        "old": {"report": "https://dev.batch.internet.nl/site/test.com/130494/", "score": 66},
+        "new": {"report": "https://dev.batch.internet.nl/site/test.com/133519/", "score": 70}
       }, {
         "url": "ster.nl",
         "computed_suffix": "nl",
@@ -159,11 +159,11 @@ export default {
         "old": {"report": "https://dev.batch.internet.nl/site/vangoghmuseum.nl/130284/", "score": 52},
         "new": {"report": "https://dev.batch.internet.nl/site/vangoghmuseum.nl/133130/", "score": 52}
       }, {
-        "url": "yarden.nl",
+        "url": "example.nl",
         "computed_suffix": "nl",
-        "computed_domain": "yarden",
+        "computed_domain": "example",
         "computed_subdomain": "",
-        "computed_domain_and_suffix": "yarden.nl",
+        "computed_domain_and_suffix": "example.nl",
         "test_results_from_internet_nl_available": true,
         "changes": {
           "improvement": 2,
@@ -173,8 +173,8 @@ export default {
           "regressed_metrics": [],
           "neutral_metrics": ["internet_nl_web_dnssec_exist", "internet_nl_web_https_http_redirect", "internet_nl_web_https_http_hsts", "internet_nl_web_https_tls_keyexchange", "internet_nl_web_appsecpriv_x_content_type_options", "internet_nl_web_appsecpriv_securitytxt", "internet_nl_web_appsecpriv_csp", "internet_nl_web_appsecpriv_referrer_policy", "internet_nl_web_appsecpriv_x_frame_options", "internet_nl_web_https_tls_ocsp", "internet_nl_web_https_dane_exist", "internet_nl_web_ipv6_ws_address", "internet_nl_web_dnssec_valid", "internet_nl_web_https_tls_0rtt", "internet_nl_web_https_cert_sig", "internet_nl_web_ipv6_ns_address", "internet_nl_web_https_tls_secreneg", "internet_nl_web_https_tls_compress", "internet_nl_web_https_http_available", "internet_nl_web_ns_rpki_exists", "internet_nl_web_https_http_compress", "internet_nl_web_ipv6_ns_reach", "internet_nl_web_ns_rpki_valid", "internet_nl_web_https_cert_domain", "internet_nl_web_https_dane_valid", "internet_nl_web_rpki_exists", "internet_nl_web_https_cert_chain", "internet_nl_web_ipv6_ws_reach", "internet_nl_web_https_tls_clientreneg", "internet_nl_web_https_tls_version", "internet_nl_web_https_tls_keyexchangehash", "internet_nl_web_rpki_valid", "internet_nl_web_https_cert_pubkey", "internet_nl_web_ipv6_ws_similar"]
         },
-        "old": {"report": "https://dev.batch.internet.nl/site/yarden.nl/130506/", "score": 65},
-        "new": {"report": "https://dev.batch.internet.nl/site/yarden.nl/133555/", "score": 68}
+        "old": {"report": "https://dev.batch.internet.nl/site/example.nl/130506/", "score": 65},
+        "new": {"report": "https://dev.batch.internet.nl/site/example.nl/133555/", "score": 68}
       }],
       loading: false,
       comparison: {
@@ -209,32 +209,3 @@ export default {
   }
 }
 </script>
-
-<i18n>
-{
-  "en": {
-    "title": "Changes",
-    "improvement": "Improvements",
-    "regression": "Regressions",
-    "neutral": "Unchanged",
-    "domains_exclusive_current": "Domeinen exclusief in het huidige rapport",
-    "domains_exclusive_other": "Domeinen exclusief in het vorige rapport",
-    "no_changes": "Er zijn geen gegevens beschikbaar van het vorige rapport.",
-    "days_ago": "Het vorige rapport werd {0} dagen geleden gemaakt.",
-    "domains_with_improvements": "Domains with improvements",
-    "domains_with_regressions": "Domains with regressions"
-  },
-  "nl": {
-    "title": "Veranderingen",
-    "improvement": "Verbeteringen",
-    "regression": "Verslechteringen",
-    "neutral": "Ongewijzigd",
-    "url": "Domein",
-    "metrics": "Metingen",
-    "score_from": "Score van",
-    "score_to": "naar",
-    "domains_with_improvements": "Domeinen met verbeteringen",
-    "domains_with_regressions": "Domeinen met verslechteringen"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportImprovementAndRegressionsTable.vue b/src/components/reports/ReportImprovementAndRegressionsTable.vue
index b931bf5..e41fd1e 100644
--- a/src/components/reports/ReportImprovementAndRegressionsTable.vue
+++ b/src/components/reports/ReportImprovementAndRegressionsTable.vue
@@ -2,10 +2,10 @@
   <b-table :items="items" :fields="fields" fixed responsive striped >
     <template #cell(url)="data">
       {{ data.item.url }}<br>
-      {{$t("score_from")}} <a :href="data.item.old.report" target="_blank">{{ data.item.old.score }}%</a> {{$t("score_to")}} <a
+      {{$t("report.improvement-regressions-table.score_from")}} <a :href="data.item.old.report" target="_blank">{{ data.item.old.score }}%</a> {{$t("report.improvement-regressions-table.score_to")}} <a
         :href="data.item.new.report" target="_blank">{{ data.item.new.score }}%</a><br>
 
-      {{$t("metrics")}}
+      {{$t("report.improvement-regressions-table.metrics")}}
       <img src="/static_frontend/images/report_comparison_improved.png"> {{ data.item.changes.improvement }} &nbsp;
       <img src="/static_frontend/images/report_comparison_regressed.png"> {{ data.item.changes.regression }} &nbsp;
       • {{ data.item.changes.neutral }}<br>
@@ -14,13 +14,13 @@
 
     <template #cell(changes.improvement)="data">
       <ul>
-        <li v-for="metric in data.item.changes.improved_metrics" :key="metric">{{ $t(metric) }}</li>
+        <li v-for="metric in data.item.changes.improved_metrics" :key="metric">{{ $t("metric." + metric + ".title") }}</li>
       </ul>
     </template>
 
     <template #cell(changes.regression)="data">
       <ul>
-        <li v-for="metric in data.item.changes.regressed_metrics" :key="metric">{{ $t(metric) }}</li>
+        <li v-for="metric in data.item.changes.regressed_metrics" :key="metric">{{ $t("metric." + metric + ".title") }}</li>
       </ul>
     </template>
 
@@ -28,12 +28,7 @@
 </template>
 
 <script>
-import field_translations from '../FieldTranslations'
-
 export default {
-  i18n: {
-    sharedMessages: field_translations,
-  },
   name: "ReportImprovementAndRegressionsTable",
   props: {
     items: {
@@ -44,35 +39,11 @@ export default {
   data() {
     return {
       fields: [
-        {key: 'url', label: this.$i18n.t("url"), sortable: true},
-        {key: 'changes.improvement', label: this.$i18n.t("improvement"), sortable: true},
-        {key: 'changes.regression', label: this.$i18n.t("regression"), sortable: true},
+        {key: 'url', label: this.$i18n.t("report.improvement-regressions-table.url"), sortable: true},
+        {key: 'changes.improvement', label: this.$i18n.t("report.improvement-regressions-table.improvement"), sortable: true},
+        {key: 'changes.regression', label: this.$i18n.t("report.improvement-regressions-table.regression"), sortable: true},
       ]
     }
   }
 }
 </script>
-
-<style scoped>
-
-</style>
-<i18n>
-{
-  "en": {
-    "improvement": "Improvements",
-    "regression": "Regressions",
-    "url": "Domain",
-    "metrics": "Metrics",
-    "score_from": "Score from",
-    "score_to": "to"
-  },
-  "nl": {
-    "improvement": "Verbeteringen",
-    "regression": "Verslechteringen",
-    "url": "Domein",
-    "metrics": "Metingen",
-    "score_from": "Score van",
-    "score_to": "naar"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportPasswords.vue b/src/components/reports/ReportPasswords.vue
index fb38612..eff5111 100644
--- a/src/components/reports/ReportPasswords.vue
+++ b/src/components/reports/ReportPasswords.vue
@@ -1,18 +1,18 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <template>
   <content-block class="do-not-print" v-if="reports !== undefined">
-    <h2>⚠️ {{ $t("Authentication required") }}</h2>
-    <p>{{ $t("Some reports require authentication") }}</p>
+    <h2>⚠️ {{ $t("report.password-protection.Authentication required") }}</h2>
+    <p>{{ $t("report.password-protection.Some reports require authentication") }}</p>
 
       <b-row v-for="report in reports" :key="report.id" class="p-4 border-top border-secondary">
-        <b-col>{{ $t("code") }}: 📊 {{report.public_report_code}}<br>
-          {{ $t("name") }}: 📘 {{report.urllist_name}}<br>
-          {{ $t("created_on:") }}: {{report.at_when.human_date()}}
+        <b-col>{{ $t("report.password-protection.code") }}: 📊 {{report.public_report_code}}<br>
+          {{ $t("report.password-protection.name") }}: 📘 {{report.urllist_name}}<br>
+          {{ $t("report.password-protection.created_on") }}: {{report.at_when.human_date()}}
         </b-col>
         <b-col>
         <template v-if="report.authentication_required">
           <b-form-group
-              :label='`❌ ${$t("supply_password")}`'
+              :label='`❌ ${$t("report.password-protection.supply_password")}`'
               label-for="share-code"
               class="mb-0"
           >
@@ -25,10 +25,10 @@
           </b-form-group>
         </template><template v-else>
           <template v-if="$store.state.public_share_codes[report.public_report_code]">
-            ✅ <i>{{ $t("Stored password is valid") }}</i>
+            ✅ <i>{{ $t("report.password-protection.Stored password is valid") }}</i>
           </template>
           <template v-else>
-            ✅ <i>{{ $t("No password needed") }}</i>
+            ✅ <i>{{ $t("report.password-protection.No password needed") }}</i>
           </template>
         </template>
         </b-col>
@@ -36,7 +36,7 @@
 
     <!-- onclick emit retry. -->
     <b-row class="pt-4 pl-3 pb-2 border-top border-secondary">
-      <button type="submit" @click="$emit('retry')">{{ $t("Retry with above settings") }}</button>
+      <button type="submit" @click="$emit('retry')">{{ $t("report.password-protection.Retry with above settings") }}</button>
     </b-row>
 
   </content-block>
@@ -49,29 +49,3 @@ export default {
   emits: ['retry']
 }
 </script>
-<i18n>
-{
-  "en": {
-    "supply_password": "Please enter the password for this report:",
-    "Stored password is valid": "Stored password is valid",
-    "No password needed": "No password needed",
-    "Retry with above settings": "Open with this password",
-    "Authentication required": "Authentication required",
-    "Some reports require authentication": "Some reports require authentication, please fill in the password / 'share code' for each report:",
-    "code": "Report",
-    "name": "Name",
-    "created_on": "Created on"
-  },
-  "nl": {
-    "Authentication required": "Wachtwoord vereist",
-    "Some reports require authentication": "Voor sommige rapporten is een wachtwoord vereist, vul het wachtwoord of 'deelcode' in voor die rapporten:",
-    "supply_password": "Voer een wachtwoord in voor dit rapport:",
-    "Stored password is valid": "Het opgeslagen wachtwoord is geldig",
-    "No password needed": "Geen wachtwoord vereist",
-    "Retry with above settings": "Probeer met dit wachtwoord",
-    "code": "Rapport",
-    "name": "Naam",
-    "created_on": "Gemaakt op"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportSelection.vue b/src/components/reports/ReportSelection.vue
index bd683b5..713a899 100644
--- a/src/components/reports/ReportSelection.vue
+++ b/src/components/reports/ReportSelection.vue
@@ -45,7 +45,7 @@
     <b-input-group>
     <v-select
         v-model="selected_reports"
-        :placeholder='$t("select_report")'
+        :placeholder='$t("report.report-selection.select_report")'
         :options="filtered_recent_reports"
         label="label"
         :spinner="loading"
@@ -53,7 +53,7 @@
         :multiple="true"
         :selectable="() => selected_reports.length < 6"
     >
-      <slot name="no-options">{{ $t("no_options") }}</slot>
+      <slot name="no-options">{{ $t("report.report-selection.no_options") }}</slot>
       <template v-slot:option="option">
         <div class="rowline d-block">
           <div class="d-inline-block col-1">{{ option.id }}</div>
@@ -70,7 +70,7 @@
     </v-select>
 
     <b-input-group-append>
-    <b-button class="lastbutton" variant="info" role="link" @click="get_recent_reports()">🔁 {{ $t("reload_list") }}</b-button>
+    <b-button class="lastbutton" variant="info" role="link" @click="get_recent_reports()">🔁 {{ $t("report.report-selection.reload_list") }}</b-button>
       </b-input-group-append>
     </b-input-group>
 
@@ -228,17 +228,4 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "select_report": "Select report...",
-    "no_options": "No reports available.",
-    "reload_list": "Update"
-  },
-  "nl": {
-    "select_report": "Selecteer rapport...",
-    "no_options": "Geen rapporten beschikbaar.",
-    "reload_list": "Bijwerken"
-  }
-}
-</i18n>
+
diff --git a/src/components/reports/ReportTableLegend.vue b/src/components/reports/ReportTableLegend.vue
index a743b6b..4a528ab 100644
--- a/src/components/reports/ReportTableLegend.vue
+++ b/src/components/reports/ReportTableLegend.vue
@@ -1,52 +1,46 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <template>
-  <div><h3>{{ $t("test_title") }}</h3>
+  <div><h3>{{ $t("metric.legend.test_title") }}</h3>
     <ul>
       <li><span class="faq-test category_passed"><span
-          class="sr-only">{{ $t("results.passed") }}</span>{{ $t("test_good") }}</span></li>
+          class="sr-only">{{ $t("report.legend.results.passed") }}</span>{{ $t("metric.legend.test_good") }}</span></li>
       <li><span class="faq-test category_failed">
-                        <span class="sr-only">{{ $t("results.failed") }}</span>{{ $t("test_bad") }}</span>
+                        <span class="sr-only">{{ $t("report.legend.results.failed") }}</span>{{ $t("metric.legend.test_bad") }}</span>
       </li>
       <li><span class="faq-test category_warning"><span class="sr-only">{{
-          $t("results.warning")
-        }}</span>{{ $t("test_warning") }}</span></li>
+          $t("report.legend.results.warning")
+        }}</span>{{ $t("metric.legend.test_warning") }}</span></li>
       <li><span class="faq-test category_error"><span class="sr-only">{{
-          $t("results.category_error_in_test")
-        }}</span>{{ $t("icon_legend.category_error_in_test") }}</span></li>
+          $t("report.legend.results.category_error_in_test")
+        }}</span>{{ $t("report.legend.icon_legend.category_error_in_test") }}</span></li>
     </ul>
-    <h3>{{ $t("subtest_title") }}</h3>
+    <h3>{{ $t("metric.legend.subtest_title") }}</h3>
     <ul>
       <li>
         <span class="faq-subtest passed">
-          <span class="sr-only">{{ $t("results.passed") }}</span>
-          {{ $t("subtest_good") }}</span></li>
-      <li><span class="faq-subtest failed"><span class="sr-only">{{ $t("results.failed") }}</span>{{
-          $t("subtest_bad")
+          <span class="sr-only">{{ $t("report.legend.results.passed") }}</span>
+          {{ $t("metric.legend.subtest_good") }}</span></li>
+      <li><span class="faq-subtest failed"><span class="sr-only">{{ $t("report.legend.results.failed") }}</span>{{
+          $t("metric.legend.subtest_bad")
         }}</span></li>
       <li><span class="faq-subtest warning"><span class="sr-only">{{
-          $t("results.warning")
-        }}</span>{{ $t("subtest_warning") }}</span></li>
+          $t("report.legend.results.warning")
+        }}</span>{{ $t("metric.legend.subtest_warning") }}</span></li>
       <li><span class="faq-subtest info"><span class="sr-only">{{
-          $t("results.info")
-        }}</span>{{ $t("subtest_info") }}</span></li>
+          $t("report.legend.results.info")
+        }}</span>{{ $t("metric.legend.subtest_info") }}</span></li>
       <li><span class="faq-test not_tested"><span class="sr-only">{{
-          $t("results.not_tested")
+          $t("report.legend.results.not_tested")
         }}</span>{{ $t("icon_legend.subtest_not_tested") }}</span></li>
       <li><span class="faq-test error_in_test"><span class="sr-only">{{
-          $t("results.error_in_test")
+          $t("report.legend.results.error_in_test")
         }}</span>{{ $t("icon_legend.subtest_error_in_test") }}</span></li>
     </ul>
   </div>
 </template>
 
 <script>
-
-import field_translations from '../FieldTranslations'
-
 export default {
-  i18n: {
-    sharedMessages: field_translations,
-  },
   name: "report_table_legend.vue"
 }
 </script>
@@ -156,62 +150,4 @@ export default {
 .testresults h2.passed, .faq-test.passed, .test-header .test-title h2.passed, #testresults-overview ul li.passed {
   background-image: url("/static_frontend/images/vendor/internet_nl/icon-circle-check.svg") !important
 }
-
-
 </style>
-
-<i18n>
-{
-  "en": {
-    "results": {
-      "not_applicable": "Not applicable",
-      "not_testable": "Not testable",
-      "error_in_test": "Test error",
-      "category_error_in_test": "Test error",
-      "not_tested": "Not tested",
-      "failed": "Failed",
-      "warning": "Warning",
-      "info": "Info",
-      "passed": "Passed",
-      "unknown": "Unknown",
-      "comparison": {
-        "neutral": "-",
-        "improved": "Improved compared to the second report selected.",
-        "regressed": "Regressed compared to the second report selected."
-      }
-    },
-    "icon_legend": {
-      "title": "Legend of used icons",
-      "category_error_in_test": "Error occurred while testing ⇒ null score",
-      "subtest_not_applicable": "Not applicable ⇒ no score impact",
-      "subtest_not_tested": "Not tested ⇒ no score impact",
-      "subtest_error_in_test": "Error occurred while testing ⇒ null score"
-    }
-  },
-  "nl": {
-    "results": {
-      "not_applicable": "Niet van toepassing",
-      "not_testable": "Niet testbaar",
-      "error_in_test": "Testfout",
-      "category_error_in_test": "Testfout",
-      "not_tested": "Niet getest",
-      "failed": "Niet goed",
-      "warning": "Waarschuwing",
-      "info": "Info",
-      "passed": "Goed",
-      "unknown": "Onbekend",
-      "comparison": {
-        "neutral": "-",
-        "improved": "Verbeterd vergeleken met het 2e geselecteerde rapport.",
-        "regressed": "Verslechterd vergeleken met het 2e geselecteerde rapport."
-      }
-    }
-  },
-  "icon_legend": {
-    "title": "Legenda van gebruikte pictogrammen",
-    "category_error_in_test": "Fout in test ⇒ nulscore",
-    "subtest_not_tested": "Niet getest ⇒ geen score impact",
-    "subtest_error_in_test": "Fout in test ⇒ nulscore"
-  }
-}
-</i18n>
diff --git a/src/components/reports/ReportTableVirtualList.vue b/src/components/reports/ReportTableVirtualList.vue
index 9803aaf..8f19589 100644
--- a/src/components/reports/ReportTableVirtualList.vue
+++ b/src/components/reports/ReportTableVirtualList.vue
@@ -334,15 +334,15 @@ div.rotate > span {
 
 <template>
   <div>
-    <h2>{{ $t("report.title") }}</h2>
+    <h2>{{ $t("report.report-table-virtual-list.report.title") }}</h2>
     <a class="anchor" name="report"></a>
 
     <applied-tags/>
-    <p v-if="load_comparison_with_current">{{ $t("report.intro") }}</p>
+    <p v-if="load_comparison_with_current">{{ $t("report.report-table-virtual-list.report.intro") }}</p>
 
     <differences-to-current-list :report_id="reports[0].id" v-if="load_comparison_with_current" />
 
-    <collapse-panel :title='$t("icon_legend.title")' class="do-not-print">
+    <collapse-panel :title='$t("report.report-table-virtual-list.icon_legend.title")' class="do-not-print">
       <div slot="content">
         <report-table-legend />
       </div>
@@ -379,14 +379,14 @@ div.rotate > span {
             <div class="rotate">
               <a class="arrow"
                     :class="sortOrders['score'] === -1 ? 'dsc' : (sortOrders['score'] === 1 ? 'asc' : 'unknown')"></a>
-              <a @click="sortBy('score')" href="javascript:;">{{ $t("score") }}</a>
+              <a @click="sortBy('score')" href="javascript:;">{{ $t("report.report-table-virtual-list.score") }}</a>
             </div>
           </th>
           <th class="sticky-header bg-white" style="width: 200px; min-width: 200px;">
             <div class="rotate">
               <a class="arrow"
                    :class="sortOrders['url'] === -1 ? 'dsc' : (sortOrders['url'] === 1 ? 'asc' : 'unknown')"></a>
-              <a @click="sortBy('url')" class="d-inline-block" href="javascript:;">{{ $t("domain") }}</a>
+              <a @click="sortBy('url')" class="d-inline-block" href="javascript:;">{{ $t("report.report-table-virtual-list.domain") }}</a>
             </div>
           </th>
 
@@ -399,7 +399,7 @@ div.rotate > span {
                   <a class="arrow"
                         :class="sortOrders[category] === -1 ? 'dsc' : (sortOrders[category] === 1 ? 'asc' : 'unknown')"></a>
                   <!-- A very hacky solution to make the text shorter and keep the value of the category description. This should be a category description in the future just like the rest. -->
-                  <a style="text-decoration: none !important;" @click="sortBy(category)" href="javascript:;" v-html='$t("" + category).replace("(", "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")'></a>
+                  <a style="text-decoration: none !important;" @click="sortBy(category)" href="javascript:;" v-html='$t("metric." + category+".title").replace("(", "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")'></a>
                 </div>
               </div>
 
@@ -412,7 +412,7 @@ div.rotate > span {
                   <a class="arrow"
                        :class="sortOrders[category] === -1 ? 'dsc' : (sortOrders[category] === 1 ? 'asc' : 'unknown')"></a>
                   <a @click="sortBy(category)" class="d-inline-block" href="javascript:;">
-                    {{ $t("" + category) }}
+                    {{ $t("metric." + category + ".title") }}
                     <div class="small text-secondary pl-3 close_to_top" href="#"
                         v-html="category_from_field_name(category)"></div>
                   </a>
@@ -432,19 +432,19 @@ div.rotate > span {
           <!-- Zoom buttons for accessibility -->
           <tr class="summaryrow">
             <td colspan="2" class="sticky_search">
-              <label class="visuallyhidden" for="url_filter">{{ $t("report.url_filter") }}</label>
+              <label class="visuallyhidden" for="url_filter">{{ $t("report.report-table-virtual-list.report.url_filter") }}</label>
               <b-input debounce="200" type="text" v-model="url_filter" id="url_filter"
-                       :placeholder='$t("report.url_filter")'></b-input>
-              <p class="visuallyhidden">{{ $t("report.zoom.explanation") }}</p>
+                       :placeholder='$t("report.report-table-virtual-list.report.url_filter")'></b-input>
+              <p class="visuallyhidden">{{ $t("report.report-table-virtual-list.report.zoom.explanation") }}</p>
             </td>
             <template v-if="['web', 'mail'].includes(selected_category)">
               <td
                   v-for="category_name in relevant_categories_based_on_settings"
                   class="sticky_search px-100" :key="category_name">
                 <button @click="select_category(category_name)">
-                  {{ $t("report.zoom.buttons.zoom") }}
+                  {{ $t("report.report-table-virtual-list.report.zoom.buttons.zoom") }}
                   <span class="visuallyhidden">{{
-                      $t("report.zoom.buttons.zoom_in_on", [$t("" + category_name)])
+                      $t("report.report-table-virtual-list.report.zoom.buttons.zoom_in_on", [$t("metric." + category_name + ".title")])
                     }}</span>
                 </button>
                 <br>&nbsp;
@@ -456,11 +456,11 @@ div.rotate > span {
                   class="sticky_search text-center">
                 <button class="w-100"
                         @click="select_category(report_category)">
-                  <span role="img" :aria-label='$t("icons.remove_filter")'>↩️</span>
-                  {{ $t("report.zoom.buttons.remove_zoom") }}
+                  <span role="img" :aria-label='$t("report.report-table-virtual-list.icons.remove_filter")'>↩️</span>
+                  {{ $t("report.report-table-virtual-list.report.zoom.buttons.remove_zoom") }}
                 </button>
                 <br>
-                {{ $t("report.zoom.zoomed_in_on") }} {{ $t("" + selected_category) }}.
+                {{ $t("report.report-table-virtual-list.report.zoom.zoomed_in_on") }} {{ $t("metric." + selected_category + ".title") }}.
               </td>
             </template>
 
@@ -468,7 +468,7 @@ div.rotate > span {
         </template>
         <tr v-if="filtered_urls.length < 1">
           <td :colspan="relevant_categories_based_on_settings.length + 2"
-              class="text-center">😱 {{ $t("report.empty_report") }}
+              class="text-center">😱 {{ $t("report.report-table-virtual-list.report.empty_report") }}
           </td>
         </tr>
         </tbody>
@@ -483,8 +483,6 @@ div.rotate > span {
 </template>
 
 <script>
-
-import field_translations from '../FieldTranslations'
 import report_mixin from "@/components/reports/report_mixin";
 
 import ReportTableLegend from "@/components/reports/ReportTableLegend";
@@ -497,10 +495,6 @@ import ReportTableVirtualListRecord from "@/components/reports/ReportTableVirtua
 export default {
   components: {AppliedTags, DifferencesToCurrentList, ReportTableLegend, CollapsePanel, VirtualList},
   mixins: [report_mixin],
-
-  i18n: {
-    sharedMessages: field_translations,
-  },
   name: "ReportTableVirtualList",
   props: {
     reports: {
@@ -765,73 +759,3 @@ export default {
   }
 }
 </script>
-
-
-<i18n>
-{
-  "en": {
-    "score": "Score",
-    "domain": "Domain",
-    "report": {
-      "title": "Metrics table",
-      "intro": "This table shows detailed results per category. It is possible to compare this report to a second report. In that case, progress indicators are added to the first report where applicable. The domains of the second report are only compared, not displayed.",
-      "url_filter": "Filter on domain...",
-
-      "zoom": {
-        "buttons": {
-          "zoom": "details",
-          "remove_zoom": "Back to the category view",
-          "zoom_in_on": "View details of {0}"
-        },
-        "zoomed_in_on": "Details from",
-        "explanation": "Using the details buttons, it is possible to see the individual metrics for each category."
-      },
-
-      "empty_report": "It looks like this report is empty... did you filter too much?"
-
-    },
-    "icons": {
-      "remove_filter": "Remove filter"
-    },
-    "icon_legend": {
-      "title": "Legend of used icons",
-      "category_error_in_test": "Error occurred while testing ⇒ null score",
-      "subtest_not_applicable": "Not applicable ⇒ no score impact",
-      "subtest_not_tested": "Not tested ⇒ no score impact",
-      "subtest_error_in_test": "Error occurred while testing ⇒ null score"
-    }
-  },
-  "nl": {
-    "score": "Score",
-    "domain": "Domein",
-    "report": {
-      "title": "Meetwaardentabel",
-      "intro": "Deze tabel toont de details van het rapport. Het is mogelijk dit rapport te vergelijken met een vorig of ander rapport. Wanneer deze vergelijking wordt gemaakt, wordt bij de gegevens van het eerste rapport voortgangsindicatoren geplaats waar relevant. De domeinen van het tweede rapport worden alleen vergeleken, niet getoond.",
-
-      "url_filter": "Filter op domein...",
-      "zoom": {
-        "buttons": {
-          "zoom": "details",
-          "remove_zoom": "Terug naar hoofdniveau",
-          "zoom_in_on": "Bekijk de details van {0}"
-        },
-        "zoomed_in_on": "Details van ",
-        "explanation": "Met de detail buttons is het mogelijk om details van ieder categorie naar voren te halen."
-      },
-
-      "empty_report": "Geen meetgegevens gevonden, wordt er misschien teveel gefilterd?"
-
-
-    },
-    "icons": {
-      "remove_filter": "Wis filter"
-    },
-    "icon_legend": {
-      "title": "Legenda van gebruikte pictogrammen",
-      "category_error_in_test": "Fout in test ⇒ nulscore",
-      "subtest_not_tested": "Niet getest ⇒ geen score impact",
-      "subtest_error_in_test": "Fout in test ⇒ nulscore"
-    }
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/ReportTableVirtualListRecord.vue b/src/components/reports/ReportTableVirtualListRecord.vue
index f1be0ea..0b0017d 100644
--- a/src/components/reports/ReportTableVirtualListRecord.vue
+++ b/src/components/reports/ReportTableVirtualListRecord.vue
@@ -6,7 +6,7 @@
       </td>
       <td><div style="width: 200px; overflow-x: auto; white-space: nowrap;">{{ source.url }}</div></td>
       <td colspan="200">
-        <small>{{ $t("not_eligeble_for_scanning") }}</small>
+        <small>{{ $t("report.virtual-list-record.not_eligeble_for_scanning") }}</small>
       </td>
     </template>
     <template v-else>
@@ -22,7 +22,7 @@
             <img :src='`/static_frontend/images/report_comparison_${score_comparison(source)}.png`'
                  v-if="score_comparison(source)" />
           </span>
-          <span class="visuallyhidden"> {{ $t("link_to_report", {'url': source.url}) }}</span>
+          <span class="visuallyhidden"> {{ $t("report.virtual-list-record.link_to_report", {'url': source.url}) }}</span>
         </a>
       </td>
       <td class="px-225"><div style="width: 200px; overflow-x: auto; white-space: nowrap;">{{ source.url }}</div></td>
@@ -35,7 +35,7 @@
           >
           <span :class="category_verdict_to_simple_value(category_name, source) + ' ' + (category_comparison(category_name, source) ? `compared_with_next_report_${category_comparison(category_name, source)}` : '')">
             <template v-if="category_comparison(category_name, source)">
-              {{$t("results.comparison." + category_comparison(category_name, source))}}
+              {{$t("report.virtual-list-record.results.comparison." + category_comparison(category_name, source))}}
             </template>
             {{category_verdict_to_simple_value(category_name, source)}}
           </span>
@@ -53,7 +53,7 @@
           <span :class="detail_value_simple_value(category_name, source) + ' ' + detail_comparison(category_name, source)">
             {{detail_value_simple_value(category_name, source)}}
             <template v-if="detail_comparison(category_name, source)">
-              {{$t("results.comparison." + detail_comparison(category_name, source))}}
+              {{$t("report.virtual-list-record.results.comparison." + detail_comparison(category_name, source))}}
             </template>
           </span>
         </td>
@@ -286,12 +286,12 @@ export default {
       }
 
       let data = `${url.url}<br>
-          ${this.$t(category_name)}:
-          ${this.$t("results." + url.endpoints[0].ratings_by_type[category_name]['test_result'])}<br>
-          ${this.$t("since")}: ${this.humanize_date_unix_timestamp(url.endpoints[0].ratings_by_type[category_name]['since'])}`
+          ${this.$t('metric.' + category_name + '.title')}:
+          ${this.$t("report.virtual-list-record.results." + url.endpoints[0].ratings_by_type[category_name]['test_result'])}<br>
+          ${this.$t("report.virtual-list-record.since")}: ${this.humanize_date_unix_timestamp(url.endpoints[0].ratings_by_type[category_name]['since'])}`
 
       if (displayed_evidence) {
-        data += `<br>${this.$t("evidence")}:<br> <pre>${displayed_evidence}</pre>`
+        data += `<br>${this.$t("report.virtual-list-record.evidence")}:<br> <pre>${displayed_evidence}</pre>`
       }
       return data;
     },
@@ -340,58 +340,6 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "link_to_report": "View score and report from %{url} on internet.nl.",
-    "not_eligeble_for_scanning": "Domain did not match scanning criteria at the time the scan was initiated. The scanning criteria are an SOA DNS record (not NXERROR) for mail and an A or AAAA DNS record for web. This domain is ignored in all statistics.",
-    "since": "Since",
-    "evidence": "Measurement",
-    "results": {
-      "not_applicable": "Not applicable",
-      "not_testable": "Not testable",
-      "error_in_test": "Test error",
-      "error": "Test error",
-      "category_error_in_test": "Test error",
-      "not_tested": "Not tested",
-      "failed": "Failed",
-      "warning": "Warning",
-      "info": "Info",
-      "passed": "Passed",
-      "unknown": "Unknown",
-      "comparison": {
-        "neutral": "-",
-        "improved": "Improved compared to the second report selected.",
-        "regressed": "Regressed compared to the second report selected."
-      }
-    }
-  },
-  "nl": {
-    "link_to_report": "Bekijk de score en rapportage van %{url} op internet.nl.",
-    "not_eligeble_for_scanning": "Dit domein voldeed niet aan de scan-criteria op het moment van scannen. Deze criteria zijn een SOA DNS record (geen NXERROR) voor mail en een A of AAAA DNS record voor web. Dit domein komt niet terug in de statistieken.",
-    "since": "Sinds",
-    "evidence": "Meetgegevens",
-    "results": {
-      "not_applicable": "Niet van toepassing",
-      "not_testable": "Niet testbaar",
-      "error_in_test": "Testfout",
-      "error": "Testfout",
-      "category_error_in_test": "Testfout",
-      "not_tested": "Niet getest",
-      "failed": "Niet goed",
-      "warning": "Waarschuwing",
-      "info": "Info",
-      "passed": "Goed",
-      "unknown": "Onbekend",
-      "comparison": {
-        "neutral": "-",
-        "improved": "Verbeterd vergeleken met het 2e geselecteerde rapport.",
-        "regressed": "Verslechterd vergeleken met het 2e geselecteerde rapport."
-      }
-    }
-  }
-}
-</i18n>
 
 <style scoped>
 .my-tooltip-class::v-deep .tooltip-inner {
@@ -431,5 +379,4 @@ td, th {
 
 
 }
-
 </style>
diff --git a/src/components/reports/ReportTagFilter.vue b/src/components/reports/ReportTagFilter.vue
index 7696b76..75cc331 100644
--- a/src/components/reports/ReportTagFilter.vue
+++ b/src/components/reports/ReportTagFilter.vue
@@ -14,14 +14,14 @@
 <template>
   <div v-if="available_tags.length > 0">
 
-    <small>{{ $t("tag_explanation" )}}</small>
+    <small>{{ $t("report.tag-filter.tag_explanation" )}}</small>
 
     <loading :loading="loading"/>
 
     <b-input-group class="mb-2">
 
       <v-select :options="available_tags" v-model="selected_tags" multiple taggable class="w-75"
-                :placeholder='$t("filter_by_tag")'>
+                :placeholder='$t("report.tag-filter.filter_by_tag")'>
         <template v-slot:option="option">
           <tag :value="option.label"/>
         </template>
@@ -77,11 +77,11 @@
     </template>
 
 
-    <b-button variant="danger" @click="clear" class="normalbutton mr-2">Reset</b-button>
-    <b-button variant="success" @click="apply" class="normalbutton">Apply</b-button>
+    <b-button variant="danger" @click="clear" class="normalbutton mr-2">{{ $t("report.tag-filter.reset" )}}</b-button>
+    <b-button variant="success" @click="apply" class="normalbutton">{{ $t("report.tag-filter.apply" )}}</b-button>
 
 
-    <b-button variant="secondary" @click="save_ad_hoc_report" class="normalbutton float-right">🌟 Save as new report
+    <b-button variant="secondary" @click="save_ad_hoc_report" class="normalbutton float-right">🌟 {{ $t("report.tag-filter.save-as-new-report" )}}
     </b-button>
 
     <server-response :response="server_response" class="mt-2"></server-response>
@@ -158,15 +158,3 @@ export default {
   ...mapState(['report_ids', 'tags']),
 }
 </script>
-<i18n>
-{
-  "en": {
-    "tag_explanation": "This report supports labels. Labels can be used to filter the data in the report and create new sub-reports based on the selected tags. Filtering happens directly on the database, so this may take a while before it's rendered. Selecting multiple tags means that they are all applied per domain.",
-    "filter_by_tag": "-- filter by label"
-  },
-  "nl": {
-    "tag_explanation": "Dit rapport ondersteund label, hierop kan worden gefilterd. Dit gebeurd direct op de database, daardoor kan het even duren voordat het filter is toegepast. Meerdere labels selecteren betekent dat deze per domein allemaal worden gebruikt.",
-    "filter_by_tag": "-- filter op label"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/SharedReport.vue b/src/components/reports/SharedReport.vue
index f7c998a..259352d 100644
--- a/src/components/reports/SharedReport.vue
+++ b/src/components/reports/SharedReport.vue
@@ -3,8 +3,8 @@
   <div id="report-template">
 
     <content-block class="do-not-print">
-        <h1>{{ $t("title") }}</h1>
-        <p>{{ $t("intro") }}</p>
+        <h1>{{ $t("report.shared-report.title") }}</h1>
+        <p>{{ $t("report.shared-report.intro") }}</p>
     </content-block>
 
     <content-block v-if="reports_to_load > 0">
@@ -12,9 +12,9 @@
     </content-block>
 
     <content-block v-if="reports.length === 0 && reports_to_load === 0">
-      <h2>{{$t("not_found.title")}}</h2>
+      <h2>{{$t("report.shared-report.not_found.title")}}</h2>
       <b-alert variant="danger" show >
-        {{$t("not_found.content")}}
+        {{$t("report.shared-report.not_found.content")}}
       </b-alert>
     </content-block>
 
@@ -92,23 +92,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "title": "Shared Report",
-    "intro": " ",
-    "not_found": {
-      "title": "Report could not be found",
-      "content": "Could not find this public report. It may have been revoked, deleted or the share code has changed. Please check your input and try again."
-    }
-  },
-  "nl": {
-    "title": "Gedeeld Rapport",
-    "intro": " ",
-    "not_found": {
-      "title": "Rapport is niet gevonden",
-      "content": "Het opgevraagde rapport kon niet worden gevonden. Het kan zijn dat deze niet meer publiek is omdat deze is verwijderd of niet meer publiek staat. Controleer je invoer en probeer opnieuw."
-    }
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/SharingConfiguration.vue b/src/components/reports/SharingConfiguration.vue
index b474f90..ee3be47 100644
--- a/src/components/reports/SharingConfiguration.vue
+++ b/src/components/reports/SharingConfiguration.vue
@@ -1,7 +1,7 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <template>
   <content-block class="do-not-print" v-if="report !== undefined">
-    <collapse-panel :title='`${$t("title", [report.id, sharing_status(report["is_publicly_shared"])])} `'
+    <collapse-panel :title='`${$t("report.sharing_configuration.title", [report.id, sharing_status(report["is_publicly_shared"])])} `'
                     class="do-not-print">
       <div slot="content">
         <template v-if="report['is_publicly_shared']">
@@ -10,7 +10,7 @@
               <p>
 
                 <b-form-group
-                    :label='$t("shared_at_url")'
+                    :label='$t("report.sharing_configuration.shared_at_url")'
                     label-for="share-code"
                     class="mb-0"
                 >
@@ -29,7 +29,7 @@
                       <b-input-group-text>
                         <router-link :to="{ name: 'shared_report', params: { report: report['public_report_code']}}"
                                      target="_blank">
-                          {{ $t("open") }}
+                          {{ $t("report.sharing_configuration.open") }}
                         </router-link>
                       </b-input-group-text>
                     </template>
@@ -37,24 +37,24 @@
                   </b-input-group>
                 </b-form-group>
                 <template v-if='report["public_share_code"]'>
-                  <span class="small text-secondary font-italic">{{ $t("with_password") }}: {{ report["public_share_code"] }}</span>
+                  <span class="small text-secondary font-italic">{{ $t("report.sharing_configuration.with_password") }}: {{ report["public_share_code"] }}</span>
                 </template>
                 <template v-else>
-                  <span class="small text-secondary font-italic">{{ $t("without_password") }}</span>
+                  <span class="small text-secondary font-italic">{{ $t("report.sharing_configuration.without_password") }}</span>
                 </template>
                 <br>
                 <br>
-                <button size="lg" @click="update_report_code">🔁 {{ $t("change_link") }}</button> &nbsp;
-                <button size="lg" @click="unshare">🔴 {{ $t("stop_sharing") }}</button>
+                <button size="lg" @click="update_report_code">🔁 {{ $t("report.sharing_configuration.change_link") }}</button> &nbsp;
+                <button size="lg" @click="unshare">🔴 {{ $t("report.sharing_configuration.stop_sharing") }}</button>
               </p>
             </b-col>
             <b-col>
 
               <p>
                 <b-form-group
-                    :label='$t("configure_password")'
+                    :label='$t("report.sharing_configuration.configure_password")'
                     label-for="share-code"
-                    :description='$t("password_description")'
+                    :description='$t("report.sharing_configuration.password_description")'
                     class="mb-0"
                 >
                   <b-form-input
@@ -65,8 +65,8 @@
                 </b-form-group>
                 <br>
 
-                <button @click="update_share_code">{{ $t("set_password") }}</button> &nbsp;
-                <button @click="remove_share_code" v-if="report['public_share_code']">{{ $t("remove_password") }}
+                <button @click="update_share_code">{{ $t("report.sharing_configuration.set_password") }}</button> &nbsp;
+                <button @click="remove_share_code" v-if="report['public_share_code']">{{ $t("report.sharing_configuration.remove_password") }}
                 </button>
               </p>
             </b-col>
@@ -79,8 +79,8 @@
 
           <b-row>
             <b-col class="w-50">
-              <button variant="warning" @click="share" class="mb-4">🟢 {{ $t("share_to_anyone_with_url") }} {{
-                  report['public_share_code'] ? $t("and_password") : ''
+              <button variant="warning" @click="share" class="mb-4">🟢 {{ $t("report.sharing_configuration.share_to_anyone_with_url") }} {{
+                  report['public_share_code'] ? $t("report.sharing_configuration.and_password") : ''
                 }}
               </button>
 
@@ -90,9 +90,9 @@
 
 
               <b-form-group
-                  :label='$t("configure_password")'
+                  :label='$t("report.sharing_configuration.configure_password")'
                   label-for="share-code"
-                  :description='$t("password_description")'
+                  :description='$t("report.sharing_configuration.password_description")'
                   class=""
               >
                 <b-form-input
@@ -108,7 +108,7 @@
           </b-row>
         </template>
         <loading :loading="loading"/>
-        <server-response :response="response" v-if="response" :message="$t(response.message)"></server-response>
+        <server-response :response="response" v-if="response" :message="$t('report.sharing_configuration.' + response.message)"></server-response>
       </div>
     </collapse-panel>
   </content-block>
@@ -184,53 +184,3 @@ export default {
   }
 }
 </script>
-<i18n>
-{
-  "en": {
-    "title": "{1} - Change sharing options of report #{0}",
-    "shared": "Shared",
-    "not_shared": "Not Shared",
-    "intro": "Sharing options for this report:",
-    "shared_at_url": "The report is shared on the following url",
-    "with_password": "with the password set to",
-    "without_password": "without a password.",
-    "change_link": "New link",
-    "stop_sharing": "Stop Sharing",
-    "share_to_anyone_with_url": "Share report to anyone with the url",
-    "and_password": " and password",
-    "configure_password": "Configure password (optional)",
-    "password_description": "When entered, the viewer of a report has to enter this password.",
-    "set_password": "Set password",
-    "remove_password": "Remove password",
-    "open": "open",
-    "response_no_report_found": "Could not find report.",
-    "response_shared": "Report shared",
-    "response_unshared": "Stopped sharing report",
-    "response_updated_share_code": "Password updated",
-    "response_updated_report_code": "Report link updated"
-  },
-  "nl": {
-    "title": "{1} - Delen van rapport #{0} instellen",
-    "shared": "Gedeeld",
-    "not_shared": "Niet gedeeld",
-    "intro": "Deelopties voor dit rapport:",
-    "shared_at_url": "Rapport gedeeld op de volgende link",
-    "with_password": "met het wachtwoord ",
-    "without_password": "zonder wachtwoord.",
-    "change_link": "Nieuwe link",
-    "stop_sharing": "Stop delen",
-    "share_to_anyone_with_url": "Deel voor iedereen met de link ",
-    "and_password": " en het wachtwoord",
-    "configure_password": "Wachtwoord instellen (optioneel)",
-    "password_description": "Wanneer ingesteld moet de bezoeker ook een wachtwoord ingeven.",
-    "set_password": "Wachtwoord instellen",
-    "remove_password": "Wachtwoord verwijderen",
-    "open": "open",
-    "response_no_report_found": "Rapport kon niet worden gevonden.",
-    "response_shared": "Rapport is nu gedeeld",
-    "response_unshared": "Rapport wordt niet meer gedeeld",
-    "response_updated_share_code": "Wachtwoord aangepast",
-    "response_updated_report_code": "Rapport link aangepast"
-  }
-}
-</i18n>
\ No newline at end of file
diff --git a/src/components/reports/report_mixin.vue b/src/components/reports/report_mixin.vue
index e0350fc..320ffcf 100644
--- a/src/components/reports/report_mixin.vue
+++ b/src/components/reports/report_mixin.vue
@@ -5,14 +5,9 @@
 // Done: store filter options for reports (as generic or per report? or as a re-applicable set?) Per user account.
 // Done: how to add a item for legacy views?
 // Done: how to translate graphs?
-import field_translations from '../FieldTranslations'
 import http from "@/httpclient"
 
 export default {
-  i18n: {
-    sharedMessages: field_translations,
-  },
-
   methods: {
     alphabet_sorting: function (a, b) {
       // i already mis sorted()
@@ -558,7 +553,7 @@ export default {
                 {
                   name: 'Status Fields',
                   key: 'category_web_forum_standardisation_status_fields',
-                  label: this.$i18n.t("metric.fields.forum_standardistation.status_fields.title"),
+                  label: this.$i18n.t("metric.internet_nl_legacy.status_fields.title"),
                   fields: [
                     {
                       name: 'internet_nl_web_legacy_tls_1_3',
@@ -846,7 +841,7 @@ export default {
                 {
                   name: 'Status Fields',
                   key: 'category_web_forum_standardisation_status_fields',
-                  label: this.$i18n.t("metric.fields.forum_standardistation.status_fields"),
+                  label: this.$i18n.t("metric.internet_nl_legacy.status_fields.title"),
                   fields: [
                     {
                       name: 'internet_nl_mail_legacy_tls_1_3',
diff --git a/src/locales/dashboard-frontend.babel b/src/locales/dashboard-frontend.babel
index 77a2f16..1cefea4 100644
--- a/src/locales/dashboard-frontend.babel
+++ b/src/locales/dashboard-frontend.babel
@@ -2775,6 +2775,57 @@
 									</concept_node>
 								</children>
 							</folder_node>
+							<folder_node>
+								<name>scan-type</name>
+								<children>
+									<concept_node>
+										<name>mail</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>web</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
 							<folder_node>
 								<name>server-response</name>
 								<children>
@@ -3925,130 +3976,10 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>edit</name>
+								<name>edit-domain</name>
 								<children>
-									<folder_node>
-										<name>button_labels</name>
-										<children>
-											<concept_node>
-												<name>cancel</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>remove</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>save</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-									<concept_node>
-										<name>cancel_editing_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>delete_edited_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
 									<concept_node>
-										<name>eligeble_mail</name>
+										<name>cancel</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -4071,7 +4002,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>save_edited_url</name>
+										<name>remove</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -4094,7 +4025,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>start_editing_url</name>
+										<name>save</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -4119,13 +4050,13 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>edit-domain</name>
+								<name>list</name>
 								<children>
 									<folder_node>
-										<name>button_labels</name>
+										<name>add-domains</name>
 										<children>
 											<concept_node>
-												<name>cancel</name>
+												<name>a_lot_of_new_domains_message</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -4148,7 +4079,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>remove</name>
+												<name>add_domains_list_does_not_exist</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -4171,316 +4102,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>save</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-									<concept_node>
-										<name>cancel_editing_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>delete_edited_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>eligeble_mail</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>eligeble_web</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>not_eligeble_mail</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>not_eligeble_web</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>save_edited_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>start_editing_url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>unknown_eligeble_mail</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>unknown_eligeble_web</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>list</name>
-								<children>
-									<folder_node>
-										<name>add-domains</name>
-										<children>
-											<concept_node>
-												<name>a_lot_of_new_domains_message</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>add_domains_list_does_not_exist</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>add_domains_valid_urls_added</name>
+												<name>add_domains_valid_urls_added</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -9553,37 +9175,70 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>internet_nl_mail_auth_dkim_exist</name>
+								<name>internet_nl_legacy</name>
 								<children>
-									<concept_node>
-										<name>explanation</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>extended-explanation</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
+									<folder_node>
+										<name>status_fields</name>
+										<children>
+											<concept_node>
+												<name>title</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+										</children>
+									</folder_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>internet_nl_mail_auth_dkim_exist</name>
+								<children>
+									<concept_node>
+										<name>explanation</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>extended-explanation</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
 												<language>de-DE</language>
 												<approved>false</approved>
 											</translation>
@@ -20062,16 +19717,11 @@
 									</concept_node>
 								</children>
 							</folder_node>
-						</children>
-					</folder_node>
-					<folder_node>
-						<name>public_reports</name>
-						<children>
 							<folder_node>
-								<name>components/home/PublicReports.vue</name>
+								<name>legend</name>
 								<children>
 									<concept_node>
-										<name>Contains</name>
+										<name>subtest_bad</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20094,7 +19744,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains</name>
+										<name>subtest_good</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20117,7 +19767,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>introduction</name>
+										<name>subtest_info</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20140,7 +19790,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Name</name>
+										<name>subtest_title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20163,7 +19813,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Public reports</name>
+										<name>subtest_warning</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20186,7 +19836,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Published</name>
+										<name>test_bad</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20209,7 +19859,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Score</name>
+										<name>test_good</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20232,7 +19882,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View</name>
+										<name>test_info</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20255,7 +19905,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View report</name>
+										<name>test_title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20277,13 +19927,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/home/PublicReportsPerAccount.vue</name>
-								<children>
 									<concept_node>
-										<name>all</name>
+										<name>test_warning</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20305,8 +19950,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>rating</name>
+								<children>
 									<concept_node>
-										<name>Contains</name>
+										<name>pct_error_in_test</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20329,7 +19979,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains</name>
+										<name>pct_high</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20352,7 +20002,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Name</name>
+										<name>pct_low</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20375,7 +20025,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Published</name>
+										<name>pct_medium</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20398,7 +20048,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Recently published reports</name>
+										<name>pct_not_applicable</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20421,7 +20071,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>scan_frequency</name>
+										<name>pct_not_testable</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20444,7 +20094,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>scan_type</name>
+										<name>pct_ok</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20466,8 +20116,18 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+						</children>
+					</folder_node>
+					<folder_node>
+						<name>public-reports</name>
+						<children>
+							<folder_node>
+								<name>page</name>
+								<children>
 									<concept_node>
-										<name>Score</name>
+										<name>introduction</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20490,7 +20150,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View</name>
+										<name>Public reports</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20512,8 +20172,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>per-account</name>
+								<children>
 									<concept_node>
-										<name>View latest mail report</name>
+										<name>all</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20536,7 +20201,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View latest report</name>
+										<name>Recently published reports</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20559,7 +20224,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View latest web report</name>
+										<name>scan_frequency</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20582,7 +20247,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View report</name>
+										<name>scan_type</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20604,13 +20269,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/home/PublicReportsTable.vue</name>
-								<children>
 									<concept_node>
-										<name>Contains</name>
+										<name>View latest mail report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20633,7 +20293,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains</name>
+										<name>View latest report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20656,7 +20316,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>introduction</name>
+										<name>View latest web report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20678,8 +20338,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>table</name>
+								<children>
 									<concept_node>
-										<name>Name</name>
+										<name>Contains</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20702,7 +20367,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Published</name>
+										<name>domains</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20725,7 +20390,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Recently published reports</name>
+										<name>Name</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20748,7 +20413,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>Score</name>
+										<name>Published</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20771,7 +20436,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>View</name>
+										<name>Score</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20793,8 +20458,18 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+						</children>
+					</folder_node>
+					<folder_node>
+						<name>report</name>
+						<children>
+							<folder_node>
+								<name>applied-tags</name>
+								<children>
 									<concept_node>
-										<name>View report</name>
+										<name>info</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20818,16 +20493,11 @@
 									</concept_node>
 								</children>
 							</folder_node>
-						</children>
-					</folder_node>
-					<folder_node>
-						<name>report</name>
-						<children>
 							<folder_node>
-								<name>components/reports/AppliedTags.vue</name>
+								<name>differences</name>
 								<children>
 									<concept_node>
-										<name>info</name>
+										<name>both_list_contain_n_urls</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20849,13 +20519,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/DifferencesToCurrentList.vue</name>
-								<children>
 									<concept_node>
-										<name>both_list_contain_n_urls</name>
+										<name>equal</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20878,7 +20543,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>equal</name>
+										<name>in_report_but_not_in_urllist</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20901,7 +20566,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>in_report_but_not_in_urllist</name>
+										<name>in_urllist_but_not_in_report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20924,7 +20589,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>in_urllist_but_not_in_report</name>
+										<name>not_equal</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20947,7 +20612,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>not_equal</name>
+										<name>report_contains_n_urllist_contains_n</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20970,7 +20635,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>report_contains_n_urllist_contains_n</name>
+										<name>retrieving_differences</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -20992,8 +20657,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>download</name>
+								<children>
 									<concept_node>
-										<name>retrieving_differences</name>
+										<name>csv</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21015,13 +20685,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/NestedReportCharts.vue</name>
-								<children>
 									<concept_node>
-										<name>A</name>
+										<name>ods</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21044,7 +20709,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>category</name>
+										<name>title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21067,7 +20732,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>G</name>
+										<name>xlsx</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21092,10 +20757,10 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>components/reports/Report.vue</name>
+								<name>header</name>
 								<children>
 									<concept_node>
-										<name>intro</name>
+										<name>compared_to</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21118,7 +20783,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>patience</name>
+										<name>data_from</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21141,7 +20806,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>settings</name>
+										<name>number_of_domains</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21164,7 +20829,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>tab_changes</name>
+										<name>only_graphs</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21187,7 +20852,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>tab_graphs</name>
+										<name>type_of_scan_performed</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21209,8 +20874,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>improvement-regressions</name>
+								<children>
 									<concept_node>
-										<name>tab_metrics</name>
+										<name>days_ago</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21233,193 +20903,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>title</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportCharts.vue</name>
-								<children>
-									<folder_node>
-										<name>adoption_bar_chart</name>
-										<children>
-											<concept_node>
-												<name>intro</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>title</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-									<folder_node>
-										<name>adoption_circle_chart</name>
-										<children>
-											<concept_node>
-												<name>title</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-									<folder_node>
-										<name>cumulative_adoption_bar_chart</name>
-										<children>
-											<concept_node>
-												<name>intro</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>title</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-									<concept_node>
-										<name>how_charts_work</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportDownload.vue</name>
-								<children>
-									<concept_node>
-										<name>csv</name>
+										<name>domains_exclusive_current</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21442,53 +20926,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>intro</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>ods</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>title</name>
+										<name>domains_exclusive_other</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21511,7 +20949,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>xlsx</name>
+										<name>domains_with_improvements</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21533,13 +20971,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportHeader.vue</name>
-								<children>
 									<concept_node>
-										<name>compared_to</name>
+										<name>domains_with_regressions</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21562,7 +20995,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>data_from</name>
+										<name>improvement</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21585,7 +21018,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>number_of_domains</name>
+										<name>metrics</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21608,7 +21041,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>only_graphs</name>
+										<name>neutral</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21631,7 +21064,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>type_of_scan_performed</name>
+										<name>no_changes</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21653,13 +21086,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportImprovementAndRegressions.vue</name>
-								<children>
 									<concept_node>
-										<name>days_ago</name>
+										<name>regression</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21682,7 +21110,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains_exclusive_current</name>
+										<name>score_from</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21705,7 +21133,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains_exclusive_other</name>
+										<name>score_to</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21728,7 +21156,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains_with_improvements</name>
+										<name>title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21751,7 +21179,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>domains_with_regressions</name>
+										<name>url</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21773,6 +21201,11 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>improvement-regressions-table</name>
+								<children>
 									<concept_node>
 										<name>improvement</name>
 										<description/>
@@ -21820,30 +21253,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>neutral</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>no_changes</name>
+										<name>regression</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21866,7 +21276,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>regression</name>
+										<name>score_from</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21889,7 +21299,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>score_from</name>
+										<name>score_to</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -21912,482 +21322,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>score_to</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>title</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportImprovementAndRegressionsTable.vue</name>
-								<children>
-									<concept_node>
-										<name>improvement</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>metrics</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>regression</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>score_from</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>score_to</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>url</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportPasswords.vue</name>
-								<children>
-									<concept_node>
-										<name>Authentication required</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>code</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>created_on</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>name</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>No password needed</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>Retry with above settings</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>Some reports require authentication</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>Stored password is valid</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>supply_password</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportSelection.vue</name>
-								<children>
-									<concept_node>
-										<name>no_options</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>reload_list</name>
-										<description/>
-										<comment/>
-										<translations>
-											<translation>
-												<language>de-DE</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>en-US</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>fr-FR</language>
-												<approved>false</approved>
-											</translation>
-											<translation>
-												<language>nl-NL</language>
-												<approved>false</approved>
-											</translation>
-										</translations>
-									</concept_node>
-									<concept_node>
-										<name>select_report</name>
+										<name>url</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -22412,7 +21347,7 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>components/reports/ReportTableLegend.vue</name>
+								<name>legend</name>
 								<children>
 									<folder_node>
 										<name>icon_legend</name>
@@ -22846,10 +21781,227 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>components/reports/ReportTableVirtualList.vue</name>
+								<name>nested-report-charts</name>
+								<children>
+									<concept_node>
+										<name>A</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>category</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>G</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>page</name>
+								<children>
+									<concept_node>
+										<name>intro</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>patience</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>tab_changes</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>tab_graphs</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>tab_metrics</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>title</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>password-protection</name>
 								<children>
 									<concept_node>
-										<name>domain</name>
+										<name>Authentication required</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -22871,80 +22023,200 @@
 											</translation>
 										</translations>
 									</concept_node>
-									<folder_node>
-										<name>icon_legend</name>
-										<children>
-											<concept_node>
-												<name>category_error_in_test</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>subtest_error_in_test</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>subtest_not_applicable</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
+									<concept_node>
+										<name>code</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>created_on</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>name</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>No password needed</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>Retry with above settings</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>Some reports require authentication</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>Stored password is valid</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>supply_password</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>report-charts</name>
+								<children>
+									<folder_node>
+										<name>adoption_bar_chart</name>
+										<children>
 											<concept_node>
-												<name>subtest_not_tested</name>
+												<name>intro</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -22992,10 +22264,10 @@
 										</children>
 									</folder_node>
 									<folder_node>
-										<name>icons</name>
+										<name>adoption_circle_chart</name>
 										<children>
 											<concept_node>
-												<name>remove_filter</name>
+												<name>title</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23020,31 +22292,8 @@
 										</children>
 									</folder_node>
 									<folder_node>
-										<name>report</name>
+										<name>cumulative_adoption_bar_chart</name>
 										<children>
-											<concept_node>
-												<name>empty_report</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
 											<concept_node>
 												<name>intro</name>
 												<description/>
@@ -23091,158 +22340,15 @@
 													</translation>
 												</translations>
 											</concept_node>
-											<concept_node>
-												<name>url_filter</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<folder_node>
-												<name>zoom</name>
-												<children>
-													<folder_node>
-														<name>buttons</name>
-														<children>
-															<concept_node>
-																<name>remove_zoom</name>
-																<description/>
-																<comment/>
-																<translations>
-																	<translation>
-																		<language>de-DE</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>en-US</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>fr-FR</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>nl-NL</language>
-																		<approved>false</approved>
-																	</translation>
-																</translations>
-															</concept_node>
-															<concept_node>
-																<name>zoom</name>
-																<description/>
-																<comment/>
-																<translations>
-																	<translation>
-																		<language>de-DE</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>en-US</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>fr-FR</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>nl-NL</language>
-																		<approved>false</approved>
-																	</translation>
-																</translations>
-															</concept_node>
-															<concept_node>
-																<name>zoom_in_on</name>
-																<description/>
-																<comment/>
-																<translations>
-																	<translation>
-																		<language>de-DE</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>en-US</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>fr-FR</language>
-																		<approved>false</approved>
-																	</translation>
-																	<translation>
-																		<language>nl-NL</language>
-																		<approved>false</approved>
-																	</translation>
-																</translations>
-															</concept_node>
-														</children>
-													</folder_node>
-													<concept_node>
-														<name>explanation</name>
-														<description/>
-														<comment/>
-														<translations>
-															<translation>
-																<language>de-DE</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>en-US</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>fr-FR</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>nl-NL</language>
-																<approved>false</approved>
-															</translation>
-														</translations>
-													</concept_node>
-													<concept_node>
-														<name>zoomed_in_on</name>
-														<description/>
-														<comment/>
-														<translations>
-															<translation>
-																<language>de-DE</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>en-US</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>fr-FR</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>nl-NL</language>
-																<approved>false</approved>
-															</translation>
-														</translations>
-													</concept_node>
-												</children>
-											</folder_node>
 										</children>
 									</folder_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>report-selection</name>
+								<children>
 									<concept_node>
-										<name>score</name>
+										<name>no_options</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23264,13 +22370,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/ReportTableVirtualListRecord.vue</name>
-								<children>
 									<concept_node>
-										<name>evidence</name>
+										<name>reload_list</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23293,7 +22394,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>link_to_report</name>
+										<name>select_report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23315,8 +22416,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>report-table-virtual-list</name>
+								<children>
 									<concept_node>
-										<name>not_eligeble_for_scanning</name>
+										<name>domain</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23339,10 +22445,33 @@
 										</translations>
 									</concept_node>
 									<folder_node>
-										<name>results</name>
+										<name>icon_legend</name>
 										<children>
 											<concept_node>
-												<name>category_error_in_test</name>
+												<name>category_error_in_test</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>subtest_error_in_test</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23364,82 +22493,8 @@
 													</translation>
 												</translations>
 											</concept_node>
-											<folder_node>
-												<name>comparison</name>
-												<children>
-													<concept_node>
-														<name>improved</name>
-														<description/>
-														<comment/>
-														<translations>
-															<translation>
-																<language>de-DE</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>en-US</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>fr-FR</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>nl-NL</language>
-																<approved>false</approved>
-															</translation>
-														</translations>
-													</concept_node>
-													<concept_node>
-														<name>neutral</name>
-														<description/>
-														<comment/>
-														<translations>
-															<translation>
-																<language>de-DE</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>en-US</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>fr-FR</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>nl-NL</language>
-																<approved>false</approved>
-															</translation>
-														</translations>
-													</concept_node>
-													<concept_node>
-														<name>regressed</name>
-														<description/>
-														<comment/>
-														<translations>
-															<translation>
-																<language>de-DE</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>en-US</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>fr-FR</language>
-																<approved>false</approved>
-															</translation>
-															<translation>
-																<language>nl-NL</language>
-																<approved>false</approved>
-															</translation>
-														</translations>
-													</concept_node>
-												</children>
-											</folder_node>
 											<concept_node>
-												<name>error</name>
+												<name>subtest_not_applicable</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23462,7 +22517,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>error_in_test</name>
+												<name>subtest_not_tested</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23485,7 +22540,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>failed</name>
+												<name>title</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23507,8 +22562,13 @@
 													</translation>
 												</translations>
 											</concept_node>
+										</children>
+									</folder_node>
+									<folder_node>
+										<name>icons</name>
+										<children>
 											<concept_node>
-												<name>info</name>
+												<name>remove_filter</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23530,8 +22590,13 @@
 													</translation>
 												</translations>
 											</concept_node>
+										</children>
+									</folder_node>
+									<folder_node>
+										<name>report</name>
+										<children>
 											<concept_node>
-												<name>not_applicable</name>
+												<name>empty_report</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23554,7 +22619,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>not_testable</name>
+												<name>intro</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23577,7 +22642,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>not_tested</name>
+												<name>title</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23600,7 +22665,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>passed</name>
+												<name>url_filter</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23622,8 +22687,189 @@
 													</translation>
 												</translations>
 											</concept_node>
+											<folder_node>
+												<name>zoom</name>
+												<children>
+													<folder_node>
+														<name>buttons</name>
+														<children>
+															<concept_node>
+																<name>remove_zoom</name>
+																<description/>
+																<comment/>
+																<translations>
+																	<translation>
+																		<language>de-DE</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>en-US</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>fr-FR</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>nl-NL</language>
+																		<approved>false</approved>
+																	</translation>
+																</translations>
+															</concept_node>
+															<concept_node>
+																<name>zoom</name>
+																<description/>
+																<comment/>
+																<translations>
+																	<translation>
+																		<language>de-DE</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>en-US</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>fr-FR</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>nl-NL</language>
+																		<approved>false</approved>
+																	</translation>
+																</translations>
+															</concept_node>
+															<concept_node>
+																<name>zoom_in_on</name>
+																<description/>
+																<comment/>
+																<translations>
+																	<translation>
+																		<language>de-DE</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>en-US</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>fr-FR</language>
+																		<approved>false</approved>
+																	</translation>
+																	<translation>
+																		<language>nl-NL</language>
+																		<approved>false</approved>
+																	</translation>
+																</translations>
+															</concept_node>
+														</children>
+													</folder_node>
+													<concept_node>
+														<name>explanation</name>
+														<description/>
+														<comment/>
+														<translations>
+															<translation>
+																<language>de-DE</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>en-US</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>fr-FR</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>nl-NL</language>
+																<approved>false</approved>
+															</translation>
+														</translations>
+													</concept_node>
+													<concept_node>
+														<name>zoomed_in_on</name>
+														<description/>
+														<comment/>
+														<translations>
+															<translation>
+																<language>de-DE</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>en-US</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>fr-FR</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>nl-NL</language>
+																<approved>false</approved>
+															</translation>
+														</translations>
+													</concept_node>
+												</children>
+											</folder_node>
+										</children>
+									</folder_node>
+									<concept_node>
+										<name>score</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>shared-report</name>
+								<children>
+									<concept_node>
+										<name>intro</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<folder_node>
+										<name>not_found</name>
+										<children>
 											<concept_node>
-												<name>unknown</name>
+												<name>content</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23646,7 +22892,7 @@
 												</translations>
 											</concept_node>
 											<concept_node>
-												<name>warning</name>
+												<name>title</name>
 												<description/>
 												<comment/>
 												<translations>
@@ -23671,7 +22917,7 @@
 										</children>
 									</folder_node>
 									<concept_node>
-										<name>since</name>
+										<name>title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23696,10 +22942,10 @@
 								</children>
 							</folder_node>
 							<folder_node>
-								<name>components/reports/ReportTagFilter.vue</name>
+								<name>sharing_configuration</name>
 								<children>
 									<concept_node>
-										<name>filter_by_tag</name>
+										<name>and_password</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23722,7 +22968,30 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>tag_explanation</name>
+										<name>change_link</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>configure_password</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23744,11 +23013,6 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/SharedReport.vue</name>
-								<children>
 									<concept_node>
 										<name>intro</name>
 										<description/>
@@ -23772,59 +23036,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-									<folder_node>
-										<name>not_found</name>
-										<children>
-											<concept_node>
-												<name>content</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>title</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
 									<concept_node>
-										<name>title</name>
+										<name>not_shared</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23846,13 +23059,8 @@
 											</translation>
 										</translations>
 									</concept_node>
-								</children>
-							</folder_node>
-							<folder_node>
-								<name>components/reports/SharingConfiguration.vue</name>
-								<children>
 									<concept_node>
-										<name>and_password</name>
+										<name>open</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23875,7 +23083,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>change_link</name>
+										<name>password_description</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23898,7 +23106,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>configure_password</name>
+										<name>remove_password</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23921,7 +23129,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>intro</name>
+										<name>response_no_report_found</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23944,7 +23152,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>not_shared</name>
+										<name>response_shared</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23967,7 +23175,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>open</name>
+										<name>response_unshared</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -23990,7 +23198,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>password_description</name>
+										<name>response_updated_report_code</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24013,7 +23221,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>remove_password</name>
+										<name>response_updated_share_code</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24036,7 +23244,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>response_no_report_found</name>
+										<name>set_password</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24059,7 +23267,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>response_shared</name>
+										<name>share_to_anyone_with_url</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24082,7 +23290,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>response_unshared</name>
+										<name>shared</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24105,7 +23313,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>response_updated_report_code</name>
+										<name>shared_at_url</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24128,7 +23336,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>response_updated_share_code</name>
+										<name>stop_sharing</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24151,7 +23359,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>set_password</name>
+										<name>title</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24174,7 +23382,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>share_to_anyone_with_url</name>
+										<name>with_password</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24197,7 +23405,35 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>shared</name>
+										<name>without_password</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>tag-filter</name>
+								<children>
+									<concept_node>
+										<name>apply</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24220,7 +23456,76 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>shared_at_url</name>
+										<name>filter_by_tag</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>reset</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>save-as-new-report</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>de-DE</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>nl-NL</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
+									<concept_node>
+										<name>tag_explanation</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24242,8 +23547,13 @@
 											</translation>
 										</translations>
 									</concept_node>
+								</children>
+							</folder_node>
+							<folder_node>
+								<name>virtual-list-record</name>
+								<children>
 									<concept_node>
-										<name>stop_sharing</name>
+										<name>evidence</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24266,7 +23576,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>title</name>
+										<name>link_to_report</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24289,7 +23599,7 @@
 										</translations>
 									</concept_node>
 									<concept_node>
-										<name>with_password</name>
+										<name>not_eligeble_for_scanning</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -24311,8 +23621,340 @@
 											</translation>
 										</translations>
 									</concept_node>
+									<folder_node>
+										<name>results</name>
+										<children>
+											<concept_node>
+												<name>category_error_in_test</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<folder_node>
+												<name>comparison</name>
+												<children>
+													<concept_node>
+														<name>improved</name>
+														<description/>
+														<comment/>
+														<translations>
+															<translation>
+																<language>de-DE</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>en-US</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>fr-FR</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>nl-NL</language>
+																<approved>false</approved>
+															</translation>
+														</translations>
+													</concept_node>
+													<concept_node>
+														<name>neutral</name>
+														<description/>
+														<comment/>
+														<translations>
+															<translation>
+																<language>de-DE</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>en-US</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>fr-FR</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>nl-NL</language>
+																<approved>false</approved>
+															</translation>
+														</translations>
+													</concept_node>
+													<concept_node>
+														<name>regressed</name>
+														<description/>
+														<comment/>
+														<translations>
+															<translation>
+																<language>de-DE</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>en-US</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>fr-FR</language>
+																<approved>false</approved>
+															</translation>
+															<translation>
+																<language>nl-NL</language>
+																<approved>false</approved>
+															</translation>
+														</translations>
+													</concept_node>
+												</children>
+											</folder_node>
+											<concept_node>
+												<name>error</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>error_in_test</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>failed</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>info</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>not_applicable</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>not_testable</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>not_tested</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>passed</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>unknown</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+											<concept_node>
+												<name>warning</name>
+												<description/>
+												<comment/>
+												<translations>
+													<translation>
+														<language>de-DE</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>en-US</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>fr-FR</language>
+														<approved>false</approved>
+													</translation>
+													<translation>
+														<language>nl-NL</language>
+														<approved>false</approved>
+													</translation>
+												</translations>
+											</concept_node>
+										</children>
+									</folder_node>
 									<concept_node>
-										<name>without_password</name>
+										<name>since</name>
 										<description/>
 										<comment/>
 										<translations>
@@ -27771,182 +27413,6 @@
 							</folder_node>
 						</children>
 					</folder_node>
-					<folder_node>
-						<name>test</name>
-						<children>
-							<folder_node>
-								<name>result</name>
-								<children>
-									<folder_node>
-										<name>percentage</name>
-										<children>
-											<concept_node>
-												<name>error_in_test</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>high</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>low</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>medium</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>not_applicable</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>not_testable</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-											<concept_node>
-												<name>ok</name>
-												<description/>
-												<comment/>
-												<translations>
-													<translation>
-														<language>de-DE</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>en-US</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>fr-FR</language>
-														<approved>false</approved>
-													</translation>
-													<translation>
-														<language>nl-NL</language>
-														<approved>false</approved>
-													</translation>
-												</translations>
-											</concept_node>
-										</children>
-									</folder_node>
-								</children>
-							</folder_node>
-						</children>
-					</folder_node>
 					<folder_node>
 						<name>tour</name>
 						<children>
diff --git a/src/locales/de.json b/src/locales/de.json
index ffb9975..0746ea1 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -150,6 +150,10 @@
 			"usage_overview": "",
 			"web_metrics": ""
 		},
+		"scan-type": {
+			"mail": "",
+			"web": ""
+		},
 		"server-response": {
 			"at": "",
 			"error": "",
@@ -216,34 +220,10 @@
 			"title": "",
 			"will_be_added_to": ""
 		},
-		"edit": {
-			"button_labels": {
-				"cancel": "",
-				"remove": "",
-				"save": ""
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "",
-			"save_edited_url": "",
-			"start_editing_url": ""
-		},
 		"edit-domain": {
-			"button_labels": {
-				"cancel": "",
-				"remove": "",
-				"save": ""
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "",
-			"eligeble_web": "",
-			"not_eligeble_mail": "",
-			"not_eligeble_web": "",
-			"save_edited_url": "",
-			"start_editing_url": "",
-			"unknown_eligeble_mail": "",
-			"unknown_eligeble_web": ""
+			"cancel": "",
+			"remove": "",
+			"save": ""
 		},
 		"list": {
 			"add-domains": {
@@ -573,6 +553,11 @@
 		"category_web_tls_tls": {
 			"title": "TLS"
 		},
+		"internet_nl_legacy": {
+			"status_fields": {
+				"title": ""
+			}
+		},
 		"internet_nl_mail_auth_dkim_exist": {
 			"explanation": "E-Mails können eine digitale Signatur des Absenders enthalten, die vom Postdienstleister überprüft werden kann. Fehlt die Signatur oder ist sie falsch, kann dies als Versuch gewertet werden, eine gefälschte E-Mail zu versenden. Wenn jemand eine gefälschte E-Mail verschickt, kann der Postdienst eine Benachrichtigung an den wirklichen Besitzer der E-Mail-Adresse senden, da dieser möglicherweise etwas dagegen unternehmen möchte.",
 			"extended-explanation": "Wir prüfen, ob Ihre Domäne DKIM-Einträge unterstützt. Ein empfangender Mailserver kann den öffentlichen Schlüssel in Ihrem DKIM-Eintrag verwenden, um die Signatur in einer E-Mail mit einem Benutzer aus Ihrer Domäne als Absender zu validieren und ihre Authentizität zu bestimmen.</p><ul><li>Derzeit sind wir nicht in der Lage, den öffentlichen Schlüssel in Ihrem DKIM-Eintrag abzufragen und auszuwerten, da wir dazu den DKIM-Selektor benötigen (der in den von Ihnen gesendeten E-Mails enthalten sein sollte).</li><li>Um diesen Test zu bestehen, erwarten wir von Ihrem Nameserver die Antwort <code>NOERROR</code> auf unsere Anfrage nach<code>_domainkey.example.nl</code>. Wenn <code>_domainkey.example.nl</code> ein \"leeres Nicht-Terminal\" ist, antworten einige Nameserver, die nicht mit dem StandardRFC 2308 konform sind, fälschlicherweise mit <code>NXDOMAIN</code> anstelle von <code>NOERROR</code>. Dies macht es uns unmöglich, die Unterstützung für DKIM-Einträge zu erkennen.</li><li>Bei diesem Test gehen wir von einer \"strikten Ausrichtung\" aus, die mit DMARC konform ist. Die angegebene Domäne gilt als Absenderdomäne in der Mailkörperdomäne (<code>From:</code>) und diese muss mit der DKIM-Domäne (<code>d=</code>) und der SPF-Domäne (Absender des Briefumschlags, d.h. der Rückweg, der in <code>MAIL FROM</code>auftaucht) identisch sein.</li></ul><p>Für eine \"gute Praxis bei Domänen ohne Mail\" siehe die <a href=\"#control-panel-9\">Erläuterung des Untertests \"DMARC-Richtlinie\"</a>.",
@@ -1332,53 +1317,56 @@
 			},
 			"technology": "Transport Layer Security (TLS)",
 			"title": "Sichere Verbindung gemäß NCSC-NL-Anforderungen (HTTPS)"
+		},
+		"legend": {
+			"subtest_bad": "",
+			"subtest_good": "",
+			"subtest_info": "",
+			"subtest_title": "",
+			"subtest_warning": "",
+			"test_bad": "",
+			"test_good": "",
+			"test_info": "",
+			"test_title": "",
+			"test_warning": ""
+		},
+		"rating": {
+			"pct_error_in_test": "",
+			"pct_high": "",
+			"pct_low": "",
+			"pct_medium": "",
+			"pct_not_applicable": "",
+			"pct_not_testable": "",
+			"pct_ok": ""
 		}
 	},
-	"public_reports": {
-		"components/home/PublicReports.vue": {
-			"Contains": "",
-			"domains": "",
+	"public-reports": {
+		"page": {
 			"introduction": "",
-			"Name": "",
-			"Public reports": "",
-			"Published": "",
-			"Score": "",
-			"View": "",
-			"View report": ""
+			"Public reports": ""
 		},
-		"components/home/PublicReportsPerAccount.vue": {
+		"per-account": {
 			"all": "",
-			"Contains": "",
-			"domains": "",
-			"Name": "",
-			"Published": "",
 			"Recently published reports": "",
 			"scan_frequency": "",
 			"scan_type": "",
-			"Score": "",
-			"View": "",
 			"View latest mail report": "",
 			"View latest report": "",
-			"View latest web report": "",
-			"View report": ""
+			"View latest web report": ""
 		},
-		"components/home/PublicReportsTable.vue": {
+		"table": {
 			"Contains": "",
 			"domains": "",
-			"introduction": "",
 			"Name": "",
 			"Published": "",
-			"Recently published reports": "",
-			"Score": "",
-			"View": "",
-			"View report": ""
+			"Score": ""
 		}
 	},
 	"report": {
-		"components/reports/AppliedTags.vue": {
+		"applied-tags": {
 			"info": ""
 		},
-		"components/reports/DifferencesToCurrentList.vue": {
+		"differences": {
 			"both_list_contain_n_urls": "",
 			"equal": "",
 			"in_report_but_not_in_urllist": "",
@@ -1387,49 +1375,20 @@
 			"report_contains_n_urllist_contains_n": "",
 			"retrieving_differences": ""
 		},
-		"components/reports/NestedReportCharts.vue": {
-			"A": "",
-			"category": "",
-			"G": ""
-		},
-		"components/reports/Report.vue": {
-			"intro": "",
-			"patience": "",
-			"settings": "",
-			"tab_changes": "",
-			"tab_graphs": "",
-			"tab_metrics": "",
-			"title": ""
-		},
-		"components/reports/ReportCharts.vue": {
-			"adoption_bar_chart": {
-				"intro": "",
-				"title": ""
-			},
-			"adoption_circle_chart": {
-				"title": ""
-			},
-			"cumulative_adoption_bar_chart": {
-				"intro": "",
-				"title": ""
-			},
-			"how_charts_work": ""
-		},
-		"components/reports/ReportDownload.vue": {
+		"download": {
 			"csv": "",
-			"intro": "",
 			"ods": "",
 			"title": "",
 			"xlsx": ""
 		},
-		"components/reports/ReportHeader.vue": {
+		"header": {
 			"compared_to": "",
 			"data_from": "",
 			"number_of_domains": "",
 			"only_graphs": "",
 			"type_of_scan_performed": ""
 		},
-		"components/reports/ReportImprovementAndRegressions.vue": {
+		"improvement-regressions": {
 			"days_ago": "",
 			"domains_exclusive_current": "",
 			"domains_exclusive_other": "",
@@ -1445,7 +1404,7 @@
 			"title": "",
 			"url": ""
 		},
-		"components/reports/ReportImprovementAndRegressionsTable.vue": {
+		"improvement-regressions-table": {
 			"improvement": "",
 			"metrics": "",
 			"regression": "",
@@ -1453,23 +1412,7 @@
 			"score_to": "",
 			"url": ""
 		},
-		"components/reports/ReportPasswords.vue": {
-			"Authentication required": "",
-			"code": "",
-			"created_on": "",
-			"name": "",
-			"No password needed": "",
-			"Retry with above settings": "",
-			"Some reports require authentication": "",
-			"Stored password is valid": "",
-			"supply_password": ""
-		},
-		"components/reports/ReportSelection.vue": {
-			"no_options": "",
-			"reload_list": "",
-			"select_report": ""
-		},
-		"components/reports/ReportTableLegend.vue": {
+		"legend": {
 			"icon_legend": {
 				"category_error_in_test": "",
 				"subtest_error_in_test": "",
@@ -1495,7 +1438,49 @@
 				"warning": ""
 			}
 		},
-		"components/reports/ReportTableVirtualList.vue": {
+		"nested-report-charts": {
+			"A": "",
+			"category": "",
+			"G": ""
+		},
+		"page": {
+			"intro": "",
+			"patience": "",
+			"tab_changes": "",
+			"tab_graphs": "",
+			"tab_metrics": "",
+			"title": ""
+		},
+		"password-protection": {
+			"Authentication required": "",
+			"code": "",
+			"created_on": "",
+			"name": "",
+			"No password needed": "",
+			"Retry with above settings": "",
+			"Some reports require authentication": "",
+			"Stored password is valid": "",
+			"supply_password": ""
+		},
+		"report-charts": {
+			"adoption_bar_chart": {
+				"intro": "",
+				"title": ""
+			},
+			"adoption_circle_chart": {
+				"title": ""
+			},
+			"cumulative_adoption_bar_chart": {
+				"intro": "",
+				"title": ""
+			}
+		},
+		"report-selection": {
+			"no_options": "",
+			"reload_list": "",
+			"select_report": ""
+		},
+		"report-table-virtual-list": {
 			"domain": "",
 			"icon_legend": {
 				"category_error_in_test": "",
@@ -1524,35 +1509,7 @@
 			},
 			"score": ""
 		},
-		"components/reports/ReportTableVirtualListRecord.vue": {
-			"evidence": "",
-			"link_to_report": "",
-			"not_eligeble_for_scanning": "",
-			"results": {
-				"category_error_in_test": "",
-				"comparison": {
-					"improved": "",
-					"neutral": "",
-					"regressed": ""
-				},
-				"error": "",
-				"error_in_test": "",
-				"failed": "",
-				"info": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"not_tested": "",
-				"passed": "",
-				"unknown": "",
-				"warning": ""
-			},
-			"since": ""
-		},
-		"components/reports/ReportTagFilter.vue": {
-			"filter_by_tag": "",
-			"tag_explanation": ""
-		},
-		"components/reports/SharedReport.vue": {
+		"shared-report": {
 			"intro": "",
 			"not_found": {
 				"content": "",
@@ -1560,7 +1517,7 @@
 			},
 			"title": ""
 		},
-		"components/reports/SharingConfiguration.vue": {
+		"sharing_configuration": {
 			"and_password": "",
 			"change_link": "",
 			"configure_password": "",
@@ -1582,6 +1539,37 @@
 			"title": "",
 			"with_password": "",
 			"without_password": ""
+		},
+		"tag-filter": {
+			"apply": "",
+			"filter_by_tag": "",
+			"reset": "",
+			"save-as-new-report": "",
+			"tag_explanation": ""
+		},
+		"virtual-list-record": {
+			"evidence": "",
+			"link_to_report": "",
+			"not_eligeble_for_scanning": "",
+			"results": {
+				"category_error_in_test": "",
+				"comparison": {
+					"improved": "",
+					"neutral": "",
+					"regressed": ""
+				},
+				"error": "",
+				"error_in_test": "",
+				"failed": "",
+				"info": "",
+				"not_applicable": "",
+				"not_testable": "",
+				"not_tested": "",
+				"passed": "",
+				"unknown": "",
+				"warning": ""
+			},
+			"since": ""
 		}
 	},
 	"scanmonitor": {
@@ -1760,19 +1748,6 @@
 			"support_title": ""
 		}
 	},
-	"test": {
-		"result": {
-			"percentage": {
-				"error_in_test": "",
-				"high": "",
-				"low": "",
-				"medium": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"ok": ""
-			}
-		}
-	},
 	"tour": {
 		"account_notifications": {
 			"caption": "",
diff --git a/src/locales/en.json b/src/locales/en.json
index 8098c7d..87a9e9b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -150,6 +150,10 @@
 			"usage_overview": "Usage overview",
 			"web_metrics": "Web metrics"
 		},
+		"scan-type": {
+			"mail": "Mail",
+			"web": "Web"
+		},
 		"server-response": {
 			"at": "At",
 			"error": "An error occurred",
@@ -216,34 +220,10 @@
 			"title": "Discover Subdomains",
 			"will_be_added_to": "selected subdomains will be added to the list named {0}."
 		},
-		"edit": {
-			"button_labels": {
-				"cancel": "Cancel",
-				"remove": "Remove",
-				"save": "Save"
-			},
-			"cancel_editing_url": "Cancel editing and store the original value: {0}",
-			"delete_edited_url": "Delete {0} from this list.",
-			"eligeble_mail": "",
-			"save_edited_url": "Save changes, the change will be applied to {0}.",
-			"start_editing_url": "Edit {0}."
-		},
 		"edit-domain": {
-			"button_labels": {
-				"cancel": "Cancel",
-				"remove": "Remove",
-				"save": "Save"
-			},
-			"cancel_editing_url": "Cancel editing and store the original value: {0}",
-			"delete_edited_url": "Delete {0} from this list.",
-			"eligeble_mail": "{0} is eligible for e-mail scans",
-			"eligeble_web": "{0} is eligible for web scans",
-			"not_eligeble_mail": "{0} is not eligible for e-mail scans. Will be checked again when starting a scan.",
-			"not_eligeble_web": "{0} is not eligible for web scans. Will be checked again when starting a scan.",
-			"save_edited_url": "Save changes, the change will be applied to {0}.",
-			"start_editing_url": "Edit {0}.",
-			"unknown_eligeble_mail": "Not yet known if {0} can be mail scanned.",
-			"unknown_eligeble_web": "Not yet known if {0} can be web scanned."
+			"cancel": "Cancel",
+			"remove": "Remove",
+			"save": "Save"
 		},
 		"list": {
 			"add-domains": {
@@ -573,6 +553,11 @@
 		"category_web_tls_tls": {
 			"title": "TLS"
 		},
+		"internet_nl_legacy": {
+			"status_fields": {
+				"title": "Status Fields"
+			}
+		},
 		"internet_nl_mail_auth_dkim_exist": {
 			"explanation": "E-mail can contain a digital signature of the sender, this can by verified by the postal service. If the signature is missing or incorrect, it can be seen as an attempt of sending fake mail. When somebody does send a fake e-mail, the postal service can issue a notification to the real owner of the e-mail address as they might want to do something about this.",
 			"extended-explanation": "We check if your domain supports DKIM records. A receiving mail server canuse the public key in your DKIM record to validate the signature in an email with a user from your domain as sender and determine its authenticity.</p><ul><li>Currently we are not able to query and evaluate the public key in your DKIM record,because we would need the DKIM selector (that should be in the mails you send) to do so.</li><li>To pass this test we expect your name server to answer <code>NOERROR</code> to our query for<code>_domainkey.example.nl</code>. When <code>_domainkey.example.nl</code> is an 'empty non-terminal' some name servers that are not conformant with the standardRFC 2308 incorrectly answer <code>NXDOMAIN</code> instead of <code>NOERROR</code>. This makes itimpossible for us to detect support for DKIM records.</li><li>For this test we assume 'strict alignment' which is conformant with DMARC. The given domain is considered to be the sender domain in the mail body domain (<code>From:</code>) and this must be identical to the DKIM domain (<code>d=</code>) and the SPF domain (envelope sender, i.e. return-path that shows up in <code>MAIL FROM</code>).</li></ul><p>For a \"good practice on domains without mail\" see the <a href=\"#control-panel-9\">explanation of the \"DMARC policy\" subtest</a>.",
@@ -1332,53 +1317,56 @@
 			},
 			"technology": "Transport Layer Security (TLS)",
 			"title": "Secure connection following NCSC-NL requirements (HTTPS)"
+		},
+		"legend": {
+			"subtest_bad": "Bad: fail on REQUIRED subtest ⇒ null score",
+			"subtest_good": "Good: pass on REQUIRED, RECOMMENDED or OPTIONAL subtest ⇒ first: full score / latter two: no score impact",
+			"subtest_info": "Informational: failed at least one OPTIONAL subtest ⇒ full score in test category",
+			"subtest_title": "Icons per subtest",
+			"subtest_warning": "Warning: fail on RECOMMENDED subtest ⇒ no score impact",
+			"test_bad": "Bad: failed at least one REQUIRED subtest ⇒ no full score in test category",
+			"test_good": "Good: passed all subtests ⇒ full score in test category",
+			"test_info": "Informational: failed at least one OPTIONAL subtest ⇒ full score in test category ",
+			"test_title": "Icons per test category",
+			"test_warning": "Warning: failed at least one RECOMMENDED subtest ⇒ full score in test category "
+		},
+		"rating": {
+			"pct_error_in_test": "test error",
+			"pct_high": "failed",
+			"pct_low": "info",
+			"pct_medium": "warning",
+			"pct_not_applicable": "not applicable",
+			"pct_not_testable": "not testable",
+			"pct_ok": "passed"
 		}
 	},
-	"public_reports": {
-		"components/home/PublicReports.vue": {
-			"Contains": "Contains",
-			"domains": "domains",
+	"public-reports": {
+		"page": {
 			"introduction": "These reports are created, curated and shared by the internet.nl dashboard staff",
-			"Name": "Report",
-			"Public reports": "Public reports created by dashboard staff",
-			"Published": "Publication date",
-			"Score": "Internet.nl score",
-			"View": "View",
-			"View report": "View report"
+			"Public reports": "Public reports created by dashboard staff"
 		},
-		"components/home/PublicReportsPerAccount.vue": {
+		"per-account": {
 			"all": "Mail & Web",
-			"Contains": "Contains",
-			"domains": "domains",
-			"Name": "Report",
-			"Published": "Publication date",
 			"Recently published reports": "Public reports",
 			"scan_frequency": "Next update",
 			"scan_type": "Measured",
-			"Score": "Internet.nl score",
-			"View": "View",
 			"View latest mail report": "Newest mail report",
 			"View latest report": "Newest report",
-			"View latest web report": "Newest web report",
-			"View report": "View report"
+			"View latest web report": "Newest web report"
 		},
-		"components/home/PublicReportsTable.vue": {
+		"table": {
 			"Contains": "Contains",
 			"domains": "domains",
-			"introduction": "These reports are created, curated and shared by the internet.nl dashboard staff",
 			"Name": "Report",
 			"Published": "Publication date",
-			"Recently published reports": "Recently published reports",
-			"Score": "Internet.nl score",
-			"View": "View",
-			"View report": "View report"
+			"Score": "Internet.nl score"
 		}
 	},
 	"report": {
-		"components/reports/AppliedTags.vue": {
+		"applied-tags": {
 			"info": "Applied labels"
 		},
-		"components/reports/DifferencesToCurrentList.vue": {
+		"differences": {
 			"both_list_contain_n_urls": "Both the report and the associated list of domains contain {0} domains.",
 			"equal": "The domains in this report are equal to the domains in the associated list of domains.",
 			"in_report_but_not_in_urllist": "Domains in this report, but not in the list",
@@ -1387,49 +1375,20 @@
 			"report_contains_n_urllist_contains_n": "This report contains {0} domains, while the associated list contains {1}.",
 			"retrieving_differences": "Retrieving differences compared to current list."
 		},
-		"components/reports/NestedReportCharts.vue": {
-			"A": "Average",
-			"category": "Category",
-			"G": ""
-		},
-		"components/reports/Report.vue": {
-			"intro": "It is possible to select one or multiple reports. Selecting a single report shows all data of that report, including graphs and a table with detailed results. Selecting two reports, a comparison is made between these reports in the graphs and detailed result. Selecting more than two reports, only graphs are shown.",
-			"patience": "Reports with over 1000 domains may take a minute before downloading starts, please be patient.",
-			"settings": "Select visible metrics",
-			"tab_changes": "Changes",
-			"tab_graphs": "Graphs",
-			"tab_metrics": "Metrics table",
-			"title": "Reports"
-		},
-		"components/reports/ReportCharts.vue": {
-			"adoption_bar_chart": {
-				"intro": "This graph shows the average adoption per standard per report.",
-				"title": "Adoption of standards per category"
-			},
-			"adoption_circle_chart": {
-				"title": "Adoption of standards"
-			},
-			"cumulative_adoption_bar_chart": {
-				"intro": "This graph shows the average adoption per standard averaged over multiple reports.",
-				"title": "Adoption of standards over multiple reports"
-			},
-			"how_charts_work": "By clicking on legend labels, it's possible to toggle certain categories. The 'failed' category is disabled by default and can be enabled by clicking on it."
-		},
-		"components/reports/ReportDownload.vue": {
+		"download": {
 			"csv": "Comma Separated (csv)",
-			"intro": "Report data is available in the following formats:",
 			"ods": "Open Spreadsheet (ods)",
 			"title": "Download #{0} as",
 			"xlsx": "Microsoft Excel (xlsx)"
 		},
-		"components/reports/ReportHeader.vue": {
+		"header": {
 			"compared_to": "Compared to",
 			"data_from": "Data from",
 			"number_of_domains": "Number of domains",
 			"only_graphs": "Only showing the timeline and graphs because there are more than two reports selected.",
 			"type_of_scan_performed": "Type of rapport"
 		},
-		"components/reports/ReportImprovementAndRegressions.vue": {
+		"improvement-regressions": {
 			"days_ago": "Het vorige rapport werd {0} dagen geleden gemaakt.",
 			"domains_exclusive_current": "Domeinen exclusief in het huidige rapport",
 			"domains_exclusive_other": "Domeinen exclusief in het vorige rapport",
@@ -1445,7 +1404,7 @@
 			"title": "Changes",
 			"url": ""
 		},
-		"components/reports/ReportImprovementAndRegressionsTable.vue": {
+		"improvement-regressions-table": {
 			"improvement": "Improvements",
 			"metrics": "Metrics",
 			"regression": "Regressions",
@@ -1453,23 +1412,7 @@
 			"score_to": "to",
 			"url": "Domain"
 		},
-		"components/reports/ReportPasswords.vue": {
-			"Authentication required": "Authentication required",
-			"code": "Report",
-			"created_on": "Created on",
-			"name": "Name",
-			"No password needed": "No password needed",
-			"Retry with above settings": "Open with this password",
-			"Some reports require authentication": "Some reports require authentication, please fill in the password / 'share code' for each report:",
-			"Stored password is valid": "Stored password is valid",
-			"supply_password": "Please enter the password for this report:"
-		},
-		"components/reports/ReportSelection.vue": {
-			"no_options": "No reports available.",
-			"reload_list": "Update",
-			"select_report": "Select report..."
-		},
-		"components/reports/ReportTableLegend.vue": {
+		"legend": {
 			"icon_legend": {
 				"category_error_in_test": "Error occurred while testing ⇒ null score",
 				"subtest_error_in_test": "Error occurred while testing ⇒ null score",
@@ -1495,7 +1438,49 @@
 				"warning": "Warning"
 			}
 		},
-		"components/reports/ReportTableVirtualList.vue": {
+		"nested-report-charts": {
+			"A": "Average",
+			"category": "Category",
+			"G": ""
+		},
+		"page": {
+			"intro": "It is possible to select one or multiple reports. Selecting a single report shows all data of that report, including graphs and a table with detailed results. Selecting two reports, a comparison is made between these reports in the graphs and detailed result. Selecting more than two reports, only graphs are shown.",
+			"patience": "Reports with over 1000 domains may take a minute before downloading starts, please be patient.",
+			"tab_changes": "Changes",
+			"tab_graphs": "Graphs",
+			"tab_metrics": "Metrics table",
+			"title": "Reports"
+		},
+		"password-protection": {
+			"Authentication required": "Authentication required",
+			"code": "Report",
+			"created_on": "Created on",
+			"name": "Name",
+			"No password needed": "No password needed",
+			"Retry with above settings": "Open with this password",
+			"Some reports require authentication": "Some reports require authentication, please fill in the password / 'share code' for each report:",
+			"Stored password is valid": "Stored password is valid",
+			"supply_password": "Please enter the password for this report:"
+		},
+		"report-charts": {
+			"adoption_bar_chart": {
+				"intro": "This graph shows the average adoption per standard per report.",
+				"title": "Adoption of standards per category"
+			},
+			"adoption_circle_chart": {
+				"title": "Adoption of standards"
+			},
+			"cumulative_adoption_bar_chart": {
+				"intro": "This graph shows the average adoption per standard averaged over multiple reports.",
+				"title": "Adoption of standards over multiple reports"
+			}
+		},
+		"report-selection": {
+			"no_options": "No reports available.",
+			"reload_list": "Update",
+			"select_report": "Select report..."
+		},
+		"report-table-virtual-list": {
 			"domain": "Domain",
 			"icon_legend": {
 				"category_error_in_test": "Error occurred while testing ⇒ null score",
@@ -1524,35 +1509,7 @@
 			},
 			"score": "Score"
 		},
-		"components/reports/ReportTableVirtualListRecord.vue": {
-			"evidence": "Measurement",
-			"link_to_report": "View score and report from %{url} on internet.nl.",
-			"not_eligeble_for_scanning": "Domain did not match scanning criteria at the time the scan was initiated. The scanning criteria are an SOA DNS record (not NXERROR) for mail and an A or AAAA DNS record for web. This domain is ignored in all statistics.",
-			"results": {
-				"category_error_in_test": "Test error",
-				"comparison": {
-					"improved": "Improved compared to the second report selected.",
-					"neutral": "-",
-					"regressed": "Regressed compared to the second report selected."
-				},
-				"error": "Test error",
-				"error_in_test": "Test error",
-				"failed": "Failed",
-				"info": "Info",
-				"not_applicable": "Not applicable",
-				"not_testable": "Not testable",
-				"not_tested": "Not tested",
-				"passed": "Passed",
-				"unknown": "Unknown",
-				"warning": "Warning"
-			},
-			"since": "Since"
-		},
-		"components/reports/ReportTagFilter.vue": {
-			"filter_by_tag": "-- filter by label",
-			"tag_explanation": "This report supports labels. Labels can be used to filter the data in the report and create new sub-reports based on the selected tags. Filtering happens directly on the database, so this may take a while before it's rendered. Selecting multiple tags means that they are all applied per domain."
-		},
-		"components/reports/SharedReport.vue": {
+		"shared-report": {
 			"intro": "",
 			"not_found": {
 				"content": "Could not find this public report. It may have been revoked, deleted or the share code has changed. Please check your input and try again.",
@@ -1560,7 +1517,7 @@
 			},
 			"title": "Shared Report"
 		},
-		"components/reports/SharingConfiguration.vue": {
+		"sharing_configuration": {
 			"and_password": " and password",
 			"change_link": "New link",
 			"configure_password": "Configure password (optional)",
@@ -1582,6 +1539,37 @@
 			"title": "{1} - Change sharing options of report #{0}",
 			"with_password": "with the password set to",
 			"without_password": "without a password."
+		},
+		"tag-filter": {
+			"apply": "Apply",
+			"filter_by_tag": "-- filter by label",
+			"reset": "Reset",
+			"save-as-new-report": "Save as new report",
+			"tag_explanation": "This report supports labels. Labels can be used to filter the data in the report and create new sub-reports based on the selected tags. Filtering happens directly on the database, so this may take a while before it's rendered. Selecting multiple tags means that they are all applied per domain."
+		},
+		"virtual-list-record": {
+			"evidence": "Measurement",
+			"link_to_report": "View score and report from %{url} on internet.nl.",
+			"not_eligeble_for_scanning": "Domain did not match scanning criteria at the time the scan was initiated. The scanning criteria are an SOA DNS record (not NXERROR) for mail and an A or AAAA DNS record for web. This domain is ignored in all statistics.",
+			"results": {
+				"category_error_in_test": "Test error",
+				"comparison": {
+					"improved": "Improved compared to the second report selected.",
+					"neutral": "-",
+					"regressed": "Regressed compared to the second report selected."
+				},
+				"error": "Test error",
+				"error_in_test": "Test error",
+				"failed": "Failed",
+				"info": "Info",
+				"not_applicable": "Not applicable",
+				"not_testable": "Not testable",
+				"not_tested": "Not tested",
+				"passed": "Passed",
+				"unknown": "Unknown",
+				"warning": "Warning"
+			},
+			"since": "Since"
 		}
 	},
 	"scanmonitor": {
@@ -1760,19 +1748,6 @@
 			"support_title": "Support"
 		}
 	},
-	"test": {
-		"result": {
-			"percentage": {
-				"error_in_test": "",
-				"high": "",
-				"low": "",
-				"medium": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"ok": ""
-			}
-		}
-	},
 	"tour": {
 		"account_notifications": {
 			"caption": "Account settings allow setting up notifications.",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index ab8ec8d..e0a62cd 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -150,6 +150,10 @@
 			"usage_overview": "",
 			"web_metrics": ""
 		},
+		"scan-type": {
+			"mail": "",
+			"web": ""
+		},
 		"server-response": {
 			"at": "",
 			"error": "",
@@ -216,34 +220,10 @@
 			"title": "",
 			"will_be_added_to": ""
 		},
-		"edit": {
-			"button_labels": {
-				"cancel": "",
-				"remove": "",
-				"save": ""
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "",
-			"save_edited_url": "",
-			"start_editing_url": ""
-		},
 		"edit-domain": {
-			"button_labels": {
-				"cancel": "",
-				"remove": "",
-				"save": ""
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "",
-			"eligeble_web": "",
-			"not_eligeble_mail": "",
-			"not_eligeble_web": "",
-			"save_edited_url": "",
-			"start_editing_url": "",
-			"unknown_eligeble_mail": "",
-			"unknown_eligeble_web": ""
+			"cancel": "",
+			"remove": "",
+			"save": ""
 		},
 		"list": {
 			"add-domains": {
@@ -573,6 +553,11 @@
 		"category_web_tls_tls": {
 			"title": "TLS"
 		},
+		"internet_nl_legacy": {
+			"status_fields": {
+				"title": ""
+			}
+		},
 		"internet_nl_mail_auth_dkim_exist": {
 			"explanation": "Le courrier électronique peut contenir une signature numérique de l'expéditeur, qui peut être vérifiée par le service postal. Si la signature est manquante ou incorrecte, cela peut être considéré comme une tentative d'envoi d'un faux courrier. Lorsque quelqu'un envoie un faux courrier électronique, le service postal peut envoyer une notification au véritable propriétaire de l'adresse électronique, car il pourrait vouloir faire quelque chose à ce sujet.",
 			"extended-explanation": "Nous vérifions si votre domaine prend en charge les enregistrements DKIM. Un serveur de messagerie récepteur peut utiliser la clé publique de votre enregistrement DKIM pour valider la signature d'un courrier électronique dont l'expéditeur est un utilisateur de votre domaine et en déterminer l'authenticité.</p><ul><li>Actuellement, nous ne sommes pas en mesure d'interroger et d'évaluer la clé publique de votre enregistrement DKIM, car nous aurions besoin du sélecteur DKIM (qui devrait se trouver dans les courriers électroniques que vous envoyez) pour le faire.</li><li>Pour réussir ce test, nous attendons de votre serveur de noms qu'il réponde <code>NOERROR</code> à notre requête pour<code>_domainkey.example.nl</code>. Lorsque <code>_domainkey.example.nl</code> est un \"non-terminal vide\", certains serveurs de noms qui ne sont pas conformes à la norme RFC 2308 répondent incorrectement <code>NXDOMAIN</code> au lieu de <code>NOERROR</code>. Il nous est donc impossible de détecter la prise en charge des enregistrements DKIM.</li><li>Pour ce test, nous supposons un \"alignement strict\", ce qui est conforme à DMARC. Le domaine donné est considéré comme le domaine de l'expéditeur dans le domaine du corps du courrier (<code>From :</code>) et doit être identique au domaine DKIM (<code>d=</code>) et au domaine SPF (expéditeur de l'enveloppe, c'est-à-dire le chemin de retour qui apparaît dans <code>MAIL FROM</code>).</li></ul><p>Pour une \"bonne pratique sur les domaines sans courrier\", voir l'explication <a href=\"#control-panel-9\">de la sous-épreuve</a>\"Politique DMARC\". .",
@@ -1332,53 +1317,56 @@
 			},
 			"technology": "Sécurité de la couche transport (TLS)",
 			"title": "Connexion sécurisée conforme aux exigences du NCSC-NL (HTTPS)"
+		},
+		"legend": {
+			"subtest_bad": "",
+			"subtest_good": "",
+			"subtest_info": "",
+			"subtest_title": "",
+			"subtest_warning": "",
+			"test_bad": "",
+			"test_good": "",
+			"test_info": "",
+			"test_title": "",
+			"test_warning": ""
+		},
+		"rating": {
+			"pct_error_in_test": "",
+			"pct_high": "",
+			"pct_low": "",
+			"pct_medium": "",
+			"pct_not_applicable": "",
+			"pct_not_testable": "",
+			"pct_ok": ""
 		}
 	},
-	"public_reports": {
-		"components/home/PublicReports.vue": {
-			"Contains": "",
-			"domains": "",
+	"public-reports": {
+		"page": {
 			"introduction": "",
-			"Name": "",
-			"Public reports": "",
-			"Published": "",
-			"Score": "",
-			"View": "",
-			"View report": ""
+			"Public reports": ""
 		},
-		"components/home/PublicReportsPerAccount.vue": {
+		"per-account": {
 			"all": "",
-			"Contains": "",
-			"domains": "",
-			"Name": "",
-			"Published": "",
 			"Recently published reports": "",
 			"scan_frequency": "",
 			"scan_type": "",
-			"Score": "",
-			"View": "",
 			"View latest mail report": "",
 			"View latest report": "",
-			"View latest web report": "",
-			"View report": ""
+			"View latest web report": ""
 		},
-		"components/home/PublicReportsTable.vue": {
+		"table": {
 			"Contains": "",
 			"domains": "",
-			"introduction": "",
 			"Name": "",
 			"Published": "",
-			"Recently published reports": "",
-			"Score": "",
-			"View": "",
-			"View report": ""
+			"Score": ""
 		}
 	},
 	"report": {
-		"components/reports/AppliedTags.vue": {
+		"applied-tags": {
 			"info": ""
 		},
-		"components/reports/DifferencesToCurrentList.vue": {
+		"differences": {
 			"both_list_contain_n_urls": "",
 			"equal": "",
 			"in_report_but_not_in_urllist": "",
@@ -1387,49 +1375,20 @@
 			"report_contains_n_urllist_contains_n": "",
 			"retrieving_differences": ""
 		},
-		"components/reports/NestedReportCharts.vue": {
-			"A": "",
-			"category": "",
-			"G": ""
-		},
-		"components/reports/Report.vue": {
-			"intro": "",
-			"patience": "",
-			"settings": "",
-			"tab_changes": "",
-			"tab_graphs": "",
-			"tab_metrics": "",
-			"title": ""
-		},
-		"components/reports/ReportCharts.vue": {
-			"adoption_bar_chart": {
-				"intro": "",
-				"title": ""
-			},
-			"adoption_circle_chart": {
-				"title": ""
-			},
-			"cumulative_adoption_bar_chart": {
-				"intro": "",
-				"title": ""
-			},
-			"how_charts_work": ""
-		},
-		"components/reports/ReportDownload.vue": {
+		"download": {
 			"csv": "",
-			"intro": "",
 			"ods": "",
 			"title": "",
 			"xlsx": ""
 		},
-		"components/reports/ReportHeader.vue": {
+		"header": {
 			"compared_to": "",
 			"data_from": "",
 			"number_of_domains": "",
 			"only_graphs": "",
 			"type_of_scan_performed": ""
 		},
-		"components/reports/ReportImprovementAndRegressions.vue": {
+		"improvement-regressions": {
 			"days_ago": "",
 			"domains_exclusive_current": "",
 			"domains_exclusive_other": "",
@@ -1445,7 +1404,7 @@
 			"title": "",
 			"url": ""
 		},
-		"components/reports/ReportImprovementAndRegressionsTable.vue": {
+		"improvement-regressions-table": {
 			"improvement": "",
 			"metrics": "",
 			"regression": "",
@@ -1453,23 +1412,7 @@
 			"score_to": "",
 			"url": ""
 		},
-		"components/reports/ReportPasswords.vue": {
-			"Authentication required": "",
-			"code": "",
-			"created_on": "",
-			"name": "",
-			"No password needed": "",
-			"Retry with above settings": "",
-			"Some reports require authentication": "",
-			"Stored password is valid": "",
-			"supply_password": ""
-		},
-		"components/reports/ReportSelection.vue": {
-			"no_options": "",
-			"reload_list": "",
-			"select_report": ""
-		},
-		"components/reports/ReportTableLegend.vue": {
+		"legend": {
 			"icon_legend": {
 				"category_error_in_test": "",
 				"subtest_error_in_test": "",
@@ -1495,7 +1438,49 @@
 				"warning": ""
 			}
 		},
-		"components/reports/ReportTableVirtualList.vue": {
+		"nested-report-charts": {
+			"A": "",
+			"category": "",
+			"G": ""
+		},
+		"page": {
+			"intro": "",
+			"patience": "",
+			"tab_changes": "",
+			"tab_graphs": "",
+			"tab_metrics": "",
+			"title": ""
+		},
+		"password-protection": {
+			"Authentication required": "",
+			"code": "",
+			"created_on": "",
+			"name": "",
+			"No password needed": "",
+			"Retry with above settings": "",
+			"Some reports require authentication": "",
+			"Stored password is valid": "",
+			"supply_password": ""
+		},
+		"report-charts": {
+			"adoption_bar_chart": {
+				"intro": "",
+				"title": ""
+			},
+			"adoption_circle_chart": {
+				"title": ""
+			},
+			"cumulative_adoption_bar_chart": {
+				"intro": "",
+				"title": ""
+			}
+		},
+		"report-selection": {
+			"no_options": "",
+			"reload_list": "",
+			"select_report": ""
+		},
+		"report-table-virtual-list": {
 			"domain": "",
 			"icon_legend": {
 				"category_error_in_test": "",
@@ -1524,35 +1509,7 @@
 			},
 			"score": ""
 		},
-		"components/reports/ReportTableVirtualListRecord.vue": {
-			"evidence": "",
-			"link_to_report": "",
-			"not_eligeble_for_scanning": "",
-			"results": {
-				"category_error_in_test": "",
-				"comparison": {
-					"improved": "",
-					"neutral": "",
-					"regressed": ""
-				},
-				"error": "",
-				"error_in_test": "",
-				"failed": "",
-				"info": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"not_tested": "",
-				"passed": "",
-				"unknown": "",
-				"warning": ""
-			},
-			"since": ""
-		},
-		"components/reports/ReportTagFilter.vue": {
-			"filter_by_tag": "",
-			"tag_explanation": ""
-		},
-		"components/reports/SharedReport.vue": {
+		"shared-report": {
 			"intro": "",
 			"not_found": {
 				"content": "",
@@ -1560,7 +1517,7 @@
 			},
 			"title": ""
 		},
-		"components/reports/SharingConfiguration.vue": {
+		"sharing_configuration": {
 			"and_password": "",
 			"change_link": "",
 			"configure_password": "",
@@ -1582,6 +1539,37 @@
 			"title": "",
 			"with_password": "",
 			"without_password": ""
+		},
+		"tag-filter": {
+			"apply": "",
+			"filter_by_tag": "",
+			"reset": "",
+			"save-as-new-report": "",
+			"tag_explanation": ""
+		},
+		"virtual-list-record": {
+			"evidence": "",
+			"link_to_report": "",
+			"not_eligeble_for_scanning": "",
+			"results": {
+				"category_error_in_test": "",
+				"comparison": {
+					"improved": "",
+					"neutral": "",
+					"regressed": ""
+				},
+				"error": "",
+				"error_in_test": "",
+				"failed": "",
+				"info": "",
+				"not_applicable": "",
+				"not_testable": "",
+				"not_tested": "",
+				"passed": "",
+				"unknown": "",
+				"warning": ""
+			},
+			"since": ""
 		}
 	},
 	"scanmonitor": {
@@ -1760,19 +1748,6 @@
 			"support_title": ""
 		}
 	},
-	"test": {
-		"result": {
-			"percentage": {
-				"error_in_test": "",
-				"high": "",
-				"low": "",
-				"medium": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"ok": ""
-			}
-		}
-	},
 	"tour": {
 		"account_notifications": {
 			"caption": "",
diff --git a/src/locales/mapping.md b/src/locales/mapping.md
index 4a06c84..8ed3e1f 100644
--- a/src/locales/mapping.md
+++ b/src/locales/mapping.md
@@ -14,8 +14,21 @@ a nice exercise in the future if we don't want to copy all labels to the transla
 
 This will probably happen in the backend, not in this frontend.
 
+## Mapping of legend
 
-## Mapping
+test_title: 'faqs_report_test_title',
+test_good: 'faqs_report_test_good',
+test_bad: 'faqs_report_test_bad',
+test_warning: 'faqs_report_test_warning',
+test_info: 'faqs_report_test_info',
+subtest_title: 'faqs_report_subtest_title',
+subtest_good: 'faqs_report_subtest_good',
+subtest_bad: 'faqs_report_subtest_bad',
+subtest_warning: 'faqs_report_subtest_warning',
+subtest_info: 'faqs_report_subtest_info',
+
+
+## Mapping of Metrics
 
 internet_nl_web_tls: 'test_sitetls',
 internet_nl_web_dnssec: 'test_sitednssec',
diff --git a/src/locales/nl.json b/src/locales/nl.json
index b177bca..c90c623 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -150,6 +150,10 @@
 			"usage_overview": "Gebruiksoverzicht",
 			"web_metrics": "Web meetwaarden"
 		},
+		"scan-type": {
+			"mail": "Mail",
+			"web": "Web"
+		},
 		"server-response": {
 			"at": "Op",
 			"error": "Er is iets mis gegaan",
@@ -216,34 +220,10 @@
 			"title": "Subdomeinen Zoeker",
 			"will_be_added_to": "geselecteerde subdomeinen worden toegevoegd aan de lijst genaamd {0}."
 		},
-		"edit": {
-			"button_labels": {
-				"cancel": "Annuleren",
-				"remove": "Verwijderen",
-				"save": "Opslaan"
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "E-mail scannen is mogelijk",
-			"save_edited_url": "",
-			"start_editing_url": "Bewerk {0}."
-		},
 		"edit-domain": {
-			"button_labels": {
-				"cancel": "Annuleren",
-				"remove": "Verwijderen",
-				"save": "Opslaan"
-			},
-			"cancel_editing_url": "",
-			"delete_edited_url": "",
-			"eligeble_mail": "E-mail scannen is mogelijk",
-			"eligeble_web": "Web scan is mogelijk",
-			"not_eligeble_mail": "Kan geen E-mail scan uitvoeren (wordt opnieuw gecheckt bij het starten van de scan)",
-			"not_eligeble_web": "Web scan kan niet worden uitgevoerd. Dit wordt opnieuw gecheckt bij het starten van de scan.",
-			"save_edited_url": "",
-			"start_editing_url": "Bewerk {0}.",
-			"unknown_eligeble_mail": "Onbekend of E-mail scannen mogelijk is",
-			"unknown_eligeble_web": "Niet bekend of het mogelijk is een web scan uit te voeren"
+			"cancel": "Annuleren",
+			"remove": "Verwijderen",
+			"save": "Opslaan"
 		},
 		"list": {
 			"add-domains": {
@@ -573,6 +553,11 @@
 		"category_web_tls_tls": {
 			"title": "TLS"
 		},
+		"internet_nl_legacy": {
+			"status_fields": {
+				"title": "Status Velden"
+			}
+		},
 		"internet_nl_mail_auth_dkim_exist": {
 			"explanation": "E-mail wordt verstuurd met een digitale handtekening van de afzender. Deze handtekening kan niet zomaar worden nagemaakt. Wanneer iemand dat toch probeert na te doen zal het postbedrijf de e-mail weigeren en de echte eigenaar waarschuwen over de namaak e-mail.",
 			"extended-explanation": "We testen of je domeinnaam DKIM ondersteunt. Een ontvangende mailserver kande publieke sleutel in je DKIM-record gebruiken om de handtekening in eene-mail met een gebruiker van jouw domein als afzender te controleren en deauthenticiteit van de e-mail te bepalen.</p><ul><li>Om te slagen voor deze test verwachten we dat je nameserver <code>NOERROR</code> antwoordt op onze  bevragingvoor <code>_domainkey.example.nl</code>. Als <code>_domainkey.example.nl</code> een 'empty non-terminal' is, dan zullen sommige nameservers die zich niet houden aan destandaard RFC 2308, foutief antwoorden met <code>NXDOMAIN</code> in plaats van<code>NOERROR</code>. Dit maakt het detecteren van het DKIM-record voor ons onmogelijk.</li><li>Op dit moment zijn we niet in staat om de publieke sleutel in je DKIM-record op te vragen en te beoordelen, omdat we daarvoor een e-mail van jouw domein zouden moeten ontvangen.</li><li>Bij deze test gaan we uit van 'strict alignment' hetgeen conform DMARC is. Het geteste domein wordt beschouwd als het verzenddomein in het mailbericht (<code>From:</code>) en moet gelijk zijn aan zowel het DKIM-domein (<code>d=</code>) als het SPF-domein (envelope sender, d.w.z. return-path dat terugkomt in <code>MAIL FROM</code>).</li></ul><p>Voor een \"good practice voor domeinnamen zonder mail\" zie de <a href=\"#control-panel-9\">uitleg van de \"DMARC-policy\" subtest</a>.",
@@ -1332,53 +1317,56 @@
 			},
 			"technology": "Beveiliging transportlaag (TLS)",
 			"title": "Veilige verbinding volgens NCSC-NL eisen (HTTPS)"
+		},
+		"legend": {
+			"subtest_bad": "Slecht: gezakt voor VEREISTE subtest ⇒ nulscore",
+			"subtest_good": "Goed: geslaagd voor VEREISTE, AANBEVOLEN of OPTIONELE subtest ⇒ eerste: volledige score / laatste twee: geen impact op score",
+			"subtest_info": "Ter informatie: gezakt voor tenminste één OPTIONELE subtest ⇒ volledige score voor testcategorie",
+			"subtest_title": "Iconen per subtest",
+			"subtest_warning": "Waarschuwing: gezakt voor AANBEVOLEN subtest ⇒ geen impact op score",
+			"test_bad": "Slecht: gezakt voor tenminste één VEREISTE subtest ⇒ geen volledige score voor testcategorie",
+			"test_good": "Goed: geslaagd voor alle subtesten ⇒ volledige score voor testcategorie ",
+			"test_info": "Ter informatie: gezakt voor tenminste één OPTIONELE subtest ⇒ volledige score voor testcategorie",
+			"test_title": "Iconen per testcategorie",
+			"test_warning": "Waarschuwing: gezakt voor tenminste één AANBEVOLEN subtest ⇒ volledige score voor testcategorie "
+		},
+		"rating": {
+			"pct_error_in_test": "testfout",
+			"pct_high": "gezakt",
+			"pct_low": "info",
+			"pct_medium": "waarschuwing",
+			"pct_not_applicable": "niet van toepassing",
+			"pct_not_testable": "niet testbaar",
+			"pct_ok": "geslaagd"
 		}
 	},
-	"public_reports": {
-		"components/home/PublicReports.vue": {
-			"Contains": "Bevat",
-			"domains": "domeinen",
+	"public-reports": {
+		"page": {
 			"introduction": "Deze rapporten worden gemaakt, samengesteld en gedeeld door het internet.nl dashboard team",
-			"Name": "Rapport",
-			"Public reports": "Openbare rapporten samengesteld door dashboard beheerders",
-			"Published": "Gepubliceerd op",
-			"Score": "Internet.nl score",
-			"View": "Bekijken",
-			"View report": "Bekijk rapport"
+			"Public reports": "Openbare rapporten samengesteld door dashboard beheerders"
 		},
-		"components/home/PublicReportsPerAccount.vue": {
+		"per-account": {
 			"all": "Mail & Web",
-			"Contains": "Bevat",
-			"domains": "domeinen",
-			"Name": "Rapport",
-			"Published": "Gepubliceerd op",
 			"Recently published reports": "Openbare rapporten",
 			"scan_frequency": "Volgende update",
 			"scan_type": "Gemeten",
-			"Score": "Internet.nl score",
-			"View": "Bekijken",
 			"View latest mail report": "Nieuwste mail rapport",
 			"View latest report": "Nieuwste rapport",
-			"View latest web report": "Nieuwste web rapport",
-			"View report": "Bekijk rapport"
+			"View latest web report": "Nieuwste web rapport"
 		},
-		"components/home/PublicReportsTable.vue": {
+		"table": {
 			"Contains": "Bevat",
 			"domains": "domeinen",
-			"introduction": "Deze rapporten worden gemaakt, samengesteld en gedeeld door het internet.nl dashboard team",
 			"Name": "Rapport",
 			"Published": "Gepubliceerd op",
-			"Recently published reports": "Recent gepubliceerde rapporten",
-			"Score": "Internet.nl score",
-			"View": "Bekijken",
-			"View report": "Bekijk rapport"
+			"Score": "Internet.nl score"
 		}
 	},
 	"report": {
-		"components/reports/AppliedTags.vue": {
+		"applied-tags": {
 			"info": "Toegepaste labels"
 		},
-		"components/reports/DifferencesToCurrentList.vue": {
+		"differences": {
 			"both_list_contain_n_urls": "Zowel de rapportage als de bijbehorende lijst bevatten {0} domeinen.",
 			"equal": "Domeinen in dit rapport zijn gelijk aan de domeinen in de bijbehorende lijst.",
 			"in_report_but_not_in_urllist": "Domeinen in het rapport, maar niet in de bijbehorende lijst",
@@ -1387,49 +1375,20 @@
 			"report_contains_n_urllist_contains_n": "Deze rapportage bevat {0} domeinen terwijl de bijbehorende lijst {1} domeinen bevat.",
 			"retrieving_differences": "Lijst met verschillen aan het ophalen t.o.v. de huidige lijst."
 		},
-		"components/reports/NestedReportCharts.vue": {
-			"A": "",
-			"category": "Categorie",
-			"G": "Gemiddelde"
-		},
-		"components/reports/Report.vue": {
-			"intro": "Het is mogelijk om meerdere rapporten te selecteren. Bij het selecteren van een enkel rapport wordt alle relevante informatie hierover getoond. Bij het selecteren van twee rapporten wordt een vergelijking gemaakt: zowel in de grafieken als in de detail tabel. Bij het selecteren van meer dan twee rapporten zijn alleen de grafieken zichtbaar.",
-			"patience": "Het kan even duren voordat een download begint van een rapport met meer dan 1000 domeinen. Neem hiervoor even de tijd.",
-			"settings": "Selecteer zichtbare meetwaarden",
-			"tab_changes": "Veranderingen",
-			"tab_graphs": "Grafieken",
-			"tab_metrics": "Meetwaardentabel",
-			"title": "Rapporten"
-		},
-		"components/reports/ReportCharts.vue": {
-			"adoption_bar_chart": {
-				"intro": "Deze grafiek toont het percentage adoptie per categorie en onderliggende metingen.",
-				"title": "Adoptie van standaarden per categorie"
-			},
-			"adoption_circle_chart": {
-				"title": "Adoptie van standaarden"
-			},
-			"cumulative_adoption_bar_chart": {
-				"intro": "In deze grafiek worden de geselecteerde rapporten bij elkaar opgeteld, en daar het gemiddelde van getoond.",
-				"title": "Adoptie van standaarden, rapporten opgeteld"
-			},
-			"how_charts_work": "Door te klikken op de leganda in deze grafieken, kunnen beoordelingen worden getoond en verborgen. De 'gezakt' categorie wordt standaard altijd verborgen."
-		},
-		"components/reports/ReportDownload.vue": {
+		"download": {
 			"csv": "Kommagescheiden (csv)",
-			"intro": "De data in dit rapport is beschikbaar in de volgende formaten:",
 			"ods": "Open Document (ods)",
 			"title": "Download #{0} als",
 			"xlsx": "Microsoft Excel (xlsx)"
 		},
-		"components/reports/ReportHeader.vue": {
+		"header": {
 			"compared_to": "Vergeleken met",
 			"data_from": "Rapportage van",
 			"number_of_domains": "Aantal domeinen",
 			"only_graphs": "Enkel de tijdlijn en grafieken worden getoond omdat er meer dan twee rapporten zijn geselecteerd.",
 			"type_of_scan_performed": "Soort rapport"
 		},
-		"components/reports/ReportImprovementAndRegressions.vue": {
+		"improvement-regressions": {
 			"days_ago": "",
 			"domains_exclusive_current": "",
 			"domains_exclusive_other": "",
@@ -1445,7 +1404,7 @@
 			"title": "Veranderingen",
 			"url": "Domein"
 		},
-		"components/reports/ReportImprovementAndRegressionsTable.vue": {
+		"improvement-regressions-table": {
 			"improvement": "Verbeteringen",
 			"metrics": "Metingen",
 			"regression": "Verslechteringen",
@@ -1453,23 +1412,7 @@
 			"score_to": "naar",
 			"url": "Domein"
 		},
-		"components/reports/ReportPasswords.vue": {
-			"Authentication required": "Wachtwoord vereist",
-			"code": "Rapport",
-			"created_on": "Gemaakt op",
-			"name": "Naam",
-			"No password needed": "Geen wachtwoord vereist",
-			"Retry with above settings": "Probeer met dit wachtwoord",
-			"Some reports require authentication": "Voor sommige rapporten is een wachtwoord vereist, vul het wachtwoord of 'deelcode' in voor die rapporten:",
-			"Stored password is valid": "Het opgeslagen wachtwoord is geldig",
-			"supply_password": "Voer een wachtwoord in voor dit rapport:"
-		},
-		"components/reports/ReportSelection.vue": {
-			"no_options": "Geen rapporten beschikbaar.",
-			"reload_list": "Bijwerken",
-			"select_report": "Selecteer rapport..."
-		},
-		"components/reports/ReportTableLegend.vue": {
+		"legend": {
 			"icon_legend": {
 				"category_error_in_test": "",
 				"subtest_error_in_test": "",
@@ -1495,7 +1438,49 @@
 				"warning": "Waarschuwing"
 			}
 		},
-		"components/reports/ReportTableVirtualList.vue": {
+		"nested-report-charts": {
+			"A": "",
+			"category": "Categorie",
+			"G": "Gemiddelde"
+		},
+		"page": {
+			"intro": "Het is mogelijk om meerdere rapporten te selecteren. Bij het selecteren van een enkel rapport wordt alle relevante informatie hierover getoond. Bij het selecteren van twee rapporten wordt een vergelijking gemaakt: zowel in de grafieken als in de detail tabel. Bij het selecteren van meer dan twee rapporten zijn alleen de grafieken zichtbaar.",
+			"patience": "Het kan even duren voordat een download begint van een rapport met meer dan 1000 domeinen. Neem hiervoor even de tijd.",
+			"tab_changes": "Veranderingen",
+			"tab_graphs": "Grafieken",
+			"tab_metrics": "Meetwaardentabel",
+			"title": "Rapporten"
+		},
+		"password-protection": {
+			"Authentication required": "Wachtwoord vereist",
+			"code": "Rapport",
+			"created_on": "Gemaakt op",
+			"name": "Naam",
+			"No password needed": "Geen wachtwoord vereist",
+			"Retry with above settings": "Probeer met dit wachtwoord",
+			"Some reports require authentication": "Voor sommige rapporten is een wachtwoord vereist, vul het wachtwoord of 'deelcode' in voor die rapporten:",
+			"Stored password is valid": "Het opgeslagen wachtwoord is geldig",
+			"supply_password": "Voer een wachtwoord in voor dit rapport:"
+		},
+		"report-charts": {
+			"adoption_bar_chart": {
+				"intro": "Deze grafiek toont het percentage adoptie per categorie en onderliggende metingen.",
+				"title": "Adoptie van standaarden per categorie"
+			},
+			"adoption_circle_chart": {
+				"title": "Adoptie van standaarden"
+			},
+			"cumulative_adoption_bar_chart": {
+				"intro": "In deze grafiek worden de geselecteerde rapporten bij elkaar opgeteld, en daar het gemiddelde van getoond.",
+				"title": "Adoptie van standaarden, rapporten opgeteld"
+			}
+		},
+		"report-selection": {
+			"no_options": "Geen rapporten beschikbaar.",
+			"reload_list": "Bijwerken",
+			"select_report": "Selecteer rapport..."
+		},
+		"report-table-virtual-list": {
 			"domain": "Domein",
 			"icon_legend": {
 				"category_error_in_test": "Fout in test ⇒ nulscore",
@@ -1524,35 +1509,7 @@
 			},
 			"score": "Score"
 		},
-		"components/reports/ReportTableVirtualListRecord.vue": {
-			"evidence": "Meetgegevens",
-			"link_to_report": "Bekijk de score en rapportage van %{url} op internet.nl.",
-			"not_eligeble_for_scanning": "Dit domein voldeed niet aan de scan-criteria op het moment van scannen. Deze criteria zijn een SOA DNS record (geen NXERROR) voor mail en een A of AAAA DNS record voor web. Dit domein komt niet terug in de statistieken.",
-			"results": {
-				"category_error_in_test": "Testfout",
-				"comparison": {
-					"improved": "Verbeterd vergeleken met het 2e geselecteerde rapport.",
-					"neutral": "-",
-					"regressed": "Verslechterd vergeleken met het 2e geselecteerde rapport."
-				},
-				"error": "Testfout",
-				"error_in_test": "Testfout",
-				"failed": "Niet goed",
-				"info": "Info",
-				"not_applicable": "Niet van toepassing",
-				"not_testable": "Niet testbaar",
-				"not_tested": "Niet getest",
-				"passed": "Goed",
-				"unknown": "Onbekend",
-				"warning": "Waarschuwing"
-			},
-			"since": "Sinds"
-		},
-		"components/reports/ReportTagFilter.vue": {
-			"filter_by_tag": "-- filter op label",
-			"tag_explanation": "Dit rapport ondersteund label, hierop kan worden gefilterd. Dit gebeurd direct op de database, daardoor kan het even duren voordat het filter is toegepast. Meerdere labels selecteren betekent dat deze per domein allemaal worden gebruikt."
-		},
-		"components/reports/SharedReport.vue": {
+		"shared-report": {
 			"intro": "",
 			"not_found": {
 				"content": "Het opgevraagde rapport kon niet worden gevonden. Het kan zijn dat deze niet meer publiek is omdat deze is verwijderd of niet meer publiek staat. Controleer je invoer en probeer opnieuw.",
@@ -1560,7 +1517,7 @@
 			},
 			"title": "Gedeeld Rapport"
 		},
-		"components/reports/SharingConfiguration.vue": {
+		"sharing_configuration": {
 			"and_password": " en het wachtwoord",
 			"change_link": "Nieuwe link",
 			"configure_password": "Wachtwoord instellen (optioneel)",
@@ -1582,6 +1539,37 @@
 			"title": "{1} - Delen van rapport #{0} instellen",
 			"with_password": "met het wachtwoord ",
 			"without_password": "zonder wachtwoord."
+		},
+		"tag-filter": {
+			"apply": "Toepassen",
+			"filter_by_tag": "-- filter op label",
+			"reset": "Ongedaan maken",
+			"save-as-new-report": "Opslaan als nieuw rapport",
+			"tag_explanation": "Dit rapport ondersteund label, hierop kan worden gefilterd. Dit gebeurd direct op de database, daardoor kan het even duren voordat het filter is toegepast. Meerdere labels selecteren betekent dat deze per domein allemaal worden gebruikt."
+		},
+		"virtual-list-record": {
+			"evidence": "Meetgegevens",
+			"link_to_report": "Bekijk de score en rapportage van %{url} op internet.nl.",
+			"not_eligeble_for_scanning": "Dit domein voldeed niet aan de scan-criteria op het moment van scannen. Deze criteria zijn een SOA DNS record (geen NXERROR) voor mail en een A of AAAA DNS record voor web. Dit domein komt niet terug in de statistieken.",
+			"results": {
+				"category_error_in_test": "Testfout",
+				"comparison": {
+					"improved": "Verbeterd vergeleken met het 2e geselecteerde rapport.",
+					"neutral": "-",
+					"regressed": "Verslechterd vergeleken met het 2e geselecteerde rapport."
+				},
+				"error": "Testfout",
+				"error_in_test": "Testfout",
+				"failed": "Niet goed",
+				"info": "Info",
+				"not_applicable": "Niet van toepassing",
+				"not_testable": "Niet testbaar",
+				"not_tested": "Niet getest",
+				"passed": "Goed",
+				"unknown": "Onbekend",
+				"warning": "Waarschuwing"
+			},
+			"since": "Sinds"
 		}
 	},
 	"scanmonitor": {
@@ -1760,19 +1748,6 @@
 			"support_title": "Ondersteuning"
 		}
 	},
-	"test": {
-		"result": {
-			"percentage": {
-				"error_in_test": "",
-				"high": "",
-				"low": "",
-				"medium": "",
-				"not_applicable": "",
-				"not_testable": "",
-				"ok": ""
-			}
-		}
-	},
 	"tour": {
 		"account_notifications": {
 			"caption": "Een overzicht van account-instellingen, met daarin de mogelijkheid om notificaties in te stellen.",