Merge branch 'dev' of https://github.com/opf/openproject into dev

app/helpers/project_settings_helper.rb

@@ -60,7 +60,8 @@ module ProjectSettingsHelper
       {
         name: 'categories',
         action: { controller: '/project_settings/categories', action: 'show' },
-        label: :label_work_package_category_plural
+        label: :label_work_package_category_plural,
+        last: true
       },
       {
         name: 'repository',

config/initializers/menus.rb

@@ -372,6 +372,7 @@ Redmine::MenuManager.map :project_menu do |menu|
               node[:action],
               caption: node[:label],
               parent: :settings,
+              last: node[:last],
               if: node[:if]
   end
 end

modules/backlogs/lib/open_project/backlogs/patches/project_settings_helper_patch.rb

@@ -38,7 +38,7 @@ module OpenProject::Backlogs::Patches::ProjectSettingsHelperPatch
           settings << {
             name: :backlogs,
             action: { controller: '/backlogs_settings', action: 'show' },
-            label: :'backlogs.backlog_settings',
+            label: :label_backlogs,
             if: ->(p) { p.module_enabled?('backlogs') }
           }
         end