diff --git a/config/locales/en.yml b/config/locales/en.yml
index dcbaa4de5d1..3750a5fcbe6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   no_results_title_text: There is currently nothing to display.
 
@@ -1822,7 +1823,7 @@ en:
       changeset:
         repository: "Repository"
       comment:
-        commented: "Commented" # an object that this comment belongs to
+        commented: "Commented"  # an object that this comment belongs to
       custom_action:
         actions: "Actions"
       custom_field:
@@ -2116,7 +2117,7 @@ en:
         redirect_existing_links: "Redirect existing links"
         text: "Page content"
       work_package:
-        ancestor: "Descendants of" # used for filtering of work packages that are descendants of a given work package
+        ancestor: "Descendants of"  # used for filtering of work packages that are descendants of a given work package
         begin_insertion: "Begin of the insertion"
         begin_deletion: "Begin of the deletion"
         children: "Subelements"
@@ -2134,7 +2135,7 @@ en:
           false: "working days only"
           true: "include non-working days"
         journal_internal: Internal Journal
-        notify: "Notify" # used in custom actions
+        notify: "Notify"  # used in custom actions
         parent: "Parent"
         parent_issue: "Parent"
         parent_work_package: "Parent"
@@ -4848,9 +4849,9 @@ en:
       A new user (%{email}) tried to create an account on an OpenProject environment that you manage (%{host}).
       The user cannot activate their account since the user limit has been reached.
     steps:
+      a: "Upgrade your payment plan ([here](upgrade_url))"  # here turned into a link
+      b: "Lock or delete an existing user ([here](users_url))"  # here turned into a link
       label: "To allow the user to sign in you can either: "
-      a: "Upgrade your payment plan ([here](upgrade_url))" # here turned into a link
-      b: "Lock or delete an existing user ([here](users_url))" # here turned into a link
 
   more_actions: "More functions"
 
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index ec5086e25d0..15211a7bc74 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     ajax:
diff --git a/modules/auth_saml/config/locales/en.yml b/modules/auth_saml/config/locales/en.yml
index 7c14b9f77fd..2ac0332c26e 100644
--- a/modules/auth_saml/config/locales/en.yml
+++ b/modules/auth_saml/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   activerecord:
     attributes:
diff --git a/modules/avatars/config/locales/en.yml b/modules/avatars/config/locales/en.yml
index 8754b38c8ba..4d8bb1fbce4 100644
--- a/modules/avatars/config/locales/en.yml
+++ b/modules/avatars/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   plugin_openproject_avatars:
     name: "Avatars"
@@ -14,8 +15,8 @@ en:
   error_image_upload: "Error saving the image."
   error_image_size: "The image is too large."
   are_you_sure_delete_avatar: "Are you sure you want to delete your avatar?"
-  avatar_deleted:  "Avatar deleted successfully."
-  unable_to_delete_avatar:  "Avatar could not be deleted."
+  avatar_deleted: "Avatar deleted successfully."
+  unable_to_delete_avatar: "Avatar could not be deleted."
   wrong_file_format: "Allowed formats are jpg, png, gif"
   empty_file_error: "Please upload a valid image (jpg, png, gif)"
 
diff --git a/modules/avatars/config/locales/js-en.yml b/modules/avatars/config/locales/js-en.yml
index b0d575636e4..f8c3d3d6488 100644
--- a/modules/avatars/config/locales/js-en.yml
+++ b/modules/avatars/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   js:
     label_preview: 'Preview'
@@ -13,4 +14,3 @@ en:
       error_image_too_large: "Image is too large."
       wrong_file_format: "Allowed formats are jpg, png, gif"
       empty_file_error: "Please upload a valid image (jpg, png, gif)"
-
diff --git a/modules/backlogs/config/locales/js-en.yml b/modules/backlogs/config/locales/js-en.yml
index 059e83f9b75..d3798009121 100644
--- a/modules/backlogs/config/locales/js-en.yml
+++ b/modules/backlogs/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     work_packages:
diff --git a/modules/bim/config/locales/en.yml b/modules/bim/config/locales/en.yml
index b6a050bec23..0fb5adfb2b6 100644
--- a/modules/bim/config/locales/en.yml
+++ b/modules/bim/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here for Rails i18n
+---
 en:
   plugin_openproject_bim:
     name: "OpenProject BIM and BCF functionality"
diff --git a/modules/bim/config/locales/js-en.yml b/modules/bim/config/locales/js-en.yml
index 92752f797db..56373fc3274 100644
--- a/modules/bim/config/locales/js-en.yml
+++ b/modules/bim/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   js:
     bcf:
diff --git a/modules/boards/config/locales/en.yml b/modules/boards/config/locales/en.yml
index a026234e773..80abb5ea520 100644
--- a/modules/boards/config/locales/en.yml
+++ b/modules/boards/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   plugin_openproject_boards:
     name: "OpenProject Boards"
diff --git a/modules/boards/config/locales/js-en.yml b/modules/boards/config/locales/js-en.yml
index f3ef362d3e0..42cf010cfeb 100644
--- a/modules/boards/config/locales/js-en.yml
+++ b/modules/boards/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   ee:
     upsell:
@@ -50,7 +51,7 @@ en:
           Board with automated columns for subprojects.
           Dragging work packages to other lists updates the (sub-)project accordingly.
         action_text_subtasks: >
-          Board with automated columns for sub-elements. 
+          Board with automated columns for sub-elements.
           Dragging work packages to other lists updates the parent accordingly.
         action_text_status: >
           Basic kanban style board with columns for status such as To Do, In Progress, Done.
diff --git a/modules/budgets/config/locales/js-en.yml b/modules/budgets/config/locales/js-en.yml
index d2851eed35f..a85f8b6d887 100644
--- a/modules/budgets/config/locales/js-en.yml
+++ b/modules/budgets/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     work_packages:
diff --git a/modules/calendar/config/locales/en.yml b/modules/calendar/config/locales/en.yml
index a4161312c15..91ab1b70d7d 100644
--- a/modules/calendar/config/locales/en.yml
+++ b/modules/calendar/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   plugin_openproject_calendar:
     name: "OpenProject Calendar"
diff --git a/modules/calendar/config/locales/js-en.yml b/modules/calendar/config/locales/js-en.yml
index 7d53c8ad38a..604138d00f1 100644
--- a/modules/calendar/config/locales/js-en.yml
+++ b/modules/calendar/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   js:
     calendar:
diff --git a/modules/costs/config/locales/js-en.yml b/modules/costs/config/locales/js-en.yml
index 4c60e29a0d4..14fa76b857e 100644
--- a/modules/costs/config/locales/js-en.yml
+++ b/modules/costs/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     text_are_you_sure: "Are you sure?"
diff --git a/modules/documents/config/locales/en.yml b/modules/documents/config/locales/en.yml
index a40fbc42bd5..9c064f19678 100644
--- a/modules/documents/config/locales/en.yml
+++ b/modules/documents/config/locales/en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   plugin_openproject_documents:
     name: "OpenProject Documents"
diff --git a/modules/gantt/config/locales/en.yml b/modules/gantt/config/locales/en.yml
index d1d87486aaa..60d34b5bc50 100644
--- a/modules/gantt/config/locales/en.yml
+++ b/modules/gantt/config/locales/en.yml
@@ -1,3 +1,4 @@
 # English strings go here
+---
 en:
   project_module_gantt: "Gantt charts"
diff --git a/modules/gantt/config/locales/js-en.yml b/modules/gantt/config/locales/js-en.yml
index 0f0098d843b..ebe123cd9a1 100644
--- a/modules/gantt/config/locales/js-en.yml
+++ b/modules/gantt/config/locales/js-en.yml
@@ -1,3 +1,4 @@
+---
 en:
   js:
     work_packages:
diff --git a/modules/github_integration/config/locales/en.yml b/modules/github_integration/config/locales/en.yml
index 55eddc66a59..8ab9a0ba8a2 100644
--- a/modules/github_integration/config/locales/en.yml
+++ b/modules/github_integration/config/locales/en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   attributes:
     additions_count: "Number of additions"
diff --git a/modules/github_integration/config/locales/js-en.yml b/modules/github_integration/config/locales/js-en.yml
index a54613b6a8d..f33cb12275a 100644
--- a/modules/github_integration/config/locales/js-en.yml
+++ b/modules/github_integration/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     github_integration:
diff --git a/modules/gitlab_integration/config/locales/en.yml b/modules/gitlab_integration/config/locales/en.yml
index 963b96ddebd..331ee084723 100644
--- a/modules/gitlab_integration/config/locales/en.yml
+++ b/modules/gitlab_integration/config/locales/en.yml
@@ -27,6 +27,7 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
+---
 en:
   attributes:
     commit: "Commit"
diff --git a/modules/gitlab_integration/config/locales/js-en.yml b/modules/gitlab_integration/config/locales/js-en.yml
index 8db996c5c66..19ca34a8763 100644
--- a/modules/gitlab_integration/config/locales/js-en.yml
+++ b/modules/gitlab_integration/config/locales/js-en.yml
@@ -27,6 +27,7 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
+---
 en:
   js:
     gitlab_integration:
diff --git a/modules/grids/config/locales/en.yml b/modules/grids/config/locales/en.yml
index 7892912359d..a8dc16712ab 100644
--- a/modules/grids/config/locales/en.yml
+++ b/modules/grids/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   grids:
     label_widget_in_grid: "Widget contained in Grid %{grid_name}"
diff --git a/modules/grids/config/locales/js-en.yml b/modules/grids/config/locales/js-en.yml
index 4a3609c0040..689c013770c 100644
--- a/modules/grids/config/locales/js-en.yml
+++ b/modules/grids/config/locales/js-en.yml
@@ -1,3 +1,4 @@
+---
 en:
   js:
     grid:
diff --git a/modules/job_status/config/locales/en.yml b/modules/job_status/config/locales/en.yml
index 1e03ba8b2dd..3d1d12c1c1d 100644
--- a/modules/job_status/config/locales/en.yml
+++ b/modules/job_status/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   label_job_status_plural: "Job statuses"
   plugin_openproject_job_status:
diff --git a/modules/ldap_groups/config/locales/en.yml b/modules/ldap_groups/config/locales/en.yml
index 25a8545b50d..27419cf4c1a 100644
--- a/modules/ldap_groups/config/locales/en.yml
+++ b/modules/ldap_groups/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   ee:
     upsell:
diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml
index db413889f2c..626a95540b3 100644
--- a/modules/meeting/config/locales/en.yml
+++ b/modules/meeting/config/locales/en.yml
@@ -27,6 +27,7 @@
 #++
 
 # English strings go here for Rails i18n
+---
 en:
   plugin_openproject_meeting:
     name: "OpenProject Meeting"
diff --git a/modules/meeting/config/locales/js-en.yml b/modules/meeting/config/locales/js-en.yml
index 1572bbff9c9..d4d0d933351 100644
--- a/modules/meeting/config/locales/js-en.yml
+++ b/modules/meeting/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     label_meetings: 'Meetings'
diff --git a/modules/my_page/config/locales/en.yml b/modules/my_page/config/locales/en.yml
index 6dd425b098b..3317a1a0795 100644
--- a/modules/my_page/config/locales/en.yml
+++ b/modules/my_page/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   my_page:
     label: "My page"
diff --git a/modules/openid_connect/config/locales/en.yml b/modules/openid_connect/config/locales/en.yml
index 5eb2a7c4798..c8f93d6f1e3 100644
--- a/modules/openid_connect/config/locales/en.yml
+++ b/modules/openid_connect/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   plugin_openproject_openid_connect:
     name: "OpenProject OpenID Connect"
diff --git a/modules/overviews/config/locales/en.yml b/modules/overviews/config/locales/en.yml
index fbfc6736861..f0907c929f7 100644
--- a/modules/overviews/config/locales/en.yml
+++ b/modules/overviews/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   overviews:
     label_home: "%{workspace_type} home"
diff --git a/modules/overviews/config/locales/js-en.yml b/modules/overviews/config/locales/js-en.yml
index 256e4fcbccb..a36a23cc048 100644
--- a/modules/overviews/config/locales/js-en.yml
+++ b/modules/overviews/config/locales/js-en.yml
@@ -1,3 +1,4 @@
+---
 en:
   js:
     overviews:
diff --git a/modules/recaptcha/config/locales/en.yml b/modules/recaptcha/config/locales/en.yml
index ac4cbe6074d..43f12f0840e 100644
--- a/modules/recaptcha/config/locales/en.yml
+++ b/modules/recaptcha/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here for Rails i18n
+---
 en:
   plugin_openproject_recaptcha:
     name: "OpenProject ReCaptcha"
diff --git a/modules/reporting/config/locales/js-en.yml b/modules/reporting/config/locales/js-en.yml
index a62e5252945..2f015cd57fb 100644
--- a/modules/reporting/config/locales/js-en.yml
+++ b/modules/reporting/config/locales/js-en.yml
@@ -25,6 +25,7 @@
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
+---
 en:
   js:
     reporting_engine:
diff --git a/modules/resource_management/config/locales/en.yml b/modules/resource_management/config/locales/en.yml
index cd3ffc82fe0..1eb92248fbc 100644
--- a/modules/resource_management/config/locales/en.yml
+++ b/modules/resource_management/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   activerecord:
     attributes:
@@ -51,7 +52,7 @@ en:
     a planner and adjusting the allocated time and date range.
 
   label_resource_management: "Resource planning"
-  button_next: "Save" # TODO: This should be "Next" but we need to check the flow first
+  button_next: "Save"  # TODO: This should be "Next" but we need to check the flow first
 
   resource_management:
     label_resource_planner: "Resource planner"
diff --git a/modules/storages/config/locales/js-en.yml b/modules/storages/config/locales/js-en.yml
index ad0af627c72..925e6b3b098 100644
--- a/modules/storages/config/locales/js-en.yml
+++ b/modules/storages/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   js:
     storages:
diff --git a/modules/team_planner/config/locales/en.yml b/modules/team_planner/config/locales/en.yml
index d44f2e90c8a..2cd9e895dad 100644
--- a/modules/team_planner/config/locales/en.yml
+++ b/modules/team_planner/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   plugin_openproject_team_planner:
     name: "OpenProject Team Planner"
diff --git a/modules/team_planner/config/locales/js-en.yml b/modules/team_planner/config/locales/js-en.yml
index 077d82ace1a..c61a6f247b1 100644
--- a/modules/team_planner/config/locales/js-en.yml
+++ b/modules/team_planner/config/locales/js-en.yml
@@ -1,4 +1,5 @@
 # English strings go here
+---
 en:
   js:
     team_planner:
@@ -19,7 +20,7 @@ en:
       today: 'Today'
       drag_here_to_remove: 'Drag here to remove assignee and start and end dates.'
       cannot_drag_here: 'Cannot move the work package due to permissions or editing restrictions.'
-      cannot_drag_to_non_working_day : 'This work package cannot start/finish on a non-working day.'
+      cannot_drag_to_non_working_day: 'This work package cannot start/finish on a non-working day.'
 
       quick_add:
         empty_state: 'Use the search field to find work packages and drag them to the planner to assign it to someone and define start and end dates.'
diff --git a/modules/two_factor_authentication/config/locales/en.yml b/modules/two_factor_authentication/config/locales/en.yml
index c7bc8a7a12a..6f0e7356e1b 100644
--- a/modules/two_factor_authentication/config/locales/en.yml
+++ b/modules/two_factor_authentication/config/locales/en.yml
@@ -1,4 +1,5 @@
 # English strings go here for Rails i18n
+---
 en:
   plugin_openproject_two_factor_authentication:
     name: "OpenProject Two-factor authentication"
diff --git a/modules/two_factor_authentication/config/locales/js-en.yml b/modules/two_factor_authentication/config/locales/js-en.yml
index 5bc66c5be5a..1cc8eaf18ec 100644
--- a/modules/two_factor_authentication/config/locales/js-en.yml
+++ b/modules/two_factor_authentication/config/locales/js-en.yml
@@ -25,6 +25,7 @@
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
+---
 en:
   js:
     two_factor_authentication:
diff --git a/modules/webhooks/config/locales/en.yml b/modules/webhooks/config/locales/en.yml
index 00b8ee6c18c..99cf5f915b9 100644
--- a/modules/webhooks/config/locales/en.yml
+++ b/modules/webhooks/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   plugin_openproject_webhooks:
     name: "OpenProject Webhooks"
@@ -37,7 +38,7 @@ en:
         updated: "Updated"
         comment: "Comment"
         internal_comment: "Internal comment"
-      explanation_html: > 
+      explanation_html: >
         Upon the occurrence of an event like the creation of a work package or an update on a project, OpenProject will send a POST request to the configured web endpoints.
         Oftentimes, the event is sent after the [configured aggregation period](aggregation_path) has passed.
       status:
diff --git a/modules/wikis/config/locales/js-en.yml b/modules/wikis/config/locales/js-en.yml
index 9f00a7acbf8..4053424a1de 100644
--- a/modules/wikis/config/locales/js-en.yml
+++ b/modules/wikis/config/locales/js-en.yml
@@ -26,6 +26,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
+---
 en:
   js:
     work_packages:
diff --git a/modules/xls_export/config/locales/en.yml b/modules/xls_export/config/locales/en.yml
index 95411406927..f2d52f907b4 100644
--- a/modules/xls_export/config/locales/en.yml
+++ b/modules/xls_export/config/locales/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   plugin_openproject_xls_export:
     name: "OpenProject XLS Export"