diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 419fbd3..05d737b 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -161,16 +161,12 @@ msgstr "Bezahlt"
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save Member"
-msgstr "Mitglied speichern"
-
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -261,12 +257,14 @@ msgstr "Dein Passwort wurde erfolgreich zurückgesetzt"
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
+#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/show.ex
@@ -381,11 +379,6 @@ msgstr "Mitglied auswählen"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save User"
-msgstr "Benutzer*in speichern"
-
 #: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Show User"
@@ -629,11 +622,6 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Verwalte die globalen Einstellungen des Vereins."
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
@@ -789,10 +777,7 @@ msgstr "Zahlungen"
 msgid "Personal Data"
 msgstr "Persönliche Daten"
 
-#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Speichern"
@@ -1393,16 +1378,6 @@ msgstr "Zyklen regenerieren"
 msgid "Regenerating..."
 msgstr "Regeneriere..."
 
-#: lib/mv_web/live/member_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Field"
-msgstr "Benutzerdefiniertes Feld speichern"
-
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save Membership Fee Type"
-msgstr "Mitgliedsbeitragsart speichern"
-
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Select a membership fee type for this member. Members can only switch between types with the same interval."
@@ -3623,11 +3598,56 @@ msgstr "Diese*r Benutzer*in ist über SSO (Single Sign-On) verbunden. Ein hier f
 msgid "When enabled and OIDC is configured, the sign-in page shows only the Single Sign-On button."
 msgstr "Wenn aktiviert und OIDC konfiguriert ist, zeigt die Anmeldeseite nur den Single Sign-On-Button."
 
+#: lib/mv_web/live/member_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save datafield"
+msgstr "Datenfeld speichern"
+
+#: lib/mv_web/live/membership_fee_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Save default settings"
+msgstr "Standardeinstellungen speichern"
+
+#: lib/mv_web/live/group_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save group"
+msgstr "Gruppe speichern"
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save member"
+msgstr "Mitglied speichern"
+
+#: lib/mv_web/live/membership_fee_type_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save membership fee type"
+msgstr "Mitgliedsbeitragsart speichern"
+
+#: lib/mv_web/live/role_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save role"
+msgstr "Rolle speichern"
+
+#: lib/mv_web/live/user_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save user"
+msgstr "Benutzer*in speichern"
+
 #~ #: lib/mv_web/live/import_live/components.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Manage Member Data"
 #~ msgstr "Mitgliederdaten verwalten"
 
+#~ #: lib/mv_web/live/member_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Field"
+#~ msgstr "Datenfeld speichern"
+
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Settings"
+#~ msgstr "Einstellungen speichern"
+
 #~ #: lib/mv_web/live/global_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Vereinfacht Integration"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index c9c9e54..667e6d0 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -162,16 +162,12 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save Member"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -262,12 +258,14 @@ msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
+#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/show.ex
@@ -382,11 +380,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save User"
-msgstr ""
-
 #: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Show User"
@@ -630,11 +623,6 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#, elixir-autogen, elixir-format
-msgid "Save Settings"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
@@ -790,10 +778,7 @@ msgstr ""
 msgid "Personal Data"
 msgstr ""
 
-#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -1394,16 +1379,6 @@ msgstr ""
 msgid "Regenerating..."
 msgstr ""
 
-#: lib/mv_web/live/member_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Save Field"
-msgstr ""
-
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#, elixir-autogen, elixir-format
-msgid "Save Membership Fee Type"
-msgstr ""
-
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Select a membership fee type for this member. Members can only switch between types with the same interval."
@@ -3622,3 +3597,38 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "When enabled and OIDC is configured, the sign-in page shows only the Single Sign-On button."
 msgstr ""
+
+#: lib/mv_web/live/member_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Save datafield"
+msgstr ""
+
+#: lib/mv_web/live/membership_fee_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Save default settings"
+msgstr ""
+
+#: lib/mv_web/live/group_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save group"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save member"
+msgstr ""
+
+#: lib/mv_web/live/membership_fee_type_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save membership fee type"
+msgstr ""
+
+#: lib/mv_web/live/role_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save role"
+msgstr ""
+
+#: lib/mv_web/live/user_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save user"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index e6f6e9e..a93a1ad 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -162,16 +162,12 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
-#: lib/mv_web/live/member_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Member"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
@@ -262,12 +258,14 @@ msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
+#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/show.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/show.ex
@@ -382,11 +380,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/mv_web/live/user_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save User"
-msgstr ""
-
 #: lib/mv_web/live/user_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show User"
@@ -630,11 +623,6 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Settings"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
@@ -790,10 +778,7 @@ msgstr ""
 msgid "Personal Data"
 msgstr ""
 
-#: lib/mv_web/live/group_live/form.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#: lib/mv_web/live/role_live/form.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save"
 msgstr ""
@@ -1394,16 +1379,6 @@ msgstr ""
 msgid "Regenerating..."
 msgstr ""
 
-#: lib/mv_web/live/member_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Field"
-msgstr ""
-
-#: lib/mv_web/live/membership_fee_type_live/form.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Membership Fee Type"
-msgstr ""
-
 #: lib/mv_web/live/member_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Select a membership fee type for this member. Members can only switch between types with the same interval."
@@ -3623,11 +3598,56 @@ msgstr ""
 msgid "When enabled and OIDC is configured, the sign-in page shows only the Single Sign-On button."
 msgstr ""
 
+#: lib/mv_web/live/member_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save datafield"
+msgstr ""
+
+#: lib/mv_web/live/membership_fee_settings_live.ex
+#, elixir-autogen, elixir-format
+msgid "Save default settings"
+msgstr ""
+
+#: lib/mv_web/live/group_live/form.ex
+#, elixir-autogen, elixir-format
+msgid "Save group"
+msgstr ""
+
+#: lib/mv_web/live/member_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save member"
+msgstr ""
+
+#: lib/mv_web/live/membership_fee_type_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save membership fee type"
+msgstr ""
+
+#: lib/mv_web/live/role_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save role"
+msgstr ""
+
+#: lib/mv_web/live/user_live/form.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save user"
+msgstr ""
+
 #~ #: lib/mv_web/live/import_live/components.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Manage Member Data"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Field"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Save Settings"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/global_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Vereinfacht Integration"