diff --git a/frontend/src/components/editCalendar/EditAdditionalModules.vue b/frontend/src/components/editCalendar/EditAdditionalModules.vue
index fb968fc..5eff5e9 100644
--- a/frontend/src/components/editCalendar/EditAdditionalModules.vue
+++ b/frontend/src/components/editCalendar/EditAdditionalModules.vue
@@ -1,13 +1,16 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref, Ref } from "vue";
-import { Module } from "../../model/module";
-import { fetchAllModules } from "../../api/fetchCourse";
+import { Module } from "@/model/module.ts";
+import { fetchAllModules } from "@/api/fetchCourse.ts";
 import moduleStore from "../../store/moduleStore";
 import { MultiSelectAllChangeEvent } from "primevue/multiselect";
 import router from "../../router";
-import { fetchModule } from "../../api/fetchModule";
+import { fetchModule } from "@/api/fetchModule.ts";
 import { useDialog } from "primevue/usedialog";
+import {useI18n} from "vue-i18n";
+
 const dialog = useDialog();
+const { t } = useI18n({ useScope: "global" });
 
 const fetchedModules = async () => {
   return await fetchAllModules();
@@ -70,14 +73,21 @@ const onSelectAllChange = (event: MultiSelectAllChangeEvent) => {
 function selectChange() {
   selectAll.value = selectedModules.value.length === modules.value.length;
 }
+
+function itemsLabel(selectedModules: Module[]): string {
+  return (selectedModules ? selectedModules.length : 0) != 1 ? t("additionalModules.modules") : t("additionalModules.module");
+}
+
+function itemsLabelWithNumber(selectedModules: Module[]): string {
+  return selectedModules.length.toString() + " " + itemsLabel(selectedModules) + " " + t("additionalModules.dropDownFooterSelected");
+}
 </script>
 
 <template>
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
       <h3>
-        Select additional Modules that are not listed in the regular semester
-        for your Course
+        {{ $t("additionalModules.subTitle") }}
       </h3>
     </div>
     <div class="card flex align-items-center justify-content-center m-2">
@@ -90,10 +100,12 @@ function selectChange() {
         :virtual-scroller-options="{ itemSize: 70 }"
         class="custom-multiselect"
         filter
-        placeholder="Select additional modules"
+        :placeholder="$t('additionalModules.dropDown')"
         :auto-filter-focus="true"
+        :show-toggle-all="false"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
+        :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
@@ -127,7 +139,7 @@ function selectChange() {
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">Next Step</Button>
+      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index 44cfa5e..16bfa44 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup>
 import { computed, Ref, ref } from "vue";
-import { Module } from "../../model/module";
+import { Module } from "@/model/module.ts";
 import moduleStore from "../../store/moduleStore";
-import { fetchAllModules } from "../../api/fetchCourse";
-import { saveIndividualFeed } from "../../api/createFeed";
+import { fetchAllModules } from "@/api/fetchCourse.ts";
+import { saveIndividualFeed } from "@/api/createFeed.ts";
 import tokenStore from "../../store/tokenStore";
 import router from "../../router";
 import ModuleTemplateDialog from "../ModuleTemplateDialog.vue";
-import { onlyWhitespace } from "../../helpers/strings.ts";
+import { onlyWhitespace } from "@/helpers/strings.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: "global" });
 
 const tableData = computed(() =>
   moduleStore().modules.map((module: Module) => {
@@ -19,9 +21,9 @@ const tableData = computed(() =>
 );
 
 const columns = ref([
-  { field: "Course", header: "Course" },
-  { field: "Module", header: "Module" },
-  { field: "Reminder", header: "Reminder" },
+  { field: "Course", header: t("moduleInformation.course") },
+  { field: "Module", header: t("moduleInformation.module") },
+  { field: "Reminder", header: t("renameModules.reminder") },
 ]);
 
 const fetchedModules = async () => {
@@ -51,7 +53,7 @@ async function finalStep() {
 <template>
   <div class="flex flex-column card-container mx-8 mt-2">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h3>Rename your selected Modules to your liking.</h3>
+      <h3>{{ $t("renameModules.subTitle") }}</h3>
       <ModuleTemplateDialog />
     </div>
     <div
@@ -65,7 +67,7 @@ async function finalStep() {
       >
         <template #header>
           <div class="flex align-items-center justify-content-end">
-            Enable all notifications:
+            {{ $t("renameModules.enableAllNotifications") }}
             <InputSwitch
               class="mx-4"
               :model-value="
@@ -152,7 +154,7 @@ async function finalStep() {
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <Button label="Save Calendar" @click="finalStep()" />
+      <Button @click="finalStep()" >{{ $t("renameModules.nextStep") }}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 4dd8efa..00a3e26 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -63,7 +63,7 @@
     "reminder": "Erinnerung",
     "enableAllNotifications": "Alle Benachrichtigungen aktivieren",
     "subTitle": "Konfigurieren Sie die ausgewählten Module nach Ihren Wünschen.",
-    "nextStep": "Weiter"
+    "nextStep": "Speichern"
   },
   "moduleTemplateDialog": {
     "explanationOne": "Hier können Module nach Wunsch umbenannt werden, welche dann als Anzeigename im Kalender dargestellt werden.",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 641d5b9..5107b07 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -63,7 +63,7 @@
     "reminder": "reminder",
     "enableAllNotifications": "enable all notifications",
     "subTitle": "Configure your selected Modules to your liking.",
-    "nextStep": "next step"
+    "nextStep": "Save"
   },
   "moduleTemplateDialog": {
     "explanationOne": "Here you can rename your modules to your liking. This will be the name of the event in your calendar.",
diff --git a/frontend/src/view/AdditionalModules.vue b/frontend/src/view/AdditionalModules.vue
index 4e6582f..252f155 100644
--- a/frontend/src/view/AdditionalModules.vue
+++ b/frontend/src/view/AdditionalModules.vue
@@ -131,16 +131,16 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
         <template #footer>
           <div class="py-2 px-3">
             <b>{{ selectedModules ? selectedModules.length : 0 }}</b>
-            {{ itemsLabel(selectedModules) }}
-            {{ $t("additionalModules.dropDownFooterSelected") }}
+            item{{
+              (selectedModules ? selectedModules.length : 0) > 1 ? "s" : ""
+            }}
+            selected.
           </div>
         </template>
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">{{
-        $t("additionalModules.nextStep")
-      }}</Button>
+      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
     </div>
   </div>
 </template>